From nobody Mon Dec 1 23:10:29 2025 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C41334676B for ; Wed, 26 Nov 2025 17:37:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764178656; cv=none; b=dnh7rGSVObCZpbWvJxWExFlz0J92W3EqgBMb/YvQXepY+81J4IsrxXxIsP+TIIgnO80X/HuyYcvjcMEdLVcojipwQKsZrM5gBNQ1ZztVJ9BrqwbTFk63IFw4acgiREQ3FloqrluSENm0+7v4ohiOhJ3s59HReRXjAfSrv8ibY0U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764178656; c=relaxed/simple; bh=++mhLzTpEGCMkGjtuqoU3JefhBW8oEccrF7cKHf4Ba4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jFOSprm/O94dZAAs9nnQexxFTBLKOHvenbXaq/u/A5i68re9vsIyejIcTUcx4HDGDIwK7pGwH3EkzaeYso/we+/MniS2n3Yo7ZEyv/XMOTiInqNomJ5nbCJ2KueLucy05reuIa6tp5OL1w9c2dWRU+mBi1eJvCC9b1bgu/CGSIw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=DCvS6wDd; arc=none smtp.client-ip=185.171.202.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="DCvS6wDd" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 48BB4C16A0B; Wed, 26 Nov 2025 17:37:10 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 10D2B60721; Wed, 26 Nov 2025 17:37:33 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 9447D102F23AA; Wed, 26 Nov 2025 18:37:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1764178651; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=22liRkyVdmgcbPddIQQD4KWWo7dfajVNUQh19OlArl8=; b=DCvS6wDdbzQWgSTtl3/tjEnw8KAcYsCP/XXrgvi+AVYOYoyHlrFy6aRpB2dkqsgDXt0CAf YuN0dU2kbIn387qpMktYTjcxzJIKuOdnIYAw4jsp3JFRQVqiRhJSV+MvNaPPpYg1g0tXzm whncw9Xh+CBTG7ayvwTQGzn1l7Zdk7amp1Zg3DFc+ahZhOwNf3qiwkKHQh02zccFQSyulm 20myAgZ2ob54oQI2iuGW17D8slxx8/cep62331iBemzA1NhIU1gzwHN/GgrF3ymgeANfWM o48XQ6L2XVDSHrQSoPGFXC+EJxZK+yU/n+SUn4WO3duvG+5TeVH0TDLvIBEvqg== From: "Kory Maincent (TI.com)" Date: Wed, 26 Nov 2025 18:35:58 +0100 Subject: [PATCH 16/21] drm/tilcdc: Remove the use of drm_device private_data Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251126-feature_tilcdc-v1-16-49b9ef2e3aa0@bootlin.com> References: <20251126-feature_tilcdc-v1-0-49b9ef2e3aa0@bootlin.com> In-Reply-To: <20251126-feature_tilcdc-v1-0-49b9ef2e3aa0@bootlin.com> To: Jyri Sarha , Tomi Valkeinen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Russell King , Bartosz Golaszewski , Tony Lindgren , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: Markus Schneider-Pargmann , Luca Ceresoli , Louis Chauvet , Thomas Petazzoni , Miguel Gazquez , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, "Kory Maincent (TI.com)" X-Mailer: b4 0.14.3 X-Last-TLS-Session-Version: TLSv1.3 The DRM core documentation recommends against using dev_private: "Instead of using this pointer it is recommended that drivers use embed the struct &drm_device in their larger per-device structure." This patch refactors the tilcdc driver to follow this recommendation by embedding struct drm_device within struct tilcdc_drm_private and replacing all dev->dev_private accesses with the ddev_to_tilcdc_priv() helper macro that uses container_of(). This change aligns the driver with modern DRM best practices. Signed-off-by: Kory Maincent (TI.com) --- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 28 ++++++++++++++-------------- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 11 +++++------ drivers/gpu/drm/tilcdc/tilcdc_drv.h | 2 ++ drivers/gpu/drm/tilcdc/tilcdc_encoder.c | 4 ++-- drivers/gpu/drm/tilcdc/tilcdc_plane.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_regs.h | 8 ++++---- 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/= tilcdc_crtc.c index 3955b3b99befe..9e7f1bacf1e4d 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c @@ -59,7 +59,7 @@ struct tilcdc_crtc { static void set_scanout(struct drm_crtc *crtc, struct drm_framebuffer *fb) { struct drm_device *dev =3D crtc->dev; - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); struct drm_gem_dma_object *gem; dma_addr_t start, end; u64 dma_base_and_ceiling; @@ -94,7 +94,7 @@ static void tilcdc_crtc_load_palette(struct drm_crtc *crt= c) { struct tilcdc_crtc *tilcdc_crtc =3D to_tilcdc_crtc(crtc); struct drm_device *dev =3D crtc->dev; - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); int ret; =20 reinit_completion(&tilcdc_crtc->palette_loaded); @@ -136,7 +136,7 @@ static void tilcdc_crtc_load_palette(struct drm_crtc *c= rtc) =20 static void tilcdc_crtc_enable_irqs(struct drm_device *dev) { - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); =20 tilcdc_clear_irqstatus(dev, 0xffffffff); =20 @@ -153,7 +153,7 @@ static void tilcdc_crtc_enable_irqs(struct drm_device *= dev) =20 static void tilcdc_crtc_disable_irqs(struct drm_device *dev) { - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); =20 /* disable irqs that we might have enabled: */ if (priv->rev =3D=3D 1) { @@ -173,7 +173,7 @@ static void tilcdc_crtc_disable_irqs(struct drm_device = *dev) static void reset(struct drm_crtc *crtc) { struct drm_device *dev =3D crtc->dev; - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); =20 if (priv->rev !=3D 2) return; @@ -198,7 +198,7 @@ static unsigned int tilcdc_pclk_diff(unsigned long rate, static void tilcdc_crtc_set_clk(struct drm_crtc *crtc) { struct drm_device *dev =3D crtc->dev; - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); struct tilcdc_crtc *tilcdc_crtc =3D to_tilcdc_crtc(crtc); unsigned long clk_rate, real_pclk_rate, pclk_rate; unsigned int clkdiv; @@ -270,7 +270,7 @@ static void tilcdc_crtc_set_mode(struct drm_crtc *crtc) { struct tilcdc_crtc *tilcdc_crtc =3D to_tilcdc_crtc(crtc); struct drm_device *dev =3D crtc->dev; - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); uint32_t reg, hbp, hfp, hsw, vbp, vfp, vsw; struct drm_display_mode *mode =3D &crtc->state->adjusted_mode; struct drm_framebuffer *fb =3D crtc->primary->state->fb; @@ -557,7 +557,7 @@ static void tilcdc_crtc_recover_work(struct work_struct= *work) =20 void tilcdc_crtc_destroy(struct drm_crtc *crtc) { - struct tilcdc_drm_private *priv =3D crtc->dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(crtc->dev); =20 tilcdc_crtc_shutdown(crtc); =20 @@ -647,7 +647,7 @@ static int tilcdc_crtc_enable_vblank(struct drm_crtc *c= rtc) { struct tilcdc_crtc *tilcdc_crtc =3D to_tilcdc_crtc(crtc); struct drm_device *dev =3D crtc->dev; - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); unsigned long flags; =20 spin_lock_irqsave(&tilcdc_crtc->irq_lock, flags); @@ -670,7 +670,7 @@ static void tilcdc_crtc_disable_vblank(struct drm_crtc = *crtc) { struct tilcdc_crtc *tilcdc_crtc =3D to_tilcdc_crtc(crtc); struct drm_device *dev =3D crtc->dev; - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); unsigned long flags; =20 spin_lock_irqsave(&tilcdc_crtc->irq_lock, flags); @@ -728,7 +728,7 @@ static enum drm_mode_status tilcdc_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode) { - struct tilcdc_drm_private *priv =3D crtc->dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(crtc->dev); unsigned int bandwidth; uint32_t hbp, hfp, hsw, vbp, vfp, vsw; =20 @@ -826,7 +826,7 @@ static const struct drm_crtc_helper_funcs tilcdc_crtc_h= elper_funcs =3D { void tilcdc_crtc_update_clk(struct drm_crtc *crtc) { struct drm_device *dev =3D crtc->dev; - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); struct tilcdc_crtc *tilcdc_crtc =3D to_tilcdc_crtc(crtc); =20 drm_modeset_lock(&crtc->mutex, NULL); @@ -850,7 +850,7 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc) { struct tilcdc_crtc *tilcdc_crtc =3D to_tilcdc_crtc(crtc); struct drm_device *dev =3D crtc->dev; - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); uint32_t stat, reg; =20 stat =3D tilcdc_read_irqstatus(dev); @@ -958,7 +958,7 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc) =20 int tilcdc_crtc_create(struct drm_device *dev) { - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); struct tilcdc_crtc *tilcdc_crtc; struct drm_crtc *crtc; int ret; diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/t= ilcdc_drv.c index e08bea30585e0..e6d9f7f53a62d 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c @@ -74,7 +74,7 @@ static const struct drm_mode_config_funcs mode_config_fun= cs =3D { =20 static void modeset_init(struct drm_device *dev) { - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); =20 dev->mode_config.min_width =3D 0; dev->mode_config.min_height =3D 0; @@ -100,14 +100,14 @@ static int cpufreq_transition(struct notifier_block *= nb, static irqreturn_t tilcdc_irq(int irq, void *arg) { struct drm_device *dev =3D arg; - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); =20 return tilcdc_crtc_irq(priv->crtc); } =20 static int tilcdc_irq_install(struct drm_device *dev, unsigned int irq) { - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); int ret; =20 ret =3D request_irq(irq, tilcdc_irq, 0, dev->driver->name, dev); @@ -121,7 +121,7 @@ static int tilcdc_irq_install(struct drm_device *dev, u= nsigned int irq) =20 static void tilcdc_irq_uninstall(struct drm_device *dev) { - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); =20 if (!priv->irq_enabled) return; @@ -169,7 +169,7 @@ static int tilcdc_regs_show(struct seq_file *m, void *a= rg) { struct drm_info_node *node =3D (struct drm_info_node *) m->private; struct drm_device *dev =3D node->minor->dev; - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); unsigned i; =20 pm_runtime_get_sync(dev->dev); @@ -269,7 +269,6 @@ static int tilcdc_pdev_probe(struct platform_device *pd= ev) =20 platform_set_drvdata(pdev, priv); ddev =3D &priv->ddev; - ddev->dev_private =3D priv; ret =3D drmm_mode_config_init(ddev); if (ret) return ret; diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.h b/drivers/gpu/drm/tilcdc/t= ilcdc_drv.h index e3d04a3eb25b4..c69e279a2539d 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.h +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.h @@ -85,6 +85,8 @@ struct tilcdc_drm_private { =20 #define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__) =20 +#define ddev_to_tilcdc_priv(x) container_of(x, struct tilcdc_drm_private, = ddev) + int tilcdc_crtc_create(struct drm_device *dev); irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc); void tilcdc_crtc_update_clk(struct drm_crtc *crtc); diff --git a/drivers/gpu/drm/tilcdc/tilcdc_encoder.c b/drivers/gpu/drm/tilc= dc/tilcdc_encoder.c index bca91226351dd..d01e7a31a286c 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_encoder.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_encoder.c @@ -34,7 +34,7 @@ struct drm_connector *tilcdc_encoder_find_connector(struc= t drm_device *ddev, static int tilcdc_attach_bridge(struct drm_device *ddev, struct drm_bridge *bridg= e) { - struct tilcdc_drm_private *priv =3D ddev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(ddev); int ret; =20 priv->encoder->possible_crtcs =3D BIT(0); @@ -53,7 +53,7 @@ int tilcdc_attach_bridge(struct drm_device *ddev, struct = drm_bridge *bridge) =20 int tilcdc_encoder_create(struct drm_device *ddev) { - struct tilcdc_drm_private *priv =3D ddev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(ddev); struct drm_bridge *bridge; struct drm_panel *panel; int ret; diff --git a/drivers/gpu/drm/tilcdc/tilcdc_plane.c b/drivers/gpu/drm/tilcdc= /tilcdc_plane.c index aa72ca679598b..a77a5b22ebd96 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_plane.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_plane.c @@ -101,7 +101,7 @@ static const struct drm_plane_helper_funcs plane_helper= _funcs =3D { int tilcdc_plane_init(struct drm_device *dev, struct drm_plane *plane) { - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); int ret; =20 ret =3D drm_universal_plane_init(dev, plane, 1, &tilcdc_plane_funcs, diff --git a/drivers/gpu/drm/tilcdc/tilcdc_regs.h b/drivers/gpu/drm/tilcdc/= tilcdc_regs.h index f90e2dc3457cd..26ebaf1e0f70f 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_regs.h +++ b/drivers/gpu/drm/tilcdc/tilcdc_regs.h @@ -113,13 +113,13 @@ =20 static inline void tilcdc_write(struct drm_device *dev, u32 reg, u32 data) { - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); iowrite32(data, priv->mmio + reg); } =20 static inline void tilcdc_write64(struct drm_device *dev, u32 reg, u64 dat= a) { - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); volatile void __iomem *addr =3D priv->mmio + reg; =20 #if defined(iowrite64) && !defined(iowrite64_is_nonatomic) @@ -133,7 +133,7 @@ static inline void tilcdc_write64(struct drm_device *de= v, u32 reg, u64 data) =20 static inline u32 tilcdc_read(struct drm_device *dev, u32 reg) { - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); return ioread32(priv->mmio + reg); } =20 @@ -156,7 +156,7 @@ static inline void tilcdc_clear(struct drm_device *dev,= u32 reg, u32 mask) /* the register to read/clear irqstatus differs between v1 and v2 of the I= P */ static inline u32 tilcdc_irqstatus_reg(struct drm_device *dev) { - struct tilcdc_drm_private *priv =3D dev->dev_private; + struct tilcdc_drm_private *priv =3D ddev_to_tilcdc_priv(dev); return (priv->rev =3D=3D 2) ? LCDC_MASKED_STAT_REG : LCDC_STAT_REG; } =20 --=20 2.43.0