diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-09-20 10:00:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-09-20 10:00:46 +1000 |
| commit | d5b3a31b1ceaa9d6f44646848ebde590f2a03d84 (patch) | |
| tree | e3be87cec0cfd87e394eea0d2201881123dafb74 /include | |
| parent | 7876320f88802b22d4e2daf7eb027dd14175a0f8 (diff) | |
| parent | 558a9ef94a329a1ac75613407ad15d0d0071ff4c (diff) | |
| download | linux-d5b3a31b1ceaa9d6f44646848ebde590f2a03d84.tar.bz2 | |
Merge tag 'drm-misc-fixes-2018-09-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v4.19-rc5:
- Fix crash in vgem in drm_drv_uses_atomic_modeset.
- Allow atomic drivers that don't set DRIVER_ATOMIC to create debugfs entries.
- Fix compiler warning for unused connector_funcs.
- Fix null pointer deref on UDL unplug.
- Disable DRM support for sun4i's R40 for now.
(Not all patches went in for v4.19, so it has to wait a cycle.)
- NULL-terminate the of_device_id table in pl111.
- Make sure vc4 NV12 planar format works when displaying an unscaled fb.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/dda393bb-f13f-8d36-711b-cacfc578e5a3@linux.intel.com
Diffstat (limited to 'include')
| -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 46a8009784df..152b3055e9e1 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -675,7 +675,7 @@ static inline bool drm_core_check_feature(struct drm_device *dev, int feature) static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev) { return drm_core_check_feature(dev, DRIVER_ATOMIC) || - dev->mode_config.funcs->atomic_commit != NULL; + (dev->mode_config.funcs && dev->mode_config.funcs->atomic_commit != NULL); } |