]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm: fix drm_drv_uses_atomic_modeset on non modesetting drivers.
authorDave Airlie <airlied@redhat.com>
Tue, 18 Sep 2018 06:20:18 +0000 (16:20 +1000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 18 Sep 2018 09:17:06 +0000 (11:17 +0200)
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
include/drm/drm_drv.h

index 46a8009784df1227f784774bdab50d39e03dceb5..152b3055e9e1feb449b682c8102df23d18a64df5 100644 (file)
@@ -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);
 }