[PATCH] drm: fix drm_drv_uses_atomic_modeset on non modesetting drivers.

[PATCH] drm: fix drm_drv_uses_atomic_modeset on non modesetting drivers.

[Dave Airlie]

From: Dave Airlie <airlied@redhat.com>

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>
---
 include/drm/drm_drv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index 8830e3de3a86..3199ef70c007 100644
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -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);
 }
 
 
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm: fix drm_drv_uses_atomic_modeset on non modesetting drivers.

[Daniel Vetter]

On Tue, Sep 18, 2018 at 04:20:18PM +1000, Dave Airlie wrote:
> From: Dave Airlie <airlied@redhat.com>
> 
> 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>

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

> ---
>  include/drm/drm_drv.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
> index 8830e3de3a86..3199ef70c007 100644
> --- a/include/drm/drm_drv.h
> +++ b/include/drm/drm_drv.h
> @@ -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);
>  }
>  
>  
> -- 
> 2.17.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel