From patchwork Wed Jun 5 07:38:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inki Dae X-Patchwork-Id: 2665941 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 1A4D93FD4F for ; Wed, 5 Jun 2013 07:39:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F5A0E63B3 for ; Wed, 5 Jun 2013 00:39:31 -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 DF39EE63C5 for ; Wed, 5 Jun 2013 00:38:59 -0700 (PDT) Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MNW00A2DT8BO8H0@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Wed, 05 Jun 2013 16:38:53 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.114]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 21.AD.29708.D0BEEA15; Wed, 05 Jun 2013 16:38:53 +0900 (KST) X-AuditID: cbfee690-b7f6f6d00000740c-c4-51aeeb0dcf28 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 8A.4B.21068.D0BEEA15; Wed, 05 Jun 2013 16:38:53 +0900 (KST) Received: from daeinki-desktop.10.32.193.11 ([10.90.8.53]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MNW00ESOT8SB971@mmp1.samsung.com>; Wed, 05 Jun 2013 16:38:52 +0900 (KST) From: Inki Dae To: airlied@linux.ie, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/exynos: do not use mode_set_base function directly Date: Wed, 05 Jun 2013 16:38:52 +0900 Message-id: <1370417932-11514-1-git-send-email-inki.dae@samsung.com> X-Mailer: git-send-email 1.7.5.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsWyRsSkSJf39bpAg/89Qha9504yWVz5+p7N YtL9CSwWL+5dZLE42/SG3WLG5JdsDmwe2789YPW4332cyaNvyyrGAOYoLpuU1JzMstQifbsE rowD1/+xFXTwV7z58Ii1gfECTxcjJ4eEgInEzYsPGCFsMYkL99azdTFycQgJLGWUuNJ6iBWm aMGWLawQiUWMEpd3r2GCcLqYJLbcP8AEUsUmoCoxccV9NhBbRMBUomPSUhYQm1kgTeL7973s ILawgLvEio49YDUsQPW3D85nBrF5BVwkZi1pgjpDQeLXkVVg2yQE3rNJXOh9ygzRICDxbfIh oKEcQAlZiU0HmCHqJSUOrrjBMoFRcAEjwypG0dSC5ILipPQiE73ixNzi0rx0veT83E2MwOA8 /e/ZhB2M9w5YH2JMBho3kVlKNDkfGNx5JfGGxmZGFqYmpsZG5pZmpAkrifOqt1gHCgmkJ5ak ZqemFqQWxReV5qQWH2Jk4uCUamD0DpqWezVfSdS2Vv51cLajubznqkufFhW8nRs4IeD/wVDP PMu1hpqFgbc+bA+5Hu94zIVV+0bCxzsTt1rlGR7ddyqe5wiTqOeXjfva24SnzlE7VKPzYaFC jGmIul3Z41nc5xkuO0SZVJquDmipO3aL97KSrdIDM1nrmRmTTz/jzmI8MCOjMFaJpTgj0VCL uag4EQB7/Kc3ZAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrHIsWRmVeSWpSXmKPExsVy+t9jAV3e1+sCDf4f4LLoPXeSyeLK1/ds FpPuT2CxeHHvIovF2aY37BYzJr9kc2Dz2P7tAavH/e7jTB59W1YxBjBHNTDaZKQmpqQWKaTm JeenZOal2yp5B8c7x5uaGRjqGlpamCsp5CXmptoqufgE6Lpl5gBtVlIoS8wpBQoFJBYXK+nb YZoQGuKmawHTGKHrGxIE12NkgAYS1jBmHLj+j62gg7/izYdHrA2MF3i6GDk5JARMJBZs2cIK YYtJXLi3nq2LkYtDSGARo8Tl3WuYIJwuJokt9w8wgVSxCahKTFxxnw3EFhEwleiYtJQFxGYW SJP4/n0vO4gtLOAusaJjD1gNC1D97YPzmUFsXgEXiVlLmhghtilI/DqyinUCI/cCRoZVjKKp BckFxUnpuUZ6xYm5xaV56XrJ+bmbGMGh/0x6B+OqBotDjAIcjEo8vA8+rQ0UYk0sK67MPcQo wcGsJMIbmrAuUIg3JbGyKrUoP76oNCe1+BBjMtD2icxSosn5wLjMK4k3NDYxM7I0Mje0MDI2 J01YSZz3YKt1oJBAemJJanZqakFqEcwWJg5OqQZG047Vd5Wk2tvStf32VBmulw5dKPeW6fu/ tef3+Eckv1nY+KCcM+Ajz5bPH+adPDVrw/G3YqrhgjPCw10OHXuzM3mrbnbZrtm8D/9eljhg FFuStfFa3ytfBofjdgsue5lutlt8SmlJ7vziHSytGTfXh2V5ftx952IwDxu/pEDutGvC/ca9 Oz6eVmIpzkg01GIuKk4EALA5YjnBAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: kyungmin.park@samsung.com, sw0312.kim@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org This patch adds exynos_drm_crtc_mode_set_commit function to update mode data and it makes page flip call this function instead of calling exynos_drm_crtc_mode_set_base function directly. exynos_drm_crtc_mode_set_base function is called by drm subsystem as a callback so we don't have to call this function directly. Signed-off-by: Inki Dae Signed-off-by: Kyungmin Park --- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index c200e4d..c64e32d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -139,7 +139,7 @@ exynos_drm_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode, return 0; } -static int exynos_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, +static int exynos_drm_crtc_mode_set_commit(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); @@ -169,6 +169,12 @@ static int exynos_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, return 0; } +static int exynos_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, + struct drm_framebuffer *old_fb) +{ + return exynos_drm_crtc_mode_set_commit(crtc, x, y, old_fb); +} + static void exynos_drm_crtc_load_lut(struct drm_crtc *crtc) { DRM_DEBUG_KMS("%s\n", __FILE__); @@ -237,7 +243,7 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc, spin_unlock_irq(&dev->event_lock); crtc->fb = fb; - ret = exynos_drm_crtc_mode_set_base(crtc, crtc->x, crtc->y, + ret = exynos_drm_crtc_mode_set_commit(crtc, crtc->x, crtc->y, NULL); if (ret) { crtc->fb = old_fb;