diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-03-05 08:14:17 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-05 08:14:22 +1000 |
| commit | 4b057e73f28f1df13b77b77a52094238ffdf8abd (patch) | |
| tree | 816d3abfb3a1a62b08de88265e5fd09f538a1d5d /include/drm | |
| parent | 634092b1b9f67bea23a87b77880df5e8012a411a (diff) | |
| parent | 04b9c48851582aa0971b7d4e9d42c872b8acd0e2 (diff) | |
| download | linux-4b057e73f28f1df13b77b77a52094238ffdf8abd.tar.gz linux-4b057e73f28f1df13b77b77a52094238ffdf8abd.tar.bz2 linux-4b057e73f28f1df13b77b77a52094238ffdf8abd.zip | |
Merge tag 'drm-misc-fixes-2019-02-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-fixes for v5.0:
- Block fb changes for async atomic updates to prevent a use after free.
- Fix ID mismatch error on load in bochs.
- Fix memory leak when drm_setup fails.
- Fixes around handling of DRM_AUTH.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/42113611-e2cd-6bdd-7de5-4f8ab5a0cbe6@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; } |