[Intel-gfx] [PATCH 1/2] drm/i915: Fix atomic state leak when resetting HDMI link

Ville Syrjälä ville.syrjala at linux.intel.com
Thu Feb 28 11:35:39 UTC 2019


On Wed, Feb 27, 2019 at 03:04:07PM -0800, José Roberto de Souza wrote:
> Atomic state needs to be put even if the commit was successful.
> 
> Fixes: dba14b27dd3c ("drm/i915: Reinitialize sink scrambling/TMDS clock ratio on HPD")
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: Lyude Paul <lyude at redhat.com>
> Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_ddi.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index d918be927fc2..34dd5823398a 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -3984,12 +3984,7 @@ static int modeset_pipe(struct drm_crtc *crtc,
>  		goto out;
>  
>  	ret = drm_atomic_commit(state);
> -	if (ret)
> -		goto out;
> -
> -	return 0;
> -
> - out:
> +out:

/me curses at that counterproductive codingstyle recommendation

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

>  	drm_atomic_state_put(state);
>  
>  	return ret;
> -- 
> 2.21.0

-- 
Ville Syrjälä
Intel


More information about the Intel-gfx mailing list