From patchwork Thu Apr 9 06:54: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: 6183711 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9F5AC9F2E9 for ; Thu, 9 Apr 2015 06:54:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C7330203C0 for ; Thu, 9 Apr 2015 06:54:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7D7B720364 for ; Thu, 9 Apr 2015 06:54:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 382FF6E069; Wed, 8 Apr 2015 23:54:29 -0700 (PDT) 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 21B0D6E069 for ; Wed, 8 Apr 2015 23:54:27 -0700 (PDT) Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NMJ001491UPZ980@mailout4.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 09 Apr 2015 15:54:25 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.113]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 16.90.24422.12226255; Thu, 9 Apr 2015 15:54:25 +0900 (KST) X-AuditID: cbfee68f-f793b6d000005f66-a2-552622213bb1 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id FC.A9.25346.12226255; Thu, 9 Apr 2015 15:54:25 +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 <0NMJ00B2M1UPJBD0@mmp2.samsung.com>; Thu, 09 Apr 2015 15:54:25 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/exynos: use drm_plane_force_disable Date: Thu, 09 Apr 2015 15:54:38 +0900 Message-id: <1428562478-29076-1-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrALMWRmVeSWpSXmKPExsWyRsSkUFdRSS3UoGWHhcWVr+/ZLD6tbmW3 mHR/AovFi3sXWSxmTH7J5sDq8ff5dRaP+93HmTz6tqxiDGCO4rJJSc3JLEst0rdL4MrYPvkY Y8FO3oretxvZGxg3cXcxcnJICJhILL7/ngXCFpO4cG89WxcjF4eQwFJGiceP1rHDFM26vQEq MZ1Ror3pJSOE8wOoak4nG0gVm4CexJ1tx5lAbBEBZYm/E1cBFXFwMAvkSEztUQIJCwtYSDQ9 mAZWziKgKnFu91pWEJtXwF1i3411TBDL5CROHpvMCjJfQuAxm8SzLeeZIRoEJL5NPsQCMlNC QFZi0wFmiHpJiYMrbrBMYBRcwMiwilE0tSC5oDgpvchYrzgxt7g0L10vOT93EyMwIE//e9a/ g/HuAetDjAIcjEo8vC++qYYKsSaWFVfmHmI0BdowkVlKNDkfGPZ5JfGGxmZGFqYmpsZG5pZm SuK8C6V+BgsJpCeWpGanphakFsUXleakFh9iZOLglGpgnNF1xvbRCelbDapZ4hK93JfEdytp ir9dXTH5q6rkvgen7j43nHM3gXmq9/+Npzxef15eu+Dr04wnT77ceyBWqLJnbSWXoa7xtqNv Y8Wjzf6nLlm1t8dgptLSHKGMHG6TP7LhXFM2n5bab+ezkGdt7krV7VUB2399yF0RevasvlZr p951nvzPKkosxRmJhlrMRcWJALx8jOhDAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRmVeSWpSXmKPExsVy+t9jQV1FJbVQg3sPDSyufH3PZvFpdSu7 xaT7E1gsXty7yGIxY/JLNgdWj7/Pr7N43O8+zuTRt2UVYwBzVAOjTUZqYkpqkUJqXnJ+SmZe uq2Sd3C8c7ypmYGhrqGlhbmSQl5ibqqtkotPgK5bZg7QUiWFssScUqBQQGJxsZK+HaYJoSFu uhYwjRG6viFBcD1GBmggYQ1jxvbJxxgLdvJW9L7dyN7AuIm7i5GTQ0LARGLW7Q1sELaYxIV7 64FsLg4hgemMEu1NLxkhnB+MEo/ndIJVsQnoSdzZdpwJxBYRUJb4O3EVUBEHB7NAjsTUHiWQ sLCAhUTTg2lg5SwCqhLndq9lBbF5Bdwl9t1YxwSxTE7i5LHJrBMYuRcwMqxiFE0tSC4oTkrP NdQrTswtLs1L10vOz93ECA73Z1I7GFc2WBxiFOBgVOLhffFNNVSINbGsuDL3EKMEB7OSCG+y lFqoEG9KYmVValF+fFFpTmrxIUZToO0TmaVEk/OBsZhXEm9obGJmZGlkbmhhZGyuJM47R1cu VEggPbEkNTs1tSC1CKaPiYNTqoFRJOJIS0NLzM4j23RfKn56L7WL/421WJGXaGv07y2iJ99d XZrqNYmHxyQ70GhO7tqXSxf8Cw7+vPzmoV27zm+Re2gueXp66xLGew++ClTt5xA95XRUQeWv ZLqb6suWmfb7J+vIxGmb3Zl8+sYKBfPwGqPbfqYpZ3cxrXiVxjDteeLtu2c2Jud+VWIpzkg0 1GIuKk4EAOWJ/qaNAgAA 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 Don't call directly disable callback of plane helper, we need to disconnect the plane from the fb and crtc after disable callback. Signed-off-by: Joonyoung Shim --- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 5 +---- drivers/gpu/drm/exynos/exynos_drm_encoder.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index 519c569..50c830e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -48,7 +48,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc) { struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); struct drm_plane *plane; - int ret; if (!exynos_crtc->enabled) return; @@ -69,9 +68,7 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc) if (plane->crtc != crtc) continue; - ret = plane->funcs->disable_plane(plane); - if (ret) - DRM_ERROR("Failed to disable plane %d\n", ret); + drm_plane_force_disable(plane); } } diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c index 0648ba4..3ca266d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c +++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c @@ -90,7 +90,7 @@ static void exynos_drm_encoder_disable(struct drm_encoder *encoder) /* all planes connected to this encoder should be also disabled. */ drm_for_each_legacy_plane(plane, &dev->mode_config.plane_list) { if (plane->crtc && (plane->crtc == encoder->crtc)) - plane->funcs->disable_plane(plane); + drm_plane_force_disable(plane); } }