From patchwork Fri Mar 1 12:20:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10835073 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 1129E922 for ; Fri, 1 Mar 2019 12:21:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F03752097A for ; Fri, 1 Mar 2019 12:21:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4D882D964; Fri, 1 Mar 2019 12:21:12 +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 4DD7B2097A for ; Fri, 1 Mar 2019 12:21:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388154AbfCAMVL (ORCPT ); Fri, 1 Mar 2019 07:21:11 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:36645 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388052AbfCAMVL (ORCPT ); Fri, 1 Mar 2019 07:21:11 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20190301122110euoutp01efe9764e6a595e35d687c5c84842b0c0~H1RII5sVM1400414004euoutp01z; Fri, 1 Mar 2019 12:21:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20190301122110euoutp01efe9764e6a595e35d687c5c84842b0c0~H1RII5sVM1400414004euoutp01z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1551442870; bh=bQCAlj48koAMC69VP17ExVvUrMe7ZRRaujUvGSzX0JI=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=NZvRaBXqG/T+yzRnntQIgPNf8VJMClfAmZ+oRxoXJOy8qlXrSw0yERG1TtEE1Szh8 lAOBUobHV2Jwd9BbxYKwXbz1IO9Amn5d15naqXA2pVmy7O4CXobGgUVGCrTW8J5M1J Rsvv2oBBgPiDIpOcgubGrM5TOgQznlHaCKE5wsZ0= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20190301122109eucas1p2dc21643434cb44e65a058a869db61c93~H1RHtNxzP2981629816eucas1p2d; Fri, 1 Mar 2019 12:21:09 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 92.5E.04441.5B3297C5; Fri, 1 Mar 2019 12:21:09 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20190301122108eucas1p2ef7114bd5e714ce38ff070e404fd51a2~H1RHICizq2981629816eucas1p2c; Fri, 1 Mar 2019 12:21:08 +0000 (GMT) X-AuditID: cbfec7f2-5c9ff70000001159-59-5c7923b5c1ba Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id E5.6C.04128.4B3297C5; Fri, 1 Mar 2019 12:21:08 +0000 (GMT) Received: from AMDC3748.DIGITAL.local ([106.120.43.17]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PNO007ENSZ56Z20@eusync3.samsung.com>; Fri, 01 Mar 2019 12:21:08 +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 08/23] drm/exynos/mixer: embed exynos_drm_crtc directly into context Date: Fri, 01 Mar 2019 13:20:40 +0100 Message-id: <20190301122055.7135-9-a.hajda@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20190301122055.7135-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42LZduznOd2typUxBqfni1vcWneO1WLjjPWs Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEdx2aSk5mSWpRbp2yVw ZWy+18ZY0Kxf0X34K1sD41T1LkZODgkBE4nl146xdzFycQgJrGCUWHn5LCuE85lR4vP/PWww Va1Nb9kgEssYJf6+ns0M4fxnlLjX9p8VpIpNQFPi7+abYB0iAsoSq/a1g81lFrjEKPH6ZDcj SEJYIEzi3av77CA2i4CqxOk9y4CaOTh4BcwlNh0Sg9gmL7F6wwFmEJtTwELi4EqIORICH1kl zjybwQhR5CLxddk0KFtG4vLkbhYIu16iaeYVZoiGDkaJE4uXQ/1gLXH4+EWwS5kF+CQmbZvO DLJYQoBXoqNNCKLEQ2LC6S9Q/3czSjTvvMY2gVFiASPDKkbx1NLi3PTUYsO81HK94sTc4tK8 dL3k/NxNjMBoOv3v+KcdjF8vJR1iFOBgVOLhTXhZHiPEmlhWXJl7iFGCg1lJhJePoTJGiDcl sbIqtSg/vqg0J7X4EKM0B4uSOG81w4NoIYH0xJLU7NTUgtQimCwTB6dUA6N66vrp2YtMlj9Y k62+461b+t7S9fMYNHPDt845OiFvs1/84SmvAk+LLz2zbd+c43NPcqa0ivXb26xwKalfsK3L VlXXvnSf6bVLnUHhx/Z9YsmMb719qXjuTkZT3Sk/loZd1tdlrF89rYhPatPXE3dslp1PtZx5 MHmqx/90k5CqZTErWUMuTuZRYinOSDTUYi4qTgQAuLawlaICAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOJMWRmVeSWpSXmKPExsVy+t/xq7pblCtjDLZus7K4te4cq8XGGetZ La58fc9mMen+BBaLGef3MVmsPXKX3YHN4373cSaPvi2rGD0+b5ILYI7isklJzcksSy3St0vg yth8r42xoFm/ovvwV7YGxqnqXYycHBICJhKtTW/Zuhi5OIQEljBK/FqzjgXCaWSSuDXlEitI FZuApsTfzTfZQGwRAWWJVfva2UGKmAWuMEq0f+tiB0kIC4RJvHt1H8xmEVCVOL1nGVAzBwev gLnEpkNiENvkJVZvOMAMYnMKWEgcXAkyhwNoGVDJ6agJjDwLGBlWMYqklhbnpucWG+kVJ+YW l+al6yXn525iBAbHtmM/t+xg7HoXfIhRgINRiYc34WV5jBBrYllxZe4hRgkOZiURXj6Gyhgh 3pTEyqrUovz4otKc1OJDjNIcLErivOcNKqOEBNITS1KzU1MLUotgskwcnFINjEWPQpdprP1W xLX6c/WuYJfHSVdXHVcoev5w6499NQH869lCdVf6ZsQKXtnw11fRLkhMzbj69tSDDRZbmWw4 Z+4LnLfqxZ3ZMy6unzVH8fkapzin4vXTy3cnlk4QKzt49eTNSwfkCn4wxm1RncLFNGXFmT6z 5M/n/5bHvAn/lLTln8ijiZICTbuVWIozEg21mIuKEwFdKOFxCgIAAA== X-CMS-MailID: 20190301122108eucas1p2ef7114bd5e714ce38ff070e404fd51a2 CMS-TYPE: 201P X-CMS-RootMailID: 20190301122108eucas1p2ef7114bd5e714ce38ff070e404fd51a2 References: <20190301122055.7135-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/exynos_mixer.c | 39 ++++++++++++++------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 750f682e9c31..946d62ae83e3 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -98,7 +98,7 @@ struct mixer_context { struct platform_device *pdev; struct device *dev; struct drm_device *drm_dev; - struct exynos_drm_crtc *crtc; + struct exynos_drm_crtc crtc; struct exynos_drm_plane planes[MIXER_WIN_NR]; unsigned long flags; @@ -116,6 +116,8 @@ struct mixer_context { int scan_value; }; +#define to_mixer(ptr) container_of(ptr, struct mixer_context, ptr) + struct mixer_drv_data { enum mixer_version_id version; bool is_vp_enabled; @@ -426,7 +428,7 @@ static void mixer_stop(struct mixer_context *ctx) static void mixer_commit(struct mixer_context *ctx) { - struct drm_display_mode *mode = &ctx->crtc->base.state->adjusted_mode; + struct drm_display_mode *mode = &ctx->crtc.base.state->adjusted_mode; mixer_cfg_scan(ctx, mode->hdisplay, mode->vdisplay); mixer_cfg_rgb_fmt(ctx, mode); @@ -712,7 +714,7 @@ static irqreturn_t mixer_irq_handler(int irq, void *arg) goto out; } - drm_crtc_handle_vblank(&ctx->crtc->base); + drm_crtc_handle_vblank(&ctx->crtc.base); } out: @@ -856,7 +858,7 @@ static void mixer_ctx_remove(struct mixer_context *mixer_ctx) static int mixer_enable_vblank(struct exynos_drm_crtc *crtc) { - struct mixer_context *mixer_ctx = crtc->ctx; + struct mixer_context *mixer_ctx = to_mixer(crtc); __set_bit(MXR_BIT_VSYNC, &mixer_ctx->flags); if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags)) @@ -871,7 +873,7 @@ static int mixer_enable_vblank(struct exynos_drm_crtc *crtc) static void mixer_disable_vblank(struct exynos_drm_crtc *crtc) { - struct mixer_context *mixer_ctx = crtc->ctx; + struct mixer_context *mixer_ctx = to_mixer(crtc); __clear_bit(MXR_BIT_VSYNC, &mixer_ctx->flags); @@ -885,7 +887,7 @@ static void mixer_disable_vblank(struct exynos_drm_crtc *crtc) static void mixer_atomic_begin(struct exynos_drm_crtc *crtc) { - struct mixer_context *mixer_ctx = crtc->ctx; + struct mixer_context *mixer_ctx = to_mixer(crtc); if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags)) return; @@ -896,7 +898,7 @@ static void mixer_atomic_begin(struct exynos_drm_crtc *crtc) static void mixer_update_plane(struct exynos_drm_crtc *crtc, struct exynos_drm_plane *plane) { - struct mixer_context *mixer_ctx = crtc->ctx; + struct mixer_context *mixer_ctx = to_mixer(crtc); DRM_DEBUG_KMS("win: %d\n", plane->index); @@ -912,7 +914,7 @@ static void mixer_update_plane(struct exynos_drm_crtc *crtc, static void mixer_disable_plane(struct exynos_drm_crtc *crtc, struct exynos_drm_plane *plane) { - struct mixer_context *mixer_ctx = crtc->ctx; + struct mixer_context *mixer_ctx = to_mixer(crtc); unsigned long flags; DRM_DEBUG_KMS("win: %d\n", plane->index); @@ -927,7 +929,7 @@ static void mixer_disable_plane(struct exynos_drm_crtc *crtc, static void mixer_atomic_flush(struct exynos_drm_crtc *crtc) { - struct mixer_context *mixer_ctx = crtc->ctx; + struct mixer_context *mixer_ctx = to_mixer(crtc); if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags)) return; @@ -938,7 +940,7 @@ static void mixer_atomic_flush(struct exynos_drm_crtc *crtc) static void mixer_enable(struct exynos_drm_crtc *crtc) { - struct mixer_context *ctx = crtc->ctx; + struct mixer_context *ctx = to_mixer(crtc); if (test_bit(MXR_BIT_POWERED, &ctx->flags)) return; @@ -967,7 +969,7 @@ static void mixer_enable(struct exynos_drm_crtc *crtc) static void mixer_disable(struct exynos_drm_crtc *crtc) { - struct mixer_context *ctx = crtc->ctx; + struct mixer_context *ctx = to_mixer(crtc); int i; if (!test_bit(MXR_BIT_POWERED, &ctx->flags)) @@ -989,7 +991,7 @@ static void mixer_disable(struct exynos_drm_crtc *crtc) static int mixer_mode_valid(struct exynos_drm_crtc *crtc, const struct drm_display_mode *mode) { - struct mixer_context *ctx = crtc->ctx; + struct mixer_context *ctx = to_mixer(crtc); u32 w = mode->hdisplay, h = mode->vdisplay; DRM_DEBUG_KMS("xres=%d, yres=%d, refresh=%d, intl=%d\n", w, h, @@ -1015,7 +1017,7 @@ static bool mixer_mode_fixup(struct exynos_drm_crtc *crtc, const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { - struct mixer_context *ctx = crtc->ctx; + struct mixer_context *ctx = to_mixer(crtc); int width = mode->hdisplay, height = mode->vdisplay, i; struct { @@ -1117,7 +1119,6 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data) { struct mixer_context *ctx = dev_get_drvdata(dev); struct drm_device *drm_dev = data; - struct exynos_drm_plane *exynos_plane; unsigned int i; int ret; static enum drm_plane_type types[] = { DRM_PLANE_TYPE_PRIMARY, @@ -1151,14 +1152,14 @@ static int mixer_bind(struct device *dev, struct device *manager, void *data) return ret; } - exynos_plane = &ctx->planes[DEFAULT_WIN]; - ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base, - EXYNOS_DISPLAY_TYPE_HDMI, &mixer_crtc_ops, ctx); - if (IS_ERR(ctx->crtc)) { + ctx->crtc.type = EXYNOS_DISPLAY_TYPE_HDMI; + ctx->crtc.ops = &mixer_crtc_ops; + ret = exynos_drm_crtc_init(&ctx->crtc, drm_dev); + if (ret) { mixer_ctx_remove(ctx); - ret = PTR_ERR(ctx->crtc); goto free_ctx; } + ctx->crtc.base.primary = &ctx->planes[DEFAULT_WIN].base; return 0;