]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/debugfs: also take per device driver features into account
authorJani Nikula <jani.nikula@intel.com>
Thu, 23 Jan 2020 12:48:01 +0000 (14:48 +0200)
committerJani Nikula <jani.nikula@intel.com>
Sat, 25 Jan 2020 13:49:11 +0000 (15:49 +0200)
Use drm_core_check_all_features() to ensure both the driver features and
the per-device driver features are taken into account when registering
debugfs files.

v3:
- files[i].driver_features == 0 actually means "don't care"

v2:
- use drm_core_check_all_features()

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200123124801.14958-2-jani.nikula@intel.com
drivers/gpu/drm/drm_debugfs.c

index eab0f2687cd6ea31c757eacb2ee4cf88974ee636..4e673d318503c6f3685e4467e720b4f991c43e00 100644 (file)
@@ -182,8 +182,7 @@ int drm_debugfs_create_files(const struct drm_info_list *files, int count,
        for (i = 0; i < count; i++) {
                u32 features = files[i].driver_features;
 
-               if (features != 0 &&
-                   (dev->driver->driver_features & features) != features)
+               if (features && !drm_core_check_all_features(dev, features))
                        continue;
 
                tmp = kmalloc(sizeof(struct drm_info_node), GFP_KERNEL);