From patchwork Wed Jul 12 09:46:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 13310012 X-Patchwork-Delegate: neil.armstrong@linaro.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7D6ACC001B0 for ; Wed, 12 Jul 2023 09:47:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Wy5+qcQPzejo93/KGnwsSdLedcZQDIBQYRdUVFyzFOc=; b=YwV7xmTaRbPUWN bx9sTpVwieu4kiz/SZp6kEILiC3Al2Cl0t6yJ+9C75p5Jo+MX0NcwEsvEeR1V1xCjf/q2YSj7jryz gCxwUXBCCJXZA2wTykDAvufs84POkcbSLGgYIYX4wzZ6D2JYLGx8EEInWmFNxsM2a5Xg/YJoAJL+t xM7jSkX12IPDIaFKuU8GB7eQfaPWifpcoKWhJDu4wjXqb8T79DZlR+OEoqU5Vqzk5m+Gt5mLu3Ml/ 1NeewUrwvIhA99h7Hc/tRnYzjP92Bmn/RHmG4ChFFFZpuZt9i5CdzQhVG0faWwk7RfpHieKi8dnjD kGbezq1wxO9NmD3ZLClw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qJWRL-00H5C7-2x; Wed, 12 Jul 2023 09:47:19 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qJWRI-00H58n-2k for linux-amlogic@lists.infradead.org; Wed, 12 Jul 2023 09:47:18 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qJWRC-0001Lq-RO; Wed, 12 Jul 2023 11:47:10 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qJWRC-00Dr4c-11; Wed, 12 Jul 2023 11:47:10 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qJWRB-004GTG-9b; Wed, 12 Jul 2023 11:47:09 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Neil Armstrong , David Airlie , Daniel Vetter , Kevin Hilman Cc: Jerome Brunet , Martin Blumenstingl , dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH RFC v1 22/52] drm/meson: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev Date: Wed, 12 Jul 2023 11:46:32 +0200 Message-Id: <20230712094702.1770121-23-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230712094702.1770121-1-u.kleine-koenig@pengutronix.de> References: <20230712094702.1770121-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1961; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=T9q2HXZEW7FDLneroBJCnnqx5xfQev4NtPEI3hay5+I=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBkrnZv8rVAP69vqAp1qjsT4fg5haYABwGWUz6Ao h5s7UcAOKmJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZK52bwAKCRCPgPtYfRL+ TvsTB/9CXW6h33zDZLUa1e98TE1WPSWIXhTswX02ruQ/rLzZktJf/hnFPzNO43FOy2fjkv0l1HO cU5VRVSWZQk2ztfY3LFXO8O9DZPXMV9IKA6kxeguJ1yDZg8FXXOoj/+hJsTaL4PdC8akazeherg Ssr4gPTR0MHv5wJzy7d23opoyp7QBAGdqZQAWk0gb94QhvP8x3U5cRtFO86itZV0M36SywlRWPz UdvWkkrZJD/GKO+1Z+Vtx02KB8T0lNNnrNGsT5LRZk4aSIs4iBPqxEAM2am0J/6e38yi/e0W3FD frVNciYnTeGg33lmrhgc/J9WpdszEt1vjDEkb9FMp6X6N62C X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-amlogic@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230712_024716_911120_7CB06AF0 X-CRM114-Status: GOOD ( 11.39 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org Prepare dropping the alias "dev" for struct drm_crtc::drm_dev. "drm_dev" is the better name as "dev" is usually a struct device pointer. No semantic changes. Signed-off-by: Uwe Kleine-König --- drivers/gpu/drm/meson/meson_crtc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c index d70616da8ce2..4bc082e45ed1 100644 --- a/drivers/gpu/drm/meson/meson_crtc.c +++ b/drivers/gpu/drm/meson/meson_crtc.c @@ -162,9 +162,9 @@ static void meson_g12a_crtc_atomic_disable(struct drm_crtc *crtc, priv->viu.vd1_commit = false; if (crtc->state->event && !crtc->state->active) { - spin_lock_irq(&crtc->dev->event_lock); + spin_lock_irq(&crtc->drm_dev->event_lock); drm_crtc_send_vblank_event(crtc, crtc->state->event); - spin_unlock_irq(&crtc->dev->event_lock); + spin_unlock_irq(&crtc->drm_dev->event_lock); crtc->state->event = NULL; } @@ -192,9 +192,9 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc, priv->io_base + _REG(VPP_MISC)); if (crtc->state->event && !crtc->state->active) { - spin_lock_irq(&crtc->dev->event_lock); + spin_lock_irq(&crtc->drm_dev->event_lock); drm_crtc_send_vblank_event(crtc, crtc->state->event); - spin_unlock_irq(&crtc->dev->event_lock); + spin_unlock_irq(&crtc->drm_dev->event_lock); crtc->state->event = NULL; } @@ -209,9 +209,9 @@ static void meson_crtc_atomic_begin(struct drm_crtc *crtc, if (crtc->state->event) { WARN_ON(drm_crtc_vblank_get(crtc) != 0); - spin_lock_irqsave(&crtc->dev->event_lock, flags); + spin_lock_irqsave(&crtc->drm_dev->event_lock, flags); meson_crtc->event = crtc->state->event; - spin_unlock_irqrestore(&crtc->dev->event_lock, flags); + spin_unlock_irqrestore(&crtc->drm_dev->event_lock, flags); crtc->state->event = NULL; } }