From patchwork Fri May 29 06:24:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 6504561 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 098F2C0020 for ; Fri, 29 May 2015 06:24:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D46D2068F for ; Fri, 29 May 2015 06:24:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 41A02206AB for ; Fri, 29 May 2015 06:24:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 304436ED2C; Thu, 28 May 2015 23:24:32 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by gabe.freedesktop.org (Postfix) with ESMTP id DFCC16ED22 for ; Thu, 28 May 2015 23:24:29 -0700 (PDT) Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NP3006LDLSSYF90@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Fri, 29 May 2015 15:24:28 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.113]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 74.A8.20564.C1608655; Fri, 29 May 2015 15:24:28 +0900 (KST) X-AuditID: cbfee690-f796f6d000005054-73-5568061c0424 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 92.85.05312.C1608655; Fri, 29 May 2015 15:24: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 <0NP30067FLSRV5Z0@mmp2.samsung.com>; Fri, 29 May 2015 15:24:28 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/exynos: use adjusted_mode of crtc_state instead of mode Date: Fri, 29 May 2015 15:24:35 +0900 Message-id: <1432880675-14178-1-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrHLMWRmVeSWpSXmKPExsWyRsSkUFeGLSPU4Nh2IYsrX9+zWXxa3cpu Men+BBaLF/cusljMmPySzYHV4+/z6ywe97uPM3n0bVnFGMAcxWWTkpqTWZZapG+XwJUx8eY0 1oIpshXfj05gbmCcLdnFyMkhIWAi8eTMQyYIW0ziwr31bF2MXBxCAksZJaZOfwnksIMV/dOD CE9nlPg+YQUThPODUaKhbx8jSDObgJ7EnW3HwQaJCChL/J24CijOwcEskCMxtUcJJCws4COx tnsTM4jNIqAqcfXDPBYQm1fAXWLvmnlsEDfISZw8NpkVZL6EwHM2idef97NDNAhIfJt8iAVk poSArMSmA8wQ9ZISB1fcYJnAKLiAkWEVo2hqQXJBcVJ6kYlecWJucWleul5yfu4mRmAwnv73 bMIOxnsHrA8xCnAwKvHwdtxIDxViTSwrrsw9xGgKtGEis5Rocj4w5PNK4g2NzYwsTE1MjY3M Lc2UxHlfS/0MFhJITyxJzU5NLUgtii8qzUktPsTIxMEp1cAYEiTb9f1by9vWvhVuOz/2TK2S 6DbykX37kuXa70uz/7Qks6beOThxjgpP3ArBhbWvsywy9pY8KYvZOjHW5ezkKN6TU5ZVGZ0Q 7rk3/5lgtPpLA2OOFp3XgnG216SU0z2dsr2e+d6vfdt04VVBofTNnRF8//73TCysYHt+ZsKB htQHHJtSDqopsRRnJBpqMRcVJwIAZIAnEkECAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRmVeSWpSXmKPExsVy+t9jQV0ZtoxQg5WneS2ufH3PZvFpdSu7 xaT7E1gsXty7yGIxY/JLNgdWj7/Pr7N43O8+zuTRt2UVYwBzVAOjTUZqYkpqkUJqXnJ+SmZe uq2Sd3C8c7ypmYGhrqGlhbmSQl5ibqqtkotPgK5bZg7QUiWFssScUqBQQGJxsZK+HaYJoSFu uhYwjRG6viFBcD1GBmggYQ1jxsSb01gLpshWfD86gbmBcbZkFyM7h4SAicQ/vS5GTiBLTOLC vfVsXYxcHEIC0xklvk9YwQTh/GCUaOjbxwhSxSagJ3Fn23EmEFtEQFni78RVQHEODmaBHImp PUogYWEBH4m13ZuYQWwWAVWJqx/msYDYvALuEnvXzGODWCYncfLYZNYJjNwLGBlWMYqmFiQX FCel5xrpFSfmFpfmpesl5+duYgSH+jPpHYyrGiwOMQpwMCrx8FrcTQ8VYk0sK67MPcQowcGs JMK78y1QiDclsbIqtSg/vqg0J7X4EKMp0PaJzFKiyfnAOMwriTc0NjEzsjQyN7QwMjZXEuc9 me8TKiSQnliSmp2aWpBaBNPHxMEp1cBYEWBppXz2koHDS7bgPUuqhfcKTRJ8z7TfdImURUiI 3vHzfg8V+KobN8864c0bbqLJuPS+yIEVT+KfTrl47UlEwq/U+lcdU3iuZjVs5JDvPhV05MFC tQnNizdPeWC7mSXK4YGOX3csk75QvY3Q5BuvEg6u5553JVPWX6XrmJ7q3R0dJg4fRZSVWIoz Eg21mIuKEwGitDQ6iwIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: gustavo.padovan@collabora.co.uk, 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 Handle changes by removing copy from adjusted_mode to mode as using adjusted_mode of crtc_state. Signed-off-by: Joonyoung Shim --- This is based on a patch "[PATCH v9 04/18] drm/exynos: atomic phase 1: add .mode_set_nofb() callback" of Gustavo. drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_plane.c | 13 +++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index 6714e5b..f29e4be 100644 --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c @@ -175,7 +175,7 @@ static bool decon_mode_fixup(struct exynos_drm_crtc *crtc, static void decon_commit(struct exynos_drm_crtc *crtc) { struct decon_context *ctx = crtc->ctx; - struct drm_display_mode *mode = &crtc->base.mode; + struct drm_display_mode *mode = &crtc->base.state->adjusted_mode; u32 val, clkdiv; if (ctx->suspended) @@ -395,7 +395,7 @@ static void decon_shadow_protect_win(struct decon_context *ctx, static void decon_win_commit(struct exynos_drm_crtc *crtc, unsigned int win) { struct decon_context *ctx = crtc->ctx; - struct drm_display_mode *mode = &crtc->base.mode; + struct drm_display_mode *mode = &crtc->base.state->adjusted_mode; struct exynos_drm_plane *plane; int padding; unsigned long val, alpha; diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index a0edab8..b326b31 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -337,7 +337,7 @@ static bool fimd_mode_fixup(struct exynos_drm_crtc *crtc, static void fimd_commit(struct exynos_drm_crtc *crtc) { struct fimd_context *ctx = crtc->ctx; - struct drm_display_mode *mode = &crtc->base.mode; + struct drm_display_mode *mode = &crtc->base.state->adjusted_mode; struct fimd_driver_data *driver_data = ctx->driver_data; void *timing_base = ctx->regs + driver_data->timing_base; u32 val, clkdiv; diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c index 6e1341e..f0067f7 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c @@ -95,11 +95,12 @@ void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc, uint32_t src_w, uint32_t src_h) { struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane); + struct drm_display_mode *mode = &crtc->state->adjusted_mode; unsigned int actual_w; unsigned int actual_h; - actual_w = exynos_plane_get_size(crtc_x, crtc_w, crtc->mode.hdisplay); - actual_h = exynos_plane_get_size(crtc_y, crtc_h, crtc->mode.vdisplay); + actual_w = exynos_plane_get_size(crtc_x, crtc_w, mode->hdisplay); + actual_h = exynos_plane_get_size(crtc_y, crtc_h, mode->vdisplay); if (crtc_x < 0) { if (actual_w) @@ -135,10 +136,10 @@ void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc, exynos_plane->crtc_height = actual_h; /* set drm mode data. */ - exynos_plane->mode_width = crtc->mode.hdisplay; - exynos_plane->mode_height = crtc->mode.vdisplay; - exynos_plane->refresh = crtc->mode.vrefresh; - exynos_plane->scan_flag = crtc->mode.flags; + exynos_plane->mode_width = mode->hdisplay; + exynos_plane->mode_height = mode->vdisplay; + exynos_plane->refresh = mode->vrefresh; + exynos_plane->scan_flag = mode->flags; DRM_DEBUG_KMS("plane : offset_x/y(%d,%d), width/height(%d,%d)", exynos_plane->crtc_x, exynos_plane->crtc_y,