From patchwork Thu Dec 6 09:38:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10715519 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5CF4D1932 for ; Thu, 6 Dec 2018 09:39:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D2F32DEE7 for ; Thu, 6 Dec 2018 09:39:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 419FF2DF88; Thu, 6 Dec 2018 09:39:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1BAE2DEE7 for ; Thu, 6 Dec 2018 09:39:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729386AbeLFJjJ (ORCPT ); Thu, 6 Dec 2018 04:39:09 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:59876 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728250AbeLFJjJ (ORCPT ); Thu, 6 Dec 2018 04:39:09 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20181206093907euoutp012b89edc72946dae930d2613be65a63d7~ttOYTUo7C0138001380euoutp01g; Thu, 6 Dec 2018 09:39:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20181206093907euoutp012b89edc72946dae930d2613be65a63d7~ttOYTUo7C0138001380euoutp01g DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1544089147; bh=/Of+01NoeBh09Fw1Vho3ylGUZPrL4XAAD3DuVw+WSTM=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=k5YF2nvFZCoE0tHz5lFMudGQlZoRoftM8jHcVPJ8cRxks63atk6TIpEZrowCyQ4PU TvPMJEfwz3AOP39AA8wI7a4oILsIxF79A/zkfOjSC8rfqjJ4DwWO246BSW6tD2bkbQ P9SJOruWhUC29+CegExXKKo6YRwW3D3PzdyA3EPY= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181206093907eucas1p2edf92cd8c1d1e888b51f2f1eee29c5fc~ttOX1bI521559615596eucas1p2H; Thu, 6 Dec 2018 09:39:07 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 3E.BA.04441.A3EE80C5; Thu, 6 Dec 2018 09:39:06 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181206093906eucas1p212ab2e090927466e001dcec001a441c5~ttOXKbpbW1195011950eucas1p2p; Thu, 6 Dec 2018 09:39:06 +0000 (GMT) X-AuditID: cbfec7f2-5e3ff70000001159-bf-5c08ee3ab330 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id BE.44.04128.A3EE80C5; Thu, 6 Dec 2018 09:39:06 +0000 (GMT) Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PJB000UL6T4U830@eusync1.samsung.com>; Thu, 06 Dec 2018 09:39:05 +0000 (GMT) From: Andrzej Hajda To: Inki Dae Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski , dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 1/3] drm/exynos/decon5433: add dynamic zpos support Date: Thu, 06 Dec 2018 10:38:55 +0100 Message-id: <20181206093857.22324-2-a.hajda@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20181206093857.22324-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsWy7djP87pW7zhiDB6c1LK4te4cq8XGGetZ La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg ylj8QaWgSaLiSONGpgbGBSJdjJwcEgImEpNfbWDrYuTiEBJYwSgxbetyFgjnM6PE42sfmGCq rrXPZ4JILGOU6F/4gBnC+c8o8WTxBmaQKjYBTYm/m2+ygdgiAsoSq/a1s4MUMQtcYpR4fbKb ESQhLOAs8WXDVzCbRUBV4u3hTWDNvAIWEsf7F7FDrJOXWL3hAFicU8BS4v2aJywQ8Y+sEjNP WUPYLhKNR65DxYUlXh3fAtUrI3F5cjdUvF6iaeYVsEslBDoYJU4sXs4GkbCWOHz8IiuIzSzA JzFp23SgIg6gOK9ER5sQRImHxLtFO6Bh0cMocfflDvYJjJILGBlWMYqnlhbnpqcWG+allusV J+YWl+al6yXn525iBMbY6X/HP+1g/Hop6RCjAAejEg/viwfsMUKsiWXFlbmHGCU4mJVEeBn0 OGKEeFMSK6tSi/Lji0pzUosPMUpzsCiJ81YzPIgWEkhPLEnNTk0tSC2CyTJxcEo1MJp9ONUi +sewZI+0oydfx8PSwz/2s3dUTi4V/tv6NMcjSSbWTu15+5egczYNv066aDIcfz3RT/J7PVuh 0PncCtHrt1c1n570Xjul4wEvn9imR83f72y42r39yrx5DdOnLWKv9pV5ZCIYE+WxWUU0+Ufg h7xtrtnT5CJf97A1ySxo2Fjx4nu1oBJLcUaioRZzUXEiAEEaHvCtAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xy7pW7zhiDCadYLS4te4cq8XGGetZ La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg ylj8QaWgSaLiSONGpgbGBSJdjJwcEgImEtfa5zN1MXJxCAksYZQ4eesuG4TTyCQx48wjVpAq NgFNib+bb7KB2CICyhKr9rWzgxQxC1xhlGj/1sUOkhAWcJb4suErI4jNIqAq8fbwJmYQm1fA QuJ4/yJ2iHXyEqs3HACLcwpYSrxf84QFxBYCqpm0fCf7BEaeBYwMqxhFUkuLc9Nzi430ihNz i0vz0vWS83M3MQLDY9uxn1t2MHa9Cz7EKMDBqMTD++IBe4wQa2JZcWXuIUYJDmYlEV4GPY4Y Id6UxMqq1KL8+KLSnNTiQ4zSHCxK4rznDSqjhATSE0tSs1NTC1KLYLJMHJxSDYwOEk03nYOP 8TfLiCz/vKBl5Ymajwcft8+Yfrt+75uZv15opdrzOcxfdvzP/Mf3A1T/bJVQN+KKeftu78aa iU/D22/s4X1mpbmzj9XaKJgznvPu/ROpTMG3Xr3//lFM9su5quu+nPq7r7B94uNet8yx8tfr nE82Nk/frYqyljEvWKG3OUEqbtYjJZbijERDLeai4kQAs7pZhQsCAAA= X-CMS-MailID: 20181206093906eucas1p212ab2e090927466e001dcec001a441c5 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181206093906eucas1p212ab2e090927466e001dcec001a441c5 References: <20181206093857.22324-1-a.hajda@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP DECON has fixed hardware window order. To implement dynamic zpos normalized_zpos of active plane has to be connected to window number, and remaining windows have to be disabled. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index aef487dd8731..6e3e6e970690 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -326,7 +326,7 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, to_exynos_plane_state(plane->base.state); struct decon_context *ctx = crtc->ctx; struct drm_framebuffer *fb = state->base.fb; - unsigned int win = plane->index; + unsigned int win = state->base.normalized_zpos + ctx->first_win; unsigned int cpp = fb->format->cpp[0]; unsigned int pitch = fb->pitches[0]; dma_addr_t dma_addr = exynos_drm_fb_dma_addr(fb, 0); @@ -376,19 +376,18 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, ~0); } -static void decon_disable_plane(struct exynos_drm_crtc *crtc, - struct exynos_drm_plane *plane) -{ - struct decon_context *ctx = crtc->ctx; - unsigned int win = plane->index; - - decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, 0); -} - static void decon_atomic_flush(struct exynos_drm_crtc *crtc) { struct decon_context *ctx = crtc->ctx; unsigned long flags; + int win = hweight32(crtc->base.state->plane_mask) + ctx->first_win; + + /* disable windows corresponding to disabled planes */ + for (; win < WINDOWS_NR; ++win) { + if (!readl(ctx->addr + DECON_WINCONx(win)) & WINCONx_ENWIN_F) + break; + decon_set_bits(ctx, DECON_WINCONx(win), WINCONx_ENWIN_F, 0); + } spin_lock_irqsave(&ctx->vblank_lock, flags); @@ -462,7 +461,7 @@ static void decon_disable(struct exynos_drm_crtc *crtc) * a destroyed buffer later. */ for (i = ctx->first_win; i < WINDOWS_NR; i++) - decon_disable_plane(crtc, &ctx->planes[i]); + decon_set_bits(ctx, DECON_WINCONx(i), WINCONx_ENWIN_F, 0); decon_swreset(ctx); @@ -531,7 +530,6 @@ static const struct exynos_drm_crtc_ops decon_crtc_ops = { .disable_vblank = decon_disable_vblank, .atomic_begin = decon_atomic_begin, .update_plane = decon_update_plane, - .disable_plane = decon_disable_plane, .mode_valid = decon_mode_valid, .atomic_flush = decon_atomic_flush, }; @@ -552,6 +550,7 @@ static int decon_bind(struct device *dev, struct device *master, void *data) ctx->configs[win].num_pixel_formats = ARRAY_SIZE(decon_formats); ctx->configs[win].zpos = win - ctx->first_win; ctx->configs[win].type = decon_win_types[win]; + ctx->configs[win].capabilities = EXYNOS_DRM_PLANE_CAP_ZPOS; ret = exynos_plane_init(drm_dev, &ctx->planes[win], win, &ctx->configs[win]); From patchwork Thu Dec 6 09:38:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10715515 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A6432109C for ; Thu, 6 Dec 2018 09:39:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 937ED2DEF3 for ; Thu, 6 Dec 2018 09:39:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 86A6C2DFDE; Thu, 6 Dec 2018 09:39:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECA6C2DEF3 for ; Thu, 6 Dec 2018 09:39:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728250AbeLFJjJ (ORCPT ); Thu, 6 Dec 2018 04:39:09 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:59883 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728648AbeLFJjJ (ORCPT ); Thu, 6 Dec 2018 04:39:09 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20181206093908euoutp01ff9b44d37f36753ca1a04d8c0af8a4d1~ttOYwmQA03275932759euoutp01c; Thu, 6 Dec 2018 09:39:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20181206093908euoutp01ff9b44d37f36753ca1a04d8c0af8a4d1~ttOYwmQA03275932759euoutp01c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1544089148; bh=VyW9/SaomhypB9Dcjqc/7ims5HOEtPQercdH4auRgro=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=tNrI5VDB8PZuAXmNPtjSw7KVU/U8Ruzd3TyqAQYqczYuVme0/nOrz9eDnFTDnBF3o 5TM21daB4ziuUPzyf9ZuMAVbo9jjCGgvfh2M5RZBxyuIba1SA8LTh2+codDht3OB4x bhbhWhEgsQpFsz39qxrsEo/SDU9FIw7akQ0Z6q+M= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181206093907eucas1p2e20ebb1a235e462c18d477c440aefb38~ttOYTv4cX1560315603eucas1p2S; Thu, 6 Dec 2018 09:39:07 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 4D.85.04806.B3EE80C5; Thu, 6 Dec 2018 09:39:07 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181206093906eucas1p201bdbdc03cabc2a3f60ea04b794ffd04~ttOXUqs5M1563515635eucas1p2M; Thu, 6 Dec 2018 09:39:06 +0000 (GMT) X-AuditID: cbfec7f5-367ff700000012c6-f0-5c08ee3b946c Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 2F.44.04128.A3EE80C5; Thu, 6 Dec 2018 09:39:06 +0000 (GMT) Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PJB000UL6T4U830@eusync1.samsung.com>; Thu, 06 Dec 2018 09:39:06 +0000 (GMT) From: Andrzej Hajda To: Inki Dae Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski , dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 2/3] drm/exynos/fimd: create local helper for disabling hardware window Date: Thu, 06 Dec 2018 10:38:56 +0100 Message-id: <20181206093857.22324-3-a.hajda@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20181206093857.22324-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRmVeSWpSXmKPExsWy7djP87rW7zhiDO4c4Le4te4cq8XGGetZ La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg ymh+MYW5YJNgxZT39xgbGLfydTFyckgImEi8WzaXvYuRi0NIYAWjxPY9z5kgnM+MEl/3TGOG qVrT1cIGYgsJLGOUuL6/AqLoP6PErq9fWUASbAKaEn833wQrEhFQlli1rx1sLLPAJUaJ1ye7 GUESwgKREmf+nAUrYhFQlbi9ayJYM6+AhcTXB2eZILbJS6zecABsM6eApcT7NU9YQAZJCHxk lZi59TI7RJGLxJNlN6AahCVeHd8CFZeRuDy5mwXCrpdomnmFGaK5g1HixOLlbBAJa4nDxy+y gtjMAnwSk7ZNByriAIrzSnS0CUGUeEhMn7CMDeLNHkaJm/O2sU1glFzAyLCKUTy1tDg3PbXY OC+1XK84Mbe4NC9dLzk/dxMjMMpO/zv+dQfjvj9JhxgFOBiVeHhfPGCPEWJNLCuuzD3EKMHB rCTCy6DHESPEm5JYWZValB9fVJqTWnyIUZqDRUmct5rhQbSQQHpiSWp2ampBahFMlomDU6qB 8fIqbvOQnxMyNu489FnB0mVzZM/a/NKFja1eGnkXlb4/CF40hc2eaXPu7Kem5bpHxeQv8+Us CDnqnjlHpHGL+BTDaa1eIcf3Tr3ynsGF76eu4NNS/8rYiT6vg9mFPx58ktLRIXPnxLdPn+9e sNnZNad2/VxOOam2R1m3ww6r3T6YaDhFjrMxTYmlOCPRUIu5qDgRAB8sRH+uAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJJMWRmVeSWpSXmKPExsVy+t/xy7pW7zhiDC4ekbK4te4cq8XGGetZ La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg ymh+MYW5YJNgxZT39xgbGLfydTFyckgImEis6Wph62Lk4hASWMIo8af9IyOE08gk8XjBKlaQ KjYBTYm/m2+ygdgiAsoSq/a1s4MUMQtcYZRo/9bFDpIQFoiUOPPnLFgRi4CqxO1dE1lAbF4B C4mvD84yQayTl1i94QAziM0pYCnxfs0TsBohoJpJy3eyT2DkWcDIsIpRJLW0ODc9t9hIrzgx t7g0L10vOT93EyMwQLYd+7llB2PXu+BDjAIcjEo8vC8esMcIsSaWFVfmHmKU4GBWEuFl0OOI EeJNSaysSi3Kjy8qzUktPsQozcGiJM573qAySkggPbEkNTs1tSC1CCbLxMEp1cA4wyvU8M9v LbtvKae5Ga9cYs9mOeX4S3ftEX9t/oC1bm5pu55vXczqUGERLmarsujN9LUnlRm3dfz9cOap bVx6TdjHJ7rJXe8LpvQfclzRUbBb5LzWl259vRBF3yUWux5ZxrgdOyFSF3V6ZyWLvbW4zt5f G72dRPe0O5b1cfp4bY9fzHue/YYSS3FGoqEWc1FxIgBc213dDAIAAA== X-CMS-MailID: 20181206093906eucas1p201bdbdc03cabc2a3f60ea04b794ffd04 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181206093906eucas1p201bdbdc03cabc2a3f60ea04b794ffd04 References: <20181206093857.22324-1-a.hajda@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hardware window disabling is performed in multiple places. Creating helper for it simplifies the code and prepares it for further improvements. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index b7f56935a46b..226127f35052 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -331,6 +331,14 @@ static void fimd_enable_shadow_channel_path(struct fimd_context *ctx, writel(val, ctx->regs + SHADOWCON); } +static void fimd_disable_win(struct fimd_context *ctx, int win) +{ + fimd_enable_video_output(ctx, win, false); + + if (ctx->driver_data->has_shadowcon) + fimd_enable_shadow_channel_path(ctx, win, false); +} + static void fimd_clear_channels(struct exynos_drm_crtc *crtc) { struct fimd_context *ctx = crtc->ctx; @@ -349,12 +357,7 @@ static void fimd_clear_channels(struct exynos_drm_crtc *crtc) u32 val = readl(ctx->regs + WINCON(win)); if (val & WINCONx_ENWIN) { - fimd_enable_video_output(ctx, win, false); - - if (ctx->driver_data->has_shadowcon) - fimd_enable_shadow_channel_path(ctx, win, - false); - + fimd_disable_win(ctx, win); ch_enabled = 1; } } @@ -805,15 +808,11 @@ static void fimd_disable_plane(struct exynos_drm_crtc *crtc, struct exynos_drm_plane *plane) { struct fimd_context *ctx = crtc->ctx; - unsigned int win = plane->index; if (ctx->suspended) return; - fimd_enable_video_output(ctx, win, false); - - if (ctx->driver_data->has_shadowcon) - fimd_enable_shadow_channel_path(ctx, win, false); + fimd_disable_win(ctx, plane->index); } static void fimd_enable(struct exynos_drm_crtc *crtc) @@ -848,7 +847,7 @@ static void fimd_disable(struct exynos_drm_crtc *crtc) * a destroyed buffer later. */ for (i = 0; i < WINDOWS_NR; i++) - fimd_disable_plane(crtc, &ctx->planes[i]); + fimd_disable_win(ctx, i); fimd_enable_vblank(crtc); fimd_wait_for_vblank(crtc); From patchwork Thu Dec 6 09:38:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10715517 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0BEBD14E2 for ; Thu, 6 Dec 2018 09:39:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFC772DEF3 for ; Thu, 6 Dec 2018 09:39:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3DE82DF88; Thu, 6 Dec 2018 09:39:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B4A32DF95 for ; Thu, 6 Dec 2018 09:39:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729382AbeLFJjJ (ORCPT ); Thu, 6 Dec 2018 04:39:09 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:59888 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729385AbeLFJjJ (ORCPT ); Thu, 6 Dec 2018 04:39:09 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20181206093908euoutp01fcc2ae537c585c762333347a5c87077e~ttOZBCysl0031000310euoutp01Q; Thu, 6 Dec 2018 09:39:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20181206093908euoutp01fcc2ae537c585c762333347a5c87077e~ttOZBCysl0031000310euoutp01Q DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1544089148; bh=6J10P2D3biHJIelxv3U2Zcp9XDw2G1ob3LSmL5qmouw=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=medWKVHtvWnadhKse8+ZmsdDn0TQJREbvdm04jhfqziGMHFzuMeJH3bV9NxrJI64+ cDT4sER1Vrr98dmUh8kZsUrz6so1V63oCDFVP5bB6tispIxLSozV6CPvtv+hZd48sF PFFxUU6CMqvAIsArsnTiKaYgV1xhKReAAU+6SloQ= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20181206093907eucas1p1661640a7d941d6debb94ebaf826b9127~ttOYhPzUk0209502095eucas1p1k; Thu, 6 Dec 2018 09:39:07 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 5D.85.04806.B3EE80C5; Thu, 6 Dec 2018 09:39:07 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20181206093906eucas1p1ab20b4dabdb0a5e32c1e639cf38b0357~ttOXqx3wb0095000950eucas1p1n; Thu, 6 Dec 2018 09:39:06 +0000 (GMT) X-AuditID: cbfec7f5-34dff700000012c6-f1-5c08ee3b86c3 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id EB.AE.04284.A3EE80C5; Thu, 6 Dec 2018 09:39:06 +0000 (GMT) Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PJB000UL6T4U830@eusync1.samsung.com>; Thu, 06 Dec 2018 09:39:06 +0000 (GMT) From: Andrzej Hajda To: Inki Dae Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski , dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 3/3] drm/exynos/fimd: add dynamic zpos support Date: Thu, 06 Dec 2018 10:38:57 +0100 Message-id: <20181206093857.22324-4-a.hajda@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20181206093857.22324-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWy7djP87rW7zhiDFrnCFncWneO1WLjjPWs Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw ZbzsPcpcMFmk4s/HzAbGpwJdjJwcEgImEj9PPWTqYuTiEBJYwShx7P4mFpCEkMBnRokLiyRg ima17mGDKFrGKNHz5SlUx39GiV1fv4J1sAloSvzdfJMNxBYRUJZYta+dHaSIWeASo8Trk92M IAlhATuJWUsPATVwcLAIqEpcuqgIEuYVsJBY9qGNCWKbvMTqDQeYQWxOAUuJ92uesIDMkRD4 yCrx6OkPdogiF4k9XdtYIGxhiVfHt0DFZSQ6Ow5CDaqXaJp5hRmiuYNR4sTi5WwQCWuJw8cv soLYzAJ8EpO2TWcGOUhCgFeio00IosRD4uq/FawQX/YwShyftoVpAqPkAkaGVYziqaXFuemp xcZ5qeV6xYm5xaV56XrJ+bmbGIERdvrf8a87GPf9STrEKMDBqMTD++IBe4wQa2JZcWXuIUYJ DmYlEV4GPY4YId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rzVDA+ihQTSE0tSs1NTC1KLYLJMHJxS DYyynjtOKLpYvPx66HPv1XWWb8we9WY7KpUlbP9y8MD5nTltdr1HPhVdv8YiwjOhwqnOT8Vy 6sWuUPtEISNbvbJDaxsN/xnEBt+0LTRLuNHgsygj6tUBto+GCRdevZuh+fVhh/9a2V+WDO+O XLQ9uOVq0SoPjUbVluZyj6syISYiX6f+lrBr7FBiKc5INNRiLipOBADkh+JMrAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrGJMWRmVeSWpSXmKPExsVy+t/xy7pW7zhiDKZvNbK4te4cq8XGGetZ La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg ynjZe5S5YLJIxZ+PmQ2MTwW6GDk5JARMJGa17mEDsYUEljBKPH+v2MXIBWQ3Mkk8XrCKFSTB JqAp8XfzTbAiEQFliVX72tlBipgFrjBKtH/rYgdJCAvYScxaeoili5GDg0VAVeLSRUWQMK+A hcSyD21MEMvkJVZvOMAMYnMKWEq8X/OEBWKxhcSk5TvZJzDyLGBkWMUoklpanJueW2yoV5yY W1yal66XnJ+7iREYGtuO/dy8g/HSxuBDjAIcjEo8vC8esMcIsSaWFVfmHmKU4GBWEuFl0OOI EeJNSaysSi3Kjy8qzUktPsQozcGiJM573qAySkggPbEkNTs1tSC1CCbLxMEp1cBYfGLBeVMJ bh72j0/dg1wiuebMOibqK6Xo2jFPvjNjs0P/xNC9T4zzfos+j51z/VX7wRdx7uopQif2K9c/ 9S/5s0GqaM9LxYgTJ0/s9ozc4fbp/q/C7mdbI28sWvw0XGnqBimLK4unTb2y85DnLJ1NFc8O BBn/n2DWmMxq5OdclLK/TT2/L7FLiaU4I9FQi7moOBEAUGvZbwkCAAA= X-CMS-MailID: 20181206093906eucas1p1ab20b4dabdb0a5e32c1e639cf38b0357 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181206093906eucas1p1ab20b4dabdb0a5e32c1e639cf38b0357 References: <20181206093857.22324-1-a.hajda@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP FIMD has fixed hardware window order. To implement dynamic zpos normalized_zpos of active plane has to be connected to window number, and remaining windows have to be disabled. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 226127f35052..c4e2129e0e3f 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -706,6 +706,12 @@ static void fimd_atomic_flush(struct exynos_drm_crtc *crtc) if (ctx->suspended) return; + for (i = hweight32(crtc->base.state->plane_mask); i < WINDOWS_NR; i++) { + if (!(readl(ctx->regs + WINCON(i)) & WINCONx_ENWIN)) + break; + fimd_disable_win(ctx, i); + } + for (i = 0; i < WINDOWS_NR; i++) fimd_shadow_protect_win(ctx, i, false); @@ -722,7 +728,7 @@ static void fimd_update_plane(struct exynos_drm_crtc *crtc, dma_addr_t dma_addr; unsigned long val, size, offset; unsigned int last_x, last_y, buf_offsize, line_size; - unsigned int win = plane->index; + unsigned int win = state->base.normalized_zpos; unsigned int cpp = fb->format->cpp[0]; unsigned int pitch = fb->pitches[0]; @@ -804,17 +810,6 @@ static void fimd_update_plane(struct exynos_drm_crtc *crtc, atomic_set(&ctx->win_updated, 1); } -static void fimd_disable_plane(struct exynos_drm_crtc *crtc, - struct exynos_drm_plane *plane) -{ - struct fimd_context *ctx = crtc->ctx; - - if (ctx->suspended) - return; - - fimd_disable_win(ctx, plane->index); -} - static void fimd_enable(struct exynos_drm_crtc *crtc) { struct fimd_context *ctx = crtc->ctx; @@ -933,7 +928,6 @@ static const struct exynos_drm_crtc_ops fimd_crtc_ops = { .disable_vblank = fimd_disable_vblank, .atomic_begin = fimd_atomic_begin, .update_plane = fimd_update_plane, - .disable_plane = fimd_disable_plane, .atomic_flush = fimd_atomic_flush, .atomic_check = fimd_atomic_check, .te_handler = fimd_te_handler, @@ -987,6 +981,7 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) ctx->configs[i].num_pixel_formats = ARRAY_SIZE(fimd_formats); ctx->configs[i].zpos = i; ctx->configs[i].type = fimd_win_types[i]; + ctx->configs[i].capabilities = EXYNOS_DRM_PLANE_CAP_ZPOS; ret = exynos_plane_init(drm_dev, &ctx->planes[i], i, &ctx->configs[i]); if (ret)