[Freedreno] [PATCH v2 2/7] drm/msm/dpu: Clean up plane atomic disable/update

[Sean Paul]

On Thu, Sep 20, 2018 at 12:49:19PM -0400, Bruce Wang wrote:
> Removes unnecessary checks from dpu_plane_atomic_disable, old_state
> argument for both dpu_plane_atomic_disable and
> dpu_plane_sspp_atomic_update is removed as it is no longer used.
> 
> Signed-off-by: Bruce Wang <bzwang at chromium.org>

Reviewed-by: Sean Paul <seanpaul at chromium.org>

> ---
>  drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 31 +++++------------------
>  1 file changed, 7 insertions(+), 24 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> index 99887c804e4e..9a5d5afa53f2 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -1054,8 +1054,7 @@ void dpu_plane_set_error(struct drm_plane *plane, bool error)
>  	pdpu->is_error = error;
>  }
>  
> -static void dpu_plane_sspp_atomic_update(struct drm_plane *plane,
> -					 struct drm_plane_state *old_state)
> +static void dpu_plane_sspp_atomic_update(struct drm_plane *plane)
>  {
>  	uint32_t src_flags;
>  	struct dpu_plane *pdpu = to_dpu_plane(plane);
> @@ -1168,27 +1167,11 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane,
>  	_dpu_plane_set_qos_remap(plane);
>  }
>  
> -static void _dpu_plane_atomic_disable(struct drm_plane *plane,
> -				struct drm_plane_state *old_state)
> +static void _dpu_plane_atomic_disable(struct drm_plane *plane)
>  {
> -	struct dpu_plane *pdpu;
> -	struct drm_plane_state *state;
> -	struct dpu_plane_state *pstate;
> -
> -	if (!plane) {
> -		DPU_ERROR("invalid plane\n");
> -		return;
> -	} else if (!plane->state) {
> -		DPU_ERROR("invalid plane state\n");
> -		return;
> -	} else if (!old_state) {
> -		DPU_ERROR("invalid old state\n");
> -		return;
> -	}
> -
> -	pdpu = to_dpu_plane(plane);
> -	state = plane->state;
> -	pstate = to_dpu_plane_state(state);
> +	struct dpu_plane *pdpu = to_dpu_plane(plane);
> +	struct drm_plane_state *state = plane->state;
> +	struct dpu_plane_state *pstate = to_dpu_plane_state(state);
>  
>  	trace_dpu_plane_disable(DRMID(plane), is_dpu_plane_virtual(plane),
>  				pstate->multirect_mode);
> @@ -1212,9 +1195,9 @@ static void dpu_plane_atomic_update(struct drm_plane *plane,
>  	DPU_DEBUG_PLANE(pdpu, "\n");
>  
>  	if (!state->visible) {
> -		_dpu_plane_atomic_disable(plane, old_state);
> +		_dpu_plane_atomic_disable(plane);
>  	} else {
> -		dpu_plane_sspp_atomic_update(plane, old_state);
> +		dpu_plane_sspp_atomic_update(plane);
>  	}
>  }
>  
> -- 
> 2.19.0.444.g18242da7ef-goog
> 

-- 
Sean Paul, Software Engineer, Google / Chromium OS