From patchwork Tue Apr 7 06:59:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 6167471 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E42E2BF4A6 for ; Tue, 7 Apr 2015 06:59:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E35F6202E5 for ; Tue, 7 Apr 2015 06:59:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 01BF3202C8 for ; Tue, 7 Apr 2015 06:59:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B15CB6E1E3; Mon, 6 Apr 2015 23:59:30 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by gabe.freedesktop.org (Postfix) with ESMTP id AA4266E1E3 for ; Mon, 6 Apr 2015 23:59:29 -0700 (PDT) Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NMF00JJXCR4QN40@mailout2.samsung.com> for dri-devel@lists.freedesktop.org; Tue, 07 Apr 2015 15:59:28 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.114]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 07.57.20564.05083255; Tue, 7 Apr 2015 15:59:28 +0900 (KST) X-AuditID: cbfee690-f796f6d000005054-27-552380500f45 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 67.B8.25346.F4083255; Tue, 7 Apr 2015 15:59:28 +0900 (KST) Received: from localhost.localdomain ([10.252.81.123]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NMF003D5CR3YW80@mmp2.samsung.com>; Tue, 07 Apr 2015 15:59:27 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] drm/exynos: use src_x and src_y instead of fb_x and fb_y Date: Tue, 07 Apr 2015 15:59:38 +0900 Message-id: <1428389979-13514-1-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLLMWRmVeSWpSXmKPExsWyRsSkSDegQTnUYGsfl8WVr+/ZLCbdn8Bi 8eLeRRaLGZNfslm0rf7A6sDqcb/7OJPHv2PsHn1bVjEGMEdx2aSk5mSWpRbp2yVwZbxfuo21 YKJ2xe/Dd1gaGHeodDFycEgImEi0fWLuYuQEMsUkLtxbz9bFyMUhJLCUUWLRsc/MMDWT2kQh 4tMZJe5c+sII4fxglJj0cRk7SDebgJ7EnW3HmUBsEQFlib8TVzGC2MwCWRL35x0DqxEW8JU4 //8G2DYWAVWJQ4/eMYEs4BVwl3jdEQlxhJzEyWOTWUHmSwg8ZpP4c/YSI0S9gMS3yYdYIA6S ldh0AOpoSYmDK26wTGAUXMDIsIpRNLUguaA4Kb3IRK84Mbe4NC9dLzk/dxMjMBRP/3s2YQfj vQPWhxgFOBiVeHgZ5JRDhVgTy4orcw8xmgJtmMgsJZqcDwz4vJJ4Q2MzIwtTE1NjI3NLMyVx 3tdSP4OFBNITS1KzU1MLUovii0pzUosPMTJxcEo1MNYqdU3TENPM85UU2vlFcU5VPkfF1JA9 9Z/nHUiw+VbxfEbitjLfDJUJeXw2/+15fQ48llkpfsHGSybZd2/PV4+s7uOWB275R05XSapT PrioxW/T9yPH8tPv8LE8TTxbuXDytu9bxY6FqPTvSH92z+TaSoGXDk/nLRHz/JJrfNc0pck2 UF9JRYmlOCPRUIu5qDgRAC4myxNAAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRmVeSWpSXmKPExsVy+t9jQd2ABuVQg/kbGS2ufH3PZjHp/gQW ixf3LrJYzJj8ks2ibfUHVgdWj/vdx5k8/h1j9+jbsooxgDmqgdEmIzUxJbVIITUvOT8lMy/d Vsk7ON453tTMwFDX0NLCXEkhLzE31VbJxSdA1y0zB2inkkJZYk4pUCggsbhYSd8O04TQEDdd C5jGCF3fkCC4HiMDNJCwhjHj/dJtrAUTtSt+H77D0sC4Q6WLkYNDQsBEYlKbaBcjJ5ApJnHh 3nq2LkYuDiGB6YwSdy59YYRwfjBKTPq4jB2kik1AT+LOtuNMILaIgLLE34mrGEFsZoEsifvz joHVCAv4Spz/f4MZxGYRUJU49OgdE8gyXgF3idcdkRDL5CROHpvMOoGRewEjwypG0dSC5ILi pPRcQ73ixNzi0rx0veT83E2M4FB/JrWDcWWDxSFGAQ5GJR5eBjnlUCHWxLLiytxDjBIczEoi vNy5QCHelMTKqtSi/Pii0pzU4kOMpkDLJzJLiSbnA+MwryTe0NjEzMjSyNzQwsjYXEmcd46u XKiQQHpiSWp2ampBahFMHxMHp1QD466r12Rndd+9stmiZELXdrlHPlMUHDs2z+SZ+1feheuX 3EpTltgt3oWxHz8KcepdCbadK8PH+nOf/tuay6+D1V7xtm3/rPxog/F+s9i02Eup/xj3u0ZJ nY0xvdXbwyfs+HhikbtkVZnlTo11u39n/ZDelicoPN+T8dfTE52B+VbvrVm5dmStUWIpzkg0 1GIuKk4EAAUIx5+LAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: tjakobi@math.uni-bielefeld.de, sw0312.kim@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's more reasonable to use src_x and src_y to represent source as counterpart of destination(crtc). Already we are using src_width and src_height for width and height of source. Signed-off-by: Joonyoung Shim --- drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_drv.h | 16 ++++++++-------- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_plane.c | 8 ++++---- drivers/gpu/drm/exynos/exynos_mixer.c | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index 84a3638..1f7e33f 100644 --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c @@ -440,8 +440,8 @@ static void decon_win_commit(struct exynos_drm_crtc *crtc, unsigned int win) writel(plane->fb_height, ctx->regs + VIDW_WHOLE_Y(win)); /* offset from the start of the buffer to read */ - writel(plane->fb_x, ctx->regs + VIDW_OFFSET_X(win)); - writel(plane->fb_y, ctx->regs + VIDW_OFFSET_Y(win)); + writel(plane->src_x, ctx->regs + VIDW_OFFSET_X(win)); + writel(plane->src_y, ctx->regs + VIDW_OFFSET_Y(win)); DRM_DEBUG_KMS("start addr = 0x%lx\n", (unsigned long)val); diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index 4a4ba82..f576719 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h @@ -47,14 +47,14 @@ enum exynos_drm_output_type { * Exynos drm common overlay structure. * * @base: plane object - * @fb_x: offset x on a framebuffer to be displayed. + * @src_x: offset x on a framebuffer to be displayed. * - the unit is screen coordinates. - * @fb_y: offset y on a framebuffer to be displayed. + * @src_y: offset y on a framebuffer to be displayed. * - the unit is screen coordinates. - * @fb_width: width of a framebuffer. - * @fb_height: height of a framebuffer. * @src_width: width of a partial image to be displayed from framebuffer. * @src_height: height of a partial image to be displayed from framebuffer. + * @fb_width: width of a framebuffer. + * @fb_height: height of a framebuffer. * @crtc_x: offset x on hardware screen. * @crtc_y: offset y on hardware screen. * @crtc_width: window width to be displayed (hardware screen). @@ -85,12 +85,12 @@ enum exynos_drm_output_type { struct exynos_drm_plane { struct drm_plane base; - unsigned int fb_x; - unsigned int fb_y; - unsigned int fb_width; - unsigned int fb_height; + unsigned int src_x; + unsigned int src_y; unsigned int src_width; unsigned int src_height; + unsigned int fb_width; + unsigned int fb_height; unsigned int crtc_x; unsigned int crtc_y; unsigned int crtc_width; diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 7964b27..f039041 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -653,8 +653,8 @@ static void fimd_win_commit(struct exynos_drm_crtc *crtc, unsigned int win) fimd_shadow_protect_win(ctx, win, true); - offset = plane->fb_x * (plane->bpp >> 3); - offset += plane->fb_y * plane->pitch; + offset = plane->src_x * (plane->bpp >> 3); + offset += plane->src_y * plane->pitch; /* buffer start address */ dma_addr = plane->dma_addr[0] + offset; diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c index 5d3066d..1e875f4 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c @@ -89,12 +89,12 @@ static void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc } /* set drm framebuffer data. */ - exynos_plane->fb_x = src_x; - exynos_plane->fb_y = src_y; - exynos_plane->fb_width = fb->width; - exynos_plane->fb_height = fb->height; + exynos_plane->src_x = src_x; + exynos_plane->src_y = src_y; exynos_plane->src_width = src_w; exynos_plane->src_height = src_h; + exynos_plane->fb_width = fb->width; + exynos_plane->fb_height = fb->height; exynos_plane->bpp = fb->bits_per_pixel; exynos_plane->pitch = fb->pitches[0]; exynos_plane->pixel_format = fb->pixel_format; diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index b95ed91..ede402b 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -457,8 +457,8 @@ static void vp_video_buffer(struct mixer_context *ctx, int win) vp_reg_write(res, VP_SRC_WIDTH, plane->src_width); vp_reg_write(res, VP_SRC_HEIGHT, plane->src_height); vp_reg_write(res, VP_SRC_H_POSITION, - VP_SRC_H_POSITION_VAL(plane->fb_x)); - vp_reg_write(res, VP_SRC_V_POSITION, plane->fb_y); + VP_SRC_H_POSITION_VAL(plane->src_x)); + vp_reg_write(res, VP_SRC_V_POSITION, plane->src_y); vp_reg_write(res, VP_DST_WIDTH, plane->crtc_width); vp_reg_write(res, VP_DST_H_POSITION, plane->crtc_x); @@ -561,8 +561,8 @@ static void mixer_graph_buffer(struct mixer_context *ctx, int win) /* converting dma address base and source offset */ dma_addr = plane->dma_addr[0] - + (plane->fb_x * plane->bpp >> 3) - + (plane->fb_y * plane->pitch); + + (plane->src_x * plane->bpp >> 3) + + (plane->src_y * plane->pitch); src_x_offset = 0; src_y_offset = 0;