On Wed, Sep 19, 2018 at 11:44:12AM -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@xxxxxxxxxxxx>
Reviewed-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
> ---
> 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 a8d00f57f06a..7f6046166626 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@ -1157,8 +1157,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);
> @@ -1271,27 +1270,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);
> @@ -1315,9 +1298,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.397.gdd90340f6a-goog
>
--
Sean Paul, Software Engineer, Google / Chromium OS
