aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2018-09-12 09:54:53 -0400
committerRob Clark <robdclark@gmail.com>2018-10-03 20:24:52 -0400
commit3d04dc1444be774d8b474962d01b65306756ec54 (patch)
treea997a61901d657b4a01156f75a8e851a7d7d6139 /drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
parentdrm/msm/dpu: Remove an unused enum (diff)
downloadlinux-dev-3d04dc1444be774d8b474962d01b65306756ec54.tar.xz
linux-dev-3d04dc1444be774d8b474962d01b65306756ec54.zip
drm/msm: dpu: Remove impossible checks
This patch removes some checks which are impossible to hit. As a result, we can move some of the local var assignments into the declarations. Changes in v2: - None Reviewed-by: Jeykumar Sankaran <jsanka@codeaurora.org> Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c')
-rw-r--r--drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
index eab05c78168d..2c63c2693750 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
@@ -1082,30 +1082,13 @@ static int dpu_plane_sspp_atomic_check(struct drm_plane *plane,
struct drm_plane_state *state)
{
int ret = 0;
- struct dpu_plane *pdpu;
- struct dpu_plane_state *pstate;
+ struct dpu_plane *pdpu = to_dpu_plane(plane);
const struct dpu_format *fmt;
struct drm_rect src, dst, fb_rect = { 0 };
uint32_t max_upscale = 1, max_downscale = 1;
uint32_t min_src_size, max_linewidth;
int hscale = 1, vscale = 1;
- if (!plane || !state) {
- DPU_ERROR("invalid arg(s), plane %d state %d\n",
- plane != 0, state != 0);
- ret = -EINVAL;
- goto exit;
- }
-
- pdpu = to_dpu_plane(plane);
- pstate = to_dpu_plane_state(state);
-
- if (!pdpu->pipe_sblk) {
- DPU_ERROR_PLANE(pdpu, "invalid catalog\n");
- ret = -EINVAL;
- goto exit;
- }
-
src.x1 = state->src_x >> 16;
src.y1 = state->src_y >> 16;
src.x2 = src.x1 + (state->src_w >> 16);