diff options
author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-03-11 13:09:20 +0200 |
---|---|---|
committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2019-03-11 13:09:20 +0200 |
commit | bd2dba19d3109f617527c48f4891dd3d8f6a3aa6 (patch) | |
tree | 388296ba3944484443ec1c09801a18e921a44d86 /include/drm | |
parent | 26eeea1506838c77524fa90c8e6f1cc246762a4a (diff) | |
parent | 4b057e73f28f1df13b77b77a52094238ffdf8abd (diff) | |
download | linux-bd2dba19d3109f617527c48f4891dd3d8f6a3aa6.tar.bz2 |
Merge drm/drm-next into drm-intel-next-queued
To facilitate merging topic/hdr-formats from Maarten.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index ca46a45a9cce..570f9d03b2eb 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -767,7 +767,7 @@ static inline bool drm_dev_is_unplugged(struct drm_device *dev) * * Returns true if the @feature is supported, false otherwise. */ -static inline bool drm_core_check_feature(struct drm_device *dev, u32 feature) +static inline bool drm_core_check_feature(const struct drm_device *dev, u32 feature) { return dev->driver->driver_features & dev->driver_features & feature; } |