drm: fix drm_drv_uses_atomic_modeset on non modesetting drivers.
Subsystems (2)
Dave Airlie
maintainerPATCH 1/1 drm: fix drm_drv_uses_atomic_modeset on non modesetting drivers.
From: Dave Airlie <[email protected]>
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 <[email protected]>
--- include/drm/drm_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/drm/drm_drv.h +1 -1
@@ -674,7 +674,7 @@ static inline bool drm_core_check_feature(struct drm_device *dev, u32 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 ); }
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 8 lines · Dave Airlie
From: Dave Airlie <[email protected]>
vgem seems to oops on the intel CI due to the vgem debugfs init hitting this path now.
Check if we have
mode_configfuncs before checking one.Signed-off-by Dave Airlie <[email protected]>
I thought Dave would apply, but I guess too late for him, and since CI is burning I went ahead and pushed to drm-misc-fixes.
I kinda wonder why we didn't blow up on vgem earlier. I guess not a whole lot of fuzzing going on ...
-Daniel
Quoted 24 lines
--- include/drm/drm_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/drm/drm_drv.h +1
-1@@ -674,7 +674,7 @@ static inline bool drm_core_check_feature(struct drm_device *dev, u32 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 ); }Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel