From patchwork Wed Mar 20 13:06:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10861557 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 715E315AC for ; Wed, 20 Mar 2019 13:07:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58A4428B92 for ; Wed, 20 Mar 2019 13:07:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5642329858; Wed, 20 Mar 2019 13:07:18 +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 AB50728BA9 for ; Wed, 20 Mar 2019 13:07:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727492AbfCTNHR (ORCPT ); Wed, 20 Mar 2019 09:07:17 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:58194 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727137AbfCTNHR (ORCPT ); Wed, 20 Mar 2019 09:07:17 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20190320130715euoutp025f4c2c326b952617a1c9cb86dc2e5842~NrJyj9gSj1589415894euoutp02f; Wed, 20 Mar 2019 13:07:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20190320130715euoutp025f4c2c326b952617a1c9cb86dc2e5842~NrJyj9gSj1589415894euoutp02f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1553087235; bh=4GagIZ6u+HzP7LKOOqaJeqOA7ziodwQif9IXyvp30QE=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=TAzsPghAgP2eM1Pv1hudk6h8v1bkVXv35URzWjh16I0UBXghDGhNLMvtn2BXpk+9Y KOdY4pSH/uvUSVFYT56KWngUPnq2e4D0E8hxBskAav+f+L1E4SHw/OgPgHpGmATYzH 1fz9j6GmiOF1327w+mxI4DiZUKyEYscHxc6uwU8I= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20190320130714eucas1p2c871758d756c36265bd0fe817a1e8ec0~NrJx8LVY80212202122eucas1p2W; Wed, 20 Mar 2019 13:07:14 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id AA.91.04294.20B329C5; Wed, 20 Mar 2019 13:07:14 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20190320130714eucas1p1c0b414ed76d7d0d78da56c9c0a6c8973~NrJxZButZ2311723117eucas1p1w; Wed, 20 Mar 2019 13:07:14 +0000 (GMT) X-AuditID: cbfec7f4-835ff700000010c6-af-5c923b02d6e3 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id D7.DA.04128.10B329C5; Wed, 20 Mar 2019 13:07:13 +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 <0POO004P71RZN460@eusync1.samsung.com>; Wed, 20 Mar 2019 13:07:13 +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, Krzysztof Kozlowski Subject: [PATCH v2 RESEND 05/24] drm/exynos/decon5433: embed exynos_drm_crtc directly into context Date: Wed, 20 Mar 2019 14:06:48 +0100 Message-id: <20190320130707.25161-6-a.hajda@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20190320130707.25161-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsWy7djPc7pM1pNiDPoWS1rcWneO1WLjjPWs Fle+vmezmHR/AovF+fMb2C1mnN/HZLH2yF12B3aPTas62Tzudx9n8ujbsorR4/MmuQCWKC6b lNSczLLUIn27BK6Mzz8fsRe8M6uYMvM7cwPjbt0uRk4OCQETibenFrF2MXJxCAmsYJSYduwq E4TzmVHi/4aP7DBV/Zt3s0AkljFKXLx0EqrqP6NEz95zjCBVbAKaEn8332QDsUUElCVW7Wtn ByliFvjNKDF9+TawUcICKRKr1vaDFbEIqEo863jHDGLzClhI9E9vZoJYJy+xesMBsDingKXE wzn/wQZJCPxllVh1cicjRJGLxJo7D1ggbBmJy5O7oex6ifsrWpghGjoYJbZu2MkMkbCWOHz8 IiuIzSzAJzFp23SgOAdQnFeio00IosRD4t3dSWBzhAR6GCU2T7CfwCixgJFhFaN4amlxbnpq sVFearlecWJucWleul5yfu4mRmCEnf53/MsOxl1/kg4xCnAwKvHwXng+IUaINbGsuDL3EKME B7OSCG+E0qQYId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rzVDA+ihQTSE0tSs1NTC1KLYLJMHJxS DYyJYskLuW7fOHzD+spLaW//55I3Au2uihwu0yzprVv6/qckU/ZMrY0HTQKXBLof/nSXd956 9mrPO65LH2y1/PpX0vXPR9V9TIfcWivnbXM8p7KxSaH81b+LVW82hRhlRX82dd5+8uj7hy8a giqO3r2v/Tdfy/BdxZR4we9vC7pXPXLqPF8pUe2kxFKckWioxVxUnAgARBVYfawCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpiluLIzCtJLcpLzFFi42I5/e/4ZV1G60kxBk3/rSxurTvHarFxxnpW iytf37NZTLo/gcXi/PkN7BYzzu9jslh75C67A7vHplWdbB73u48zefRtWcXo8XmTXABLFJdN SmpOZllqkb5dAlfG55+P2AvemVVMmfmduYFxt24XIyeHhICJRP/m3SwgtpDAEkaJPzu1uxi5 gOxGJonzl+4wgSTYBDQl/m6+yQZiiwgoS6za184OUsQs8JtR4vOMr8wgCWGBFIlVa/vBilgE VCWedbwDi/MKWEj0T29mgtgmL7F6wwGwOKeApcTDOf/ZITZbSCw+cZdxAiPPAkaGVYwiqaXF uem5xUZ6xYm5xaV56XrJ+bmbGIEhs+3Yzy07GLveBR9iFOBgVOLhrXg6IUaINbGsuDL3EKME B7OSCG+E0qQYId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rznDSqjhATSE0tSs1NTC1KLYLJMHJxS DYynxBNaRGf2Zvi1Hvc20DaUEc3MYXV6llCZNI1Z7dXnlhgjyXtJAXUlMyJefhae7Frc6PLE kI+ne7Lg2ZfnF206//KgwG3humobppiT6eUcP96zTOOzaMyMfRX7hE94h6x0wMcL3qdmTj3z 8Cffned332YnKjac9jNlFWD9ynrxwNmF8z/PslRiKc5INNRiLipOBADQKOy7FQIAAA== X-CMS-MailID: 20190320130714eucas1p1c0b414ed76d7d0d78da56c9c0a6c8973 CMS-TYPE: 201P X-CMS-RootMailID: 20190320130714eucas1p1c0b414ed76d7d0d78da56c9c0a6c8973 References: <20190320130707.25161-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 Since crtc maps 1:1 to the device there is no point in allocating it separately, another benefit is possibility of direct initialisation of its fields which is more readable and allows further expansion. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index ae0f475eb633..0d409f453923 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -54,7 +54,7 @@ static const char * const decon_clks_name[] = { struct decon_context { struct device *dev; struct drm_device *drm_dev; - struct exynos_drm_crtc *crtc; + struct exynos_drm_crtc crtc; struct exynos_drm_plane planes[WINDOWS_NR]; void __iomem *addr; struct regmap *sysreg; @@ -69,6 +69,8 @@ struct decon_context { u32 frame_id; }; +#define to_decon(ptr) container_of(ptr, struct decon_context, ptr) + static const uint32_t decon_formats[] = { DRM_FORMAT_XRGB1555, DRM_FORMAT_RGB565, @@ -90,7 +92,7 @@ static inline void decon_set_bits(struct decon_context *ctx, u32 reg, u32 mask, static int decon_enable_vblank(struct exynos_drm_crtc *crtc) { - struct decon_context *ctx = crtc->ctx; + struct decon_context *ctx = to_decon(crtc); u32 val; val = VIDINTCON0_INTEN; @@ -110,7 +112,7 @@ static int decon_enable_vblank(struct exynos_drm_crtc *crtc) static void decon_disable_vblank(struct exynos_drm_crtc *crtc) { - struct decon_context *ctx = crtc->ctx; + struct decon_context *ctx = to_decon(crtc); if (!(ctx->out_type & I80_HW_TRG)) disable_irq_nosync(ctx->te_irq); @@ -143,7 +145,7 @@ static u32 decon_get_frame_count(struct decon_context *ctx, bool end) switch (status & (VIDCON1_VSTATUS_MASK | VIDCON1_I80_ACTIVE)) { case VIDCON1_VSTATUS_VS: - if (!(ctx->crtc->i80_mode)) + if (!(ctx->crtc.i80_mode)) --frm; break; case VIDCON1_VSTATUS_BP: @@ -163,7 +165,7 @@ static u32 decon_get_frame_count(struct decon_context *ctx, bool end) static void decon_setup_trigger(struct decon_context *ctx) { - if (!ctx->crtc->i80_mode && !(ctx->out_type & I80_HW_TRG)) + if (!ctx->crtc.i80_mode && !(ctx->out_type & I80_HW_TRG)) return; if (!(ctx->out_type & I80_HW_TRG)) { @@ -183,7 +185,7 @@ static void decon_setup_trigger(struct decon_context *ctx) static void decon_commit(struct exynos_drm_crtc *crtc) { - struct decon_context *ctx = crtc->ctx; + struct decon_context *ctx = to_decon(crtc); struct drm_display_mode *m = &crtc->base.mode; bool interlaced = false; u32 val; @@ -377,7 +379,7 @@ static void decon_shadow_protect(struct decon_context *ctx, bool protect) static void decon_atomic_begin(struct exynos_drm_crtc *crtc) { - struct decon_context *ctx = crtc->ctx; + struct decon_context *ctx = to_decon(crtc); decon_shadow_protect(ctx, true); } @@ -391,7 +393,7 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, { struct exynos_drm_plane_state *state = to_exynos_plane_state(plane->base.state); - struct decon_context *ctx = crtc->ctx; + struct decon_context *ctx = to_decon(crtc); struct drm_framebuffer *fb = state->base.fb; unsigned int win = state->base.normalized_zpos + ctx->first_win; unsigned int cpp = fb->format->cpp[0]; @@ -445,7 +447,7 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, static void decon_atomic_flush(struct exynos_drm_crtc *crtc) { - struct decon_context *ctx = crtc->ctx; + struct decon_context *ctx = to_decon(crtc); unsigned long flags; int win = hweight32(crtc->base.state->plane_mask) + ctx->first_win; @@ -502,7 +504,7 @@ static void decon_swreset(struct decon_context *ctx) static void decon_enable(struct exynos_drm_crtc *crtc) { - struct decon_context *ctx = crtc->ctx; + struct decon_context *ctx = to_decon(crtc); pm_runtime_get_sync(ctx->dev); @@ -510,12 +512,12 @@ static void decon_enable(struct exynos_drm_crtc *crtc) decon_swreset(ctx); - decon_commit(ctx->crtc); + decon_commit(&ctx->crtc); } static void decon_disable(struct exynos_drm_crtc *crtc) { - struct decon_context *ctx = crtc->ctx; + struct decon_context *ctx = to_decon(crtc); int i; if (!(ctx->out_type & I80_HW_TRG)) @@ -548,7 +550,7 @@ static irqreturn_t decon_te_irq_handler(int irq, void *dev_id) static void decon_clear_channels(struct exynos_drm_crtc *crtc) { - struct decon_context *ctx = crtc->ctx; + struct decon_context *ctx = to_decon(crtc); int win, i, ret; DRM_DEBUG_KMS("%s\n", __FILE__); @@ -577,7 +579,7 @@ static void decon_clear_channels(struct exynos_drm_crtc *crtc) static enum drm_mode_status decon_mode_valid(struct exynos_drm_crtc *crtc, const struct drm_display_mode *mode) { - struct decon_context *ctx = crtc->ctx; + struct decon_context *ctx = to_decon(crtc); ctx->irq = crtc->i80_mode ? ctx->irq_lcd_sys : ctx->irq_vsync; @@ -605,8 +607,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data) { struct decon_context *ctx = dev_get_drvdata(dev); struct drm_device *drm_dev = data; - struct exynos_drm_plane *exynos_plane; - enum exynos_drm_output_type out_type; unsigned int i; int ret; @@ -624,15 +624,15 @@ static int decon_bind(struct device *dev, struct device *master, void *data) return ret; } - exynos_plane = &ctx->planes[PRIMARY_WIN]; - out_type = (ctx->out_type & IFTYPE_HDMI) ? EXYNOS_DISPLAY_TYPE_HDMI - : EXYNOS_DISPLAY_TYPE_LCD; - ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base, - out_type, &decon_crtc_ops, ctx); - if (IS_ERR(ctx->crtc)) - return PTR_ERR(ctx->crtc); + ctx->crtc.type = (ctx->out_type & IFTYPE_HDMI) + ? EXYNOS_DISPLAY_TYPE_HDMI : EXYNOS_DISPLAY_TYPE_LCD; + ctx->crtc.ops = &decon_crtc_ops; + ret = exynos_drm_crtc_init(&ctx->crtc, drm_dev); + if (ret) + return ret; + ctx->crtc.base.primary = &ctx->planes[PRIMARY_WIN].base; - decon_clear_channels(ctx->crtc); + decon_clear_channels(&ctx->crtc); return exynos_drm_register_dma(drm_dev, dev); } @@ -641,7 +641,7 @@ static void decon_unbind(struct device *dev, struct device *master, void *data) { struct decon_context *ctx = dev_get_drvdata(dev); - decon_disable(ctx->crtc); + decon_disable(&ctx->crtc); /* detach this sub driver from iommu mapping if supported. */ exynos_drm_unregister_dma(ctx->drm_dev, ctx->dev); @@ -663,7 +663,7 @@ static void decon_handle_vblank(struct decon_context *ctx) if (frm != ctx->frame_id) { /* handle only if incremented, take care of wrap-around */ if ((s32)(frm - ctx->frame_id) > 0) - drm_crtc_handle_vblank(&ctx->crtc->base); + drm_crtc_handle_vblank(&ctx->crtc.base); ctx->frame_id = frm; }