3 files changed, 17 insertions, 4 deletions

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index ea4941da9b27..36e8e9cbec52 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -506,6 +506,9 @@ int drm_dev_init(struct drm_device *dev,
         dev->dev = parent;
         dev->driver = driver;
 
+        /* no per-device feature limits by default */
+        dev->driver_features = ~0u;
+
         INIT_LIST_HEAD(&dev->filelist);
         INIT_LIST_HEAD(&dev->filelist_internal);
         INIT_LIST_HEAD(&dev->clientlist);
diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h
index f9c6e0e3aec7..42411b3ea0c8 100644
--- a/include/drm/drm_device.h
+++ b/include/drm/drm_device.h
@@ -46,6 +46,16 @@ struct drm_device {
         struct drm_master *master;
 
         /**
+         * @driver_features: per-device driver features
+         *
+         * Drivers can clear specific flags here to disallow
+         * certain features on a per-device basis while still
+         * sharing a single &struct drm_driver instance across
+         * all devices.
+         */
+        u32 driver_features;
+
+        /**
          * @unplugged:
          *
          * Flag to tell if the device has been unplugged.
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index 23b9678137a6..8830e3de3a86 100644
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -653,14 +653,14 @@ static inline bool drm_dev_is_unplugged(struct drm_device *dev)
  * @dev: DRM device to check
  * @feature: feature flag
  *
- * This checks @dev for driver features, see &drm_driver.driver_features and the
- * various DRIVER_\* flags.
+ * This checks @dev for driver features, see &drm_driver.driver_features,
+ * &drm_device.driver_features, and the various DRIVER_\* flags.
  *
  * Returns true if the @feature is supported, false otherwise.
  */
-static inline bool drm_core_check_feature(struct drm_device *dev, int feature)
+static inline bool drm_core_check_feature(struct drm_device *dev, u32 feature)
 {
-        return dev->driver->driver_features & feature;
+        return dev->driver->driver_features & dev->driver_features & feature;
 }
 
 /**