[PATCH 25/81] drm/amd/display: Remove unblanaced drm_vblank_put.

Michel Dänzer michel at daenzer.net
Wed Jul 26 01:27:27 UTC 2017


On 25/07/17 10:53 PM, sunpeng.li at amd.com wrote:
> From: Andrey Grodzovsky <Andrey.Grodzovsky at amd.com>
> 
> Since drm_vblank_get moved from this function to just
> before do_flip no need to release vblank here in case of error.
> 
> Change-Id: Iedc900618da2a0c940f49fe63299c6ae3eec260d
> Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky at amd.com>
> Reviewed-by: Tony Cheng <Tony.Cheng at amd.com>
> Acked-by: Harry Wentland <Harry.Wentland at amd.com>
> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
> index fb5afba..ed48c5e 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
> @@ -1016,8 +1016,7 @@ static int amdgpu_atomic_helper_page_flip(struct drm_crtc *crtc,
>  	if (ret == -EDEADLK)
>  		goto backoff;
>  
> -	if (ret)
> -		drm_crtc_vblank_put(crtc);
> +	drm_atomic_state_put(state);
>  
>  	return ret;
>  backoff:
> 

This kind of fixup should generally be squashed into the previous patch
which introduced the bug.


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer


More information about the amd-gfx mailing list