From patchwork Thu Jan 29 11:15:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 5741521 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 0B468BF440 for ; Thu, 29 Jan 2015 11:15:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 315B32021F for ; Thu, 29 Jan 2015 11:15:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3B30420225 for ; Thu, 29 Jan 2015 11:15:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 41CB36E73B; Thu, 29 Jan 2015 03:15:36 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by gabe.freedesktop.org (Postfix) with ESMTP id B3D096E747 for ; Thu, 29 Jan 2015 03:15:34 -0800 (PST) Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NIX009Y5R9YSV20@mailout4.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 29 Jan 2015 20:15:34 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.113]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 67.E3.17016.2561AC45; Thu, 29 Jan 2015 20:15:30 +0900 (KST) X-AuditID: cbfee68d-f79296d000004278-3c-54ca1652881b Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 98.21.09430.2561AC45; Thu, 29 Jan 2015 20:15:30 +0900 (KST) Received: from localhost.localdomain ([10.252.81.123]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NIX00DI2R9UPZ80@mmp2.samsung.com>; Thu, 29 Jan 2015 20:15:30 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/exynos: solve plane on/off disharmory issue Date: Thu, 29 Jan 2015 20:15:31 +0900 Message-id: <1422530131-18122-2-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1422530131-18122-1-git-send-email-jy0922.shim@samsung.com> References: <1422530131-18122-1-git-send-email-jy0922.shim@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsWyRsSkUDdI7FSIwdSTehZXvr5ns5h0fwKL xYt7F1ksZkx+yebA4nG/+ziTR9+WVYwBTFFcNimpOZllqUX6dglcGcdvv2Au2C5b8fbzI7YG xhUSXYycHBICJhKTf79gh7DFJC7cW8/WxcjFISSwlFHi3stdTDBF0zuus0MkpjNKXN/9lhXC aWOSeHPzGiNIFZuAnsSdbcfBOkQElCX+TlwFFmcW8JRYsWoeWFxYwEWi4+hHVhCbRUBVovX9 VTCbV8BdYk/vP2aIbXISJ49NBotzCnhInJm4Cew8IaCa2f8eMoEslhB4zSaxo/My1CABiW+T D7F0MXIAJWQlNh2AmiMpcXDFDZYJjMILGBlWMYqmFiQXFCelFxnqFSfmFpfmpesl5+duYgSG 6+l/z3p3MN4+YH2IUYCDUYmHN6HxZIgQa2JZcWXuIUZToA0TmaVEk/OBUZFXEm9obGZkYWpi amxkbmmmJM6rKPUzWEggPbEkNTs1tSC1KL6oNCe1+BAjEwenVAOjZH5uOKP1+4Whd1Q7g7e6 HuyR1zCYF+etqbR4k6v9mcirvzXkVDYW5G38eMQ4OeGcmq/XhBN7vKV0rTbczZXf6LLPalnc jO1xr3utDwQobPkofb2i7vDD989iXde7zFuzNMjD7rij1Mn40q+bnLIbD66W7XvdfGwXR2Dj Lb8yef2l2vs4XR4osRRnJBpqMRcVJwIAzFY/P1ICAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xoG6Q2KkQg6f/NSyufH3PZjHp/gQW ixf3LrJYzJj8ks2BxeN+93Emj74tqxgDmKIaGG0yUhNTUosUUvOS81My89JtlbyD453jTc0M DHUNLS3MlRTyEnNTbZVcfAJ03TJzgFYpKZQl5pQChQISi4uV9O0wTQgNcdO1gGmM0PUNCYLr MTJAAwlrGDOO337BXLBdtuLt50dsDYwrJLoYOTkkBEwkpndcZ4ewxSQu3FvP1sXIxSEkMJ1R 4vrut6wQThuTxJub1xhBqtgE9CTubDvOBGKLCChL/J24CizOLOApsWLVPLC4sICLRMfRj6wg NouAqkTr+6tgNq+Au8Se3n/MENvkJE4emwwW5xTwkDgzcRPYFUJANbP/PWSawMi7gJFhFaNo akFyQXFSeq6RXnFibnFpXrpecn7uJkZwNDyT3sG4qsHiEKMAB6MSD29C48kQIdbEsuLK3EOM EhzMSiK8YgKnQoR4UxIrq1KL8uOLSnNSiw8xmgJdNZFZSjQ5HxipeSXxhsYmZkaWRuaGFkbG 5krivEr2bSFCAumJJanZqakFqUUwfUwcnFINjDWVSZoMmjxfq+/21HwTyPhudFSj+/Vi7Q3m P5TWPpvEtifh2sdkFivVzKqYH3f3pL/9eUxkkqlQc1Z2iK5uXeNm//4pQj/ijrPKxSsdCz72 t11fJKhq+y7tw3kexsuTvhXLx/EeWvdl/oLKaxamsr8OX2RdejjqZJTx1Zk/Dsw3+j5j0fGc X0osxRmJhlrMRcWJAOGmPOGcAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: 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 The exynos_update_plane functions can be called from set_plane as well as set_crtc and pageflip. Currently the plane displayed by set_plane isn't called exynos_plane_on function and if plane is disabled, it calls exynos_plane_off, so it causes disharmory of plane on/off. This is caused from commit e7cd81111041 ("drm/exynos: Don't touch DPMS when updating overlay planes"). Make .update_plane function called only by set_plane and call exynos_plane_on in it. Signed-off-by: Joonyoung Shim --- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 4 ++-- drivers/gpu/drm/exynos/exynos_drm_plane.c | 21 ++++++++++++++++++++- drivers/gpu/drm/exynos/exynos_drm_plane.h | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index dac8f90..2765f7e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -129,7 +129,7 @@ static int exynos_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, crtc_w = fb->width - x; crtc_h = fb->height - y; - return exynos_update_plane(crtc->primary, crtc, fb, 0, 0, + return exynos_plane_update(crtc->primary, crtc, fb, 0, 0, crtc_w, crtc_h, x, y, crtc_w, crtc_h); } @@ -203,7 +203,7 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc, crtc->primary->fb = fb; crtc_w = fb->width - crtc->x; crtc_h = fb->height - crtc->y; - ret = exynos_update_plane(crtc->primary, crtc, fb, 0, 0, + ret = exynos_plane_update(crtc->primary, crtc, fb, 0, 0, crtc_w, crtc_h, crtc->x, crtc->y, crtc_w, crtc_h); if (ret) { diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c index aa87d79..88674d9 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c @@ -176,7 +176,7 @@ void exynos_plane_off(struct drm_plane *plane) } int -exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, +exynos_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, struct drm_framebuffer *fb, int crtc_x, int crtc_y, unsigned int crtc_w, unsigned int crtc_h, uint32_t src_x, uint32_t src_y, @@ -201,6 +201,25 @@ exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, return 0; } +static int +exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, + struct drm_framebuffer *fb, int crtc_x, int crtc_y, + unsigned int crtc_w, unsigned int crtc_h, + uint32_t src_x, uint32_t src_y, + uint32_t src_w, uint32_t src_h) +{ + int ret; + + ret = exynos_plane_update(plane, crtc, fb, crtc_x, crtc_y, + crtc_w, crtc_h, src_x, src_y, src_w, src_h); + if (ret < 0) + return ret; + + exynos_plane_on(plane); + + return 0; +} + static int exynos_disable_plane(struct drm_plane *plane) { exynos_plane_off(plane); diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.h b/drivers/gpu/drm/exynos/exynos_drm_plane.h index c778295..239eff5 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_plane.h +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.h @@ -15,7 +15,7 @@ void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc, unsigned int crtc_w, unsigned int crtc_h, uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h); -int exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, +int exynos_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, struct drm_framebuffer *fb, int crtc_x, int crtc_y, unsigned int crtc_w, unsigned int crtc_h, uint32_t src_x, uint32_t src_y,