diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-09-18 16:20:18 +1000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2018-09-18 11:17:06 +0200 |
| commit | 57078338b2e4c07fb76bef23369cae0acfb1f7bc (patch) | |
| tree | 4c8eb1e30d244ce15b4f01142b9bad38bc4e43d0 /include/drm | |
| parent | 3c499ea0c662e2f38aafbd4f516b08aab8cfa0e5 (diff) | |
| download | talos-obmc-linux-57078338b2e4c07fb76bef23369cae0acfb1f7bc.tar.gz talos-obmc-linux-57078338b2e4c07fb76bef23369cae0acfb1f7bc.zip | |
drm: fix drm_drv_uses_atomic_modeset on non modesetting drivers.
vgem seems to oops on the intel CI due to the vgem debugfs init
hitting this path now.
Check if we have mode_config funcs before checking one.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20180918062018.24942-1-airlied@gmail.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 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); } |
