Commit ad444e55 authored by Bruce Wang's avatar Bruce Wang Committed by Rob Clark

drm/msm/dpu: Clean up plane atomic disable/update

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.
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Reviewed-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarBruce Wang <bzwang@chromium.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 1bd5a13b
...@@ -1045,8 +1045,7 @@ void dpu_plane_set_error(struct drm_plane *plane, bool error) ...@@ -1045,8 +1045,7 @@ void dpu_plane_set_error(struct drm_plane *plane, bool error)
pdpu->is_error = error; pdpu->is_error = error;
} }
static void dpu_plane_sspp_atomic_update(struct drm_plane *plane, static void dpu_plane_sspp_atomic_update(struct drm_plane *plane)
struct drm_plane_state *old_state)
{ {
uint32_t src_flags; uint32_t src_flags;
struct dpu_plane *pdpu = to_dpu_plane(plane); struct dpu_plane *pdpu = to_dpu_plane(plane);
...@@ -1159,27 +1158,11 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane, ...@@ -1159,27 +1158,11 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane,
_dpu_plane_set_qos_remap(plane); _dpu_plane_set_qos_remap(plane);
} }
static void _dpu_plane_atomic_disable(struct drm_plane *plane, static void _dpu_plane_atomic_disable(struct drm_plane *plane)
struct drm_plane_state *old_state)
{ {
struct dpu_plane *pdpu; struct dpu_plane *pdpu = to_dpu_plane(plane);
struct drm_plane_state *state; struct drm_plane_state *state = plane->state;
struct dpu_plane_state *pstate; struct dpu_plane_state *pstate = to_dpu_plane_state(state);
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);
trace_dpu_plane_disable(DRMID(plane), is_dpu_plane_virtual(plane), trace_dpu_plane_disable(DRMID(plane), is_dpu_plane_virtual(plane),
pstate->multirect_mode); pstate->multirect_mode);
...@@ -1203,9 +1186,9 @@ static void dpu_plane_atomic_update(struct drm_plane *plane, ...@@ -1203,9 +1186,9 @@ static void dpu_plane_atomic_update(struct drm_plane *plane,
DPU_DEBUG_PLANE(pdpu, "\n"); DPU_DEBUG_PLANE(pdpu, "\n");
if (!state->visible) { if (!state->visible) {
_dpu_plane_atomic_disable(plane, old_state); _dpu_plane_atomic_disable(plane);
} else { } else {
dpu_plane_sspp_atomic_update(plane, old_state); dpu_plane_sspp_atomic_update(plane);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment