From patchwork Tue Feb 28 12:03:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 9595327 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 18D2F601D7 for ; Tue, 28 Feb 2017 12:04:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 060B22811E for ; Tue, 28 Feb 2017 12:04:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED750284FE; Tue, 28 Feb 2017 12:04:23 +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=-6.9 required=2.0 tests=BAYES_00,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 365252811E for ; Tue, 28 Feb 2017 12:04:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752001AbdB1MD6 (ORCPT ); Tue, 28 Feb 2017 07:03:58 -0500 Received: from mailout3.w1.samsung.com ([210.118.77.13]:63481 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751522AbdB1MDs (ORCPT ); Tue, 28 Feb 2017 07:03:48 -0500 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OM300F5B2T9YR40@mailout3.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 28 Feb 2017 12:03:09 +0000 (GMT) Received: from eusmges2.samsung.com (unknown [203.254.199.241]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170228120309eucas1p2200e7f0b33bdf275a4b1f1a22f9be795~ncduGw47b0428504285eucas1p2J; Tue, 28 Feb 2017 12:03:09 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2.samsung.com (EUCPMTA) with SMTP id F1.5F.30614.DF665B85; Tue, 28 Feb 2017 12:03:09 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170228120308eucas1p2f9b3b37401b50f9fd850affd260a88e8~ncdtbrlZ-0417504175eucas1p2P; Tue, 28 Feb 2017 12:03:08 +0000 (GMT) X-AuditID: cbfec7f1-f793f6d000007796-d6-58b566fdf9d9 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id C7.7B.10233.40765B85; Tue, 28 Feb 2017 12:03:16 +0000 (GMT) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OM300K1H2T5Q9B0@eusync2.samsung.com>; Tue, 28 Feb 2017 12:03:08 +0000 (GMT) From: Andrzej Hajda To: Inki Dae , dri-devel@lists.freedesktop.org Cc: Andrzej Hajda , Bartlomiej Zolnierkiewicz , Marek Szyprowski , linux-samsung-soc@vger.kernel.org Subject: [PATCH 2/3] drm/exynos: kill pipe field from drivers contexts Date: Tue, 28 Feb 2017 13:03:02 +0100 Message-id: <1488283383-4335-2-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1488283383-4335-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsWy7djP87p/07ZGGHydKmhxa905VouNM9az Wlz5+p7NYtL9CSwWM87vY7JYe+QuuwObx/3u40wefVtWMXp83iQXwBzFZZOSmpNZllqkb5fA lbFg3hbWgkdGFbN/nGRuYDyu2cXIySEhYCIx9X0/K4QtJnHh3nq2LkYuDiGBpYwSqzp2sEA4 nxkl7rVMZYHpeD97AitEYhmjxJKncxkhnP9AVRc+MYFUsQloSvzdfJMNxBYRcJH4PmMxM0gR s8BGRomeWcvAFgoLuEl8njaBEcRmEVCVOLpuB1gzr4CTxK7ni5kg1slJ3DzXCdTMwcEp4Cyx dxEHRPgxm0Trew2QsISArMSmA8wQYReJ+QvbGCFsYYlXx7ewQ9gyEpcnd4N9IyHQzSjxqf8E O4QzhVHi34cZUN3WEoePXwS7jVmAT2LStunMEAt4JTrahCBKPCTePp0MdZqjxJmde6DhNY1R YuKdPvYJjDILGBlWMYqklhbnpqcWG+kVJ+YWl+al6yXn525iBEbp6X/HP+5gfH/C6hCjAAej Eg+vhfGWCCHWxLLiytxDjBIczEoivB3hWyOEeFMSK6tSi/Lji0pzUosPMUpzsCiJ8+5ZcCVc SCA9sSQ1OzW1ILUIJsvEwSnVwHj1W6vPC9kL6spZd7jNyhxdi06mO5gk8OhzPP5/wvXC2eqX U9WOpq1MiLqrxuWzXufnhl1HbAWtluTr2wR9mnB6vsDO1TnbIuauU3tg//lw1Iy5y7XOO2om nG6SyvJo+PPD7com7WUREdbWpjrOFgp6G85I8lces/nfLpW46Nv5TfVvRCbNqVJiKc5INNRi LipOBACb8ltozgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsVy+t/xK7os6VsjDD63mFncWneO1WLjjPWs Fle+vmezmHR/AovFjPP7mCzWHrnL7sDmcb/7OJNH35ZVjB6fN8kFMEe52WSkJqakFimk5iXn p2TmpdsqhYa46VooKeQl5qbaKkXo+oYEKSmUJeaUAnlGBmjAwTnAPVhJ3y7BLWPBvC2sBY+M Kmb/OMncwHhcs4uRk0NCwETi/ewJrBC2mMSFe+vZuhi5OIQEljBKzG7+xgjhNDJJHDo2B6yK TUBT4u/mm2wgtoiAi8T3GYuZQYqYBTYyShz7+JYdJCEs4CbxedoERhCbRUBV4ui6HUwgNq+A k8Su54uZINbJSdw81wnUzMHBKeAssXcRB0hYCKik++hlpgmMvAsYGVYxiqSWFuem5xYb6RUn 5haX5qXrJefnbmIEhuu2Yz+37GDsehd8iFGAg1GJh/eBwZYIIdbEsuLK3EOMEhzMSiK8HeFb I4R4UxIrq1KL8uOLSnNSiw8xmgLdNJFZSjQ5HxhLeSXxhiaG5paGRsYWFuZGRkrivFM/XAkX EkhPLEnNTk0tSC2C6WPi4JRqYDSv/x7wm/GHyL5p8m/e2TfGcCq83TzbZenW+fGPzp1mmvbM uXe1Faf7rftdz//WGsnvl5x79dvxw2XP12t8OxxfuEviQbGlShezPLd628objuZq4j/OWm2u nm+57GBoiPoy9vh1M6UkP5w1OCy5canipPj/+2//OrUu7t/jC1U5txUU9//V1D2pxFKckWio xVxUnAgA7DNVXm0CAAA= X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170228120308eucas1p2f9b3b37401b50f9fd850affd260a88e8 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRvsgrw=?= =?UTF-8?B?7ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRtTYW1z?= =?UTF-8?B?dW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170228120308eucas1p2f9b3b37401b50f9fd850affd260a88e8 X-RootMTR: 20170228120308eucas1p2f9b3b37401b50f9fd850affd260a88e8 References: <1488283383-4335-1-git-send-email-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 possible_crtcs are set by Exynos core helper pipe fields have no raison d'etre. The only place it was used, as a hack, is fimd_clear_channels, to avoid calling drm_crtc_handle_vblank, but DRM core has already other protection mechanism (vblank->enabled), so it could be safely removed. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 2 -- drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 +--- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 11 ++--------- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 15 +-------------- drivers/gpu/drm/exynos/exynos_mixer.c | 2 -- 5 files changed, 4 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index 80d8be0..4b596dc 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -64,7 +64,6 @@ struct decon_context { void __iomem *addr; struct regmap *sysreg; struct clk *clks[ARRAY_SIZE(decon_clks_name)]; - int pipe; unsigned long flags; unsigned long out_type; int first_win; @@ -537,7 +536,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data) int ret; ctx->drm_dev = drm_dev; - ctx->pipe = drm_dev->mode_config.num_crtc; for (win = ctx->first_win; win < WINDOWS_NR; win++) { int tmp = (win == ctx->first_win) ? 0 : win; diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index 4320b3b..1ffb0b1 100644 --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c @@ -55,7 +55,6 @@ struct decon_context { unsigned long irq_flags; bool i80_if; bool suspended; - int pipe; wait_queue_head_t wait_vsync_queue; atomic_t wait_vsync_event; @@ -131,7 +130,6 @@ static int decon_ctx_initialize(struct decon_context *ctx, struct drm_device *drm_dev) { ctx->drm_dev = drm_dev; - ctx->pipe = drm_dev->mode_config.num_crtc; decon_clear_channels(ctx->crtc); @@ -605,7 +603,7 @@ static irqreturn_t decon_irq_handler(int irq, void *dev_id) writel(clear_bit, ctx->regs + VIDINTCON1); /* check the crtc is detached already from encoder */ - if (ctx->pipe < 0 || !ctx->drm_dev) + if (!ctx->drm_dev) goto out; if (!ctx->i80_if) { diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 830a364..638c775 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -191,7 +191,6 @@ struct fimd_context { u32 i80ifcon; bool i80_if; bool suspended; - int pipe; wait_queue_head_t wait_vsync_queue; atomic_t wait_vsync_event; atomic_t win_updated; @@ -368,18 +367,13 @@ static void fimd_clear_channels(struct exynos_drm_crtc *crtc) /* Wait for vsync, as disable channel takes effect at next vsync */ if (ch_enabled) { - int pipe = ctx->pipe; - - /* ensure that vblank interrupt won't be reported to core */ ctx->suspended = false; - ctx->pipe = -1; fimd_enable_vblank(ctx->crtc); fimd_wait_for_vblank(ctx->crtc); fimd_disable_vblank(ctx->crtc); ctx->suspended = true; - ctx->pipe = pipe; } clk_disable_unprepare(ctx->lcd_clk); @@ -913,7 +907,7 @@ static void fimd_te_handler(struct exynos_drm_crtc *crtc) u32 trg_type = ctx->driver_data->trg_type; /* Checks the crtc is detached already from encoder */ - if (ctx->pipe < 0 || !ctx->drm_dev) + if (!ctx->drm_dev) return; if (trg_type == I80_HW_TRG) @@ -971,7 +965,7 @@ static irqreturn_t fimd_irq_handler(int irq, void *dev_id) writel(clear_bit, ctx->regs + VIDINTCON1); /* check the crtc is detached already from encoder */ - if (ctx->pipe < 0 || !ctx->drm_dev) + if (!ctx->drm_dev) goto out; if (!ctx->i80_if) @@ -1001,7 +995,6 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) int ret; ctx->drm_dev = drm_dev; - ctx->pipe = drm_dev->mode_config.num_crtc; for (i = 0; i < WINDOWS_NR; i++) { ctx->configs[i].pixel_formats = fimd_formats; diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c index 8860ff4..17b3ef7 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c @@ -51,7 +51,6 @@ struct vidi_context { bool suspended; struct timer_list timer; struct mutex lock; - int pipe; }; static inline struct vidi_context *encoder_to_vidi(struct drm_encoder *e) @@ -153,15 +152,6 @@ static void vidi_disable(struct exynos_drm_crtc *crtc) mutex_unlock(&ctx->lock); } -static int vidi_ctx_initialize(struct vidi_context *ctx, - struct drm_device *drm_dev) -{ - ctx->drm_dev = drm_dev; - ctx->pipe = drm_dev->mode_config.num_crtc; - - return 0; -} - static const struct exynos_drm_crtc_ops vidi_crtc_ops = { .enable = vidi_enable, .disable = vidi_disable, @@ -175,9 +165,6 @@ static void vidi_fake_vblank_timer(unsigned long arg) { struct vidi_context *ctx = (void *)arg; - if (ctx->pipe < 0) - return; - if (drm_crtc_handle_vblank(&ctx->crtc->base)) mod_timer(&ctx->timer, jiffies + msecs_to_jiffies(VIDI_REFRESH_TIME) - 1); @@ -398,7 +385,7 @@ static int vidi_bind(struct device *dev, struct device *master, void *data) unsigned int i; int pipe, ret; - vidi_ctx_initialize(ctx, drm_dev); + ctx->drm_dev = drm_dev; plane_config.pixel_formats = formats; plane_config.num_pixel_formats = ARRAY_SIZE(formats); diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 3722b5f..1cd84cb 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -99,7 +99,6 @@ struct mixer_context { struct drm_device *drm_dev; struct exynos_drm_crtc *crtc; struct exynos_drm_plane planes[MIXER_WIN_NR]; - int pipe; unsigned long flags; struct mixer_resources mixer_res; @@ -900,7 +899,6 @@ static int mixer_initialize(struct mixer_context *mixer_ctx, priv = drm_dev->dev_private; mixer_ctx->drm_dev = drm_dev; - mixer_ctx->pipe = drm_dev->mode_config.num_crtc; /* acquire resources: regs, irqs, clocks */ ret = mixer_resources_init(mixer_ctx);