drm: fix drm_drv_uses_atomic_modeset on non modesetting drivers.

airlied · danvet · commit 57078338b2e4 · 2018-09-18T11:17:06.000+02:00
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
diff --git 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);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,7 @@ static inline bool drm_core_check_feature(struct drm_device *dev, int feature)`
`675`	`675`	`static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)`
`676`	`676`	`{`
`677`	`677`	`return drm_core_check_feature(dev, DRIVER_ATOMIC) \|\|`
`678`		`- dev->mode_config.funcs->atomic_commit != NULL;`
	`678`	`+ (dev->mode_config.funcs && dev->mode_config.funcs->atomic_commit != NULL);`
`679`	`679`	`}`
`680`	`680`
`681`	`681`