From: Marek Szyprowski Date: Mon, 30 Nov 2015 13:53:20 +0000 (+0100) Subject: drm/exynos: exynos7-decon: remove excessive check X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=42f8119c8ae22196ecbc8eb9cd839111f37afd2b;p=deliverable%2Flinux.git drm/exynos: exynos7-decon: remove excessive check Display area is already checked by exynos plane core, so there is no need for such check in driver code. Signed-off-by: Marek Szyprowski Reviewed-by: Gustavo Padovan Signed-off-by: Inki Dae --- diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index 38d7762ebdcb..4db04f244c17 100644 --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c @@ -394,7 +394,6 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, struct exynos_drm_plane *plane) { struct decon_context *ctx = crtc->ctx; - struct drm_display_mode *mode = &crtc->base.state->adjusted_mode; struct drm_plane_state *state = plane->base.state; int padding; unsigned long val, alpha; @@ -436,15 +435,6 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, DRM_DEBUG_KMS("ovl_width = %d, ovl_height = %d\n", plane->crtc_w, plane->crtc_h); - /* - * OSD position. - * In case the window layout goes of LCD layout, DECON fails. - */ - if ((plane->crtc_x + plane->crtc_w) > mode->hdisplay) - plane->crtc_x = mode->hdisplay - plane->crtc_w; - if ((plane->crtc_y + plane->crtc_h) > mode->vdisplay) - plane->crtc_y = mode->vdisplay - plane->crtc_h; - val = VIDOSDxA_TOPLEFT_X(plane->crtc_x) | VIDOSDxA_TOPLEFT_Y(plane->crtc_y); writel(val, ctx->regs + VIDOSD_A(win));