[Intel-gfx] [PATCH] drm/i915: reset drm state backpointer in crtc_state

Daniel Vetter daniel at ffwll.ch
Wed Apr 8 01:22:11 PDT 2015


On Mon, Apr 06, 2015 at 11:30:29AM -0700, Chandra Konduru wrote:
> At end of intel_crtc_set_config, reset crtc_state's
> drm_state back pointer to null.
> 
> Signed-off-by: Chandra Konduru <chandra.konduru at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index c84926b..f9c2e4d 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -12451,8 +12451,10 @@ fail:
>  	}
>  
>  out_config:
> -	if (state)
> +	if (state) {
>  		drm_atomic_state_free(state);
> +		to_intel_crtc(set->crtc)->config->base.state = NULL;

This should be done in intel_crtc_set_state instead of just in this case
here.
-Daniel

> +	}
>  
>  	intel_set_config_free(config);
>  	return ret;
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the Intel-gfx mailing list