[28/44] drm/tidss: Don't use drm_device->dev_private

Message ID	20200403135828.2542770-29-daniel.vetter@ffwll.ch (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=Dui2=5T=lists.freedesktop.org=dri-devel-bounces@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D21F2077D From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Subject: [PATCH 28/44] drm/tidss: Don't use drm_device->dev_private Date: Fri, 3 Apr 2020 15:58:12 +0200 Message-Id: <20200403135828.2542770-29-daniel.vetter@ffwll.ch> In-Reply-To: <20200403135828.2542770-1-daniel.vetter@ffwll.ch> References: <20200403135828.2542770-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Precedence: list Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Tomi Valkeinen <tomi.valkeinen@ti.com>, Jyri Sarha <jsarha@ti.com>, Daniel Vetter <daniel.vetter@intel.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
Series	devm_drm_dev_alloc, no more drmm_add_final_kfree \| expand [00/44] devm_drm_dev_alloc, no more drmm_add_final_kfree [01/44] drivers/base: Always release devres on device_del [02/44] drm: Add devm_drm_dev_alloc macro [03/44] drm/device: Deprecate dev_private harder [04/44] drm/vgem: Use devm_drm_dev_alloc [05/44] drm/vkms: Use devm_drm_dev_alloc [06/44] drm/vboxvideo: drop DRM_MTRR_WC #define [07/44] drm/vboxvideo: Use devm_drm_dev_alloc [08/44] drm/vboxvideo: Stop using drm_device->dev_private [09/44] drm/vboxvidoe: use managed pci functions [10/44] drm/vboxvideo: Use devm_gen_pool_create [11/44] drm/v3d: Don't set drm_device->dev_private [12/44] drm/v3d: Use devm_drm_dev_alloc [13/44] drm/v3d: Delete v3d_dev->dev [14/44] drm/v3d: Delete v3d_dev->pdev [15/44] drm/udl: Use demv_drm_dev_alloc [16/44] drm/udl: don't set drm_device->dev_private [17/44] drm/st7735r: Use devm_drm_dev_alloc [18/44] drm/st7586: Use devm_drm_dev_alloc [19/44] drm/repaper: Use devm_drm_dev_alloc [20/44] drm/mi0283qt: Use devm_drm_dev_alloc [21/44] drm/ili9486: Use devm_drm_dev_alloc [22/44] drm/ili9341: Use devm_drm_dev_alloc [23/44] drm/ili9225: Use devm_drm_dev_alloc [24/44] drm/hx8357d: Use devm_drm_dev_alloc [25/44] drm/gm12u320: Use devm_drm_dev_alloc [26/44] drm/gm12u320: Don't use drm_device->dev_private [27/44] drm/tidss: Use devm_drm_dev_alloc [28/44] drm/tidss: Don't use drm_device->dev_private [29/44] drm/tidss: Delete tidss->saved_state [30/44] drm/qxl: Use devm_drm_dev_alloc [31/44] drm/qxl: Don't use drm_device->dev_private [32/44] drm/mcde: Use devm_drm_dev_alloc [33/44] drm/mcde: Don't use drm_device->dev_private [34/44] drm/ingenic: Use devm_drm_dev_alloc [35/44] drm/ingenic: Don't set drm_device->dev_private [36/44] drm/komeda: use devm_drm_dev_alloc [37/44] drm/armada: Use devm_drm_dev_alloc [38/44] drm/armada: Don't use drm_device->dev_private [39/44] drm/cirrus: Use devm_drm_dev_alloc [40/44] drm/cirrus: Don't use drm_device->dev_private [41/44] drm/i915: Use devm_drm_dev_alloc [42/44] drm/i915/selftest: Create mock_destroy_device [43/44] drm/i915/selftests: align more to real device lifetimes [44/44] drm/managed: Cleanup of unused functions and polishing docs

Message ID

20200403135828.2542770-29-daniel.vetter@ffwll.ch (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D21F2077D
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Subject: [PATCH 28/44] drm/tidss: Don't use drm_device->dev_private
Date: Fri,  3 Apr 2020 15:58:12 +0200
Message-Id: <20200403135828.2542770-29-daniel.vetter@ffwll.ch>
In-Reply-To: <20200403135828.2542770-1-daniel.vetter@ffwll.ch>
References: <20200403135828.2542770-1-daniel.vetter@ffwll.ch>
MIME-Version: 1.0
Precedence: list
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
 Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
 Tomi Valkeinen <tomi.valkeinen@ti.com>, Jyri Sarha <jsarha@ti.com>,
 Daniel Vetter <daniel.vetter@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>

Series

devm_drm_dev_alloc, no more drmm_add_final_kfree | expand

Commit Message

Daniel Vetter April 3, 2020, 1:58 p.m. UTC

Upcasting using a container_of macro is more typesafe, faster and
easier for the compiler to optimize.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jyri Sarha <jsarha@ti.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 drivers/gpu/drm/tidss/tidss_crtc.c  | 16 ++++++++--------
 drivers/gpu/drm/tidss/tidss_drv.c   |  2 --
 drivers/gpu/drm/tidss/tidss_drv.h   |  2 ++
 drivers/gpu/drm/tidss/tidss_irq.c   | 12 ++++++------
 drivers/gpu/drm/tidss/tidss_kms.c   |  2 +-
 drivers/gpu/drm/tidss/tidss_plane.c |  6 +++---
 6 files changed, 20 insertions(+), 20 deletions(-)

Comments

Sam Ravnborg April 8, 2020, 7:52 a.m. UTC | #1

On Fri, Apr 03, 2020 at 03:58:12PM +0200, Daniel Vetter wrote:
> Upcasting using a container_of macro is more typesafe, faster and
> easier for the compiler to optimize.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jyri Sarha <jsarha@ti.com>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
> ---
>  drivers/gpu/drm/tidss/tidss_crtc.c  | 16 ++++++++--------
>  drivers/gpu/drm/tidss/tidss_drv.c   |  2 --
>  drivers/gpu/drm/tidss/tidss_drv.h   |  2 ++
>  drivers/gpu/drm/tidss/tidss_irq.c   | 12 ++++++------
>  drivers/gpu/drm/tidss/tidss_kms.c   |  2 +-
>  drivers/gpu/drm/tidss/tidss_plane.c |  6 +++---
>  6 files changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c
> index d4ce9bab8c7e..2396262c09e4 100644
> --- a/drivers/gpu/drm/tidss/tidss_crtc.c
> +++ b/drivers/gpu/drm/tidss/tidss_crtc.c
> @@ -24,7 +24,7 @@
>  static void tidss_crtc_finish_page_flip(struct tidss_crtc *tcrtc)
>  {
>  	struct drm_device *ddev = tcrtc->crtc.dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct drm_pending_vblank_event *event;
>  	unsigned long flags;
>  	bool busy;
> @@ -88,7 +88,7 @@ static int tidss_crtc_atomic_check(struct drm_crtc *crtc,
>  				   struct drm_crtc_state *state)
>  {
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct dispc_device *dispc = tidss->dispc;
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	u32 hw_videoport = tcrtc->hw_videoport;
> @@ -165,7 +165,7 @@ static void tidss_crtc_atomic_flush(struct drm_crtc *crtc,
>  {
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	unsigned long flags;
>  
>  	dev_dbg(ddev->dev,
> @@ -216,7 +216,7 @@ static void tidss_crtc_atomic_enable(struct drm_crtc *crtc,
>  {
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	const struct drm_display_mode *mode = &crtc->state->adjusted_mode;
>  	unsigned long flags;
>  	int r;
> @@ -259,7 +259,7 @@ static void tidss_crtc_atomic_disable(struct drm_crtc *crtc,
>  {
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	unsigned long flags;
>  
>  	dev_dbg(ddev->dev, "%s, event %p\n", __func__, crtc->state->event);
> @@ -295,7 +295,7 @@ enum drm_mode_status tidss_crtc_mode_valid(struct drm_crtc *crtc,
>  {
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  
>  	return dispc_vp_mode_valid(tidss->dispc, tcrtc->hw_videoport, mode);
>  }
> @@ -314,7 +314,7 @@ static const struct drm_crtc_helper_funcs tidss_crtc_helper_funcs = {
>  static int tidss_crtc_enable_vblank(struct drm_crtc *crtc)
>  {
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  
>  	dev_dbg(ddev->dev, "%s\n", __func__);
>  
> @@ -328,7 +328,7 @@ static int tidss_crtc_enable_vblank(struct drm_crtc *crtc)
>  static void tidss_crtc_disable_vblank(struct drm_crtc *crtc)
>  {
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  
>  	dev_dbg(ddev->dev, "%s\n", __func__);
>  
> diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c
> index 7d4465d58be8..99edc66ebdef 100644
> --- a/drivers/gpu/drm/tidss/tidss_drv.c
> +++ b/drivers/gpu/drm/tidss/tidss_drv.c
> @@ -147,8 +147,6 @@ static int tidss_probe(struct platform_device *pdev)
>  
>  	platform_set_drvdata(pdev, tidss);
>  
> -	ddev->dev_private = tidss;
> -
>  	ret = dispc_init(tidss);
>  	if (ret) {
>  		dev_err(dev, "failed to initialize dispc: %d\n", ret);
> diff --git a/drivers/gpu/drm/tidss/tidss_drv.h b/drivers/gpu/drm/tidss/tidss_drv.h
> index e2aa6436ad18..b23cd95c8d78 100644
> --- a/drivers/gpu/drm/tidss/tidss_drv.h
> +++ b/drivers/gpu/drm/tidss/tidss_drv.h
> @@ -33,6 +33,8 @@ struct tidss_device {
>  	struct drm_atomic_state *saved_state;
>  };
>  
> +#define to_tidss(__dev) container_of(__dev, struct tidss_device, ddev)
> +
>  int tidss_runtime_get(struct tidss_device *tidss);
>  void tidss_runtime_put(struct tidss_device *tidss);
>  
> diff --git a/drivers/gpu/drm/tidss/tidss_irq.c b/drivers/gpu/drm/tidss/tidss_irq.c
> index 612c046738e5..1b80f2d62e0a 100644
> --- a/drivers/gpu/drm/tidss/tidss_irq.c
> +++ b/drivers/gpu/drm/tidss/tidss_irq.c
> @@ -23,7 +23,7 @@ static void tidss_irq_update(struct tidss_device *tidss)
>  void tidss_irq_enable_vblank(struct drm_crtc *crtc)
>  {
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	u32 hw_videoport = tcrtc->hw_videoport;
>  	unsigned long flags;
> @@ -38,7 +38,7 @@ void tidss_irq_enable_vblank(struct drm_crtc *crtc)
>  void tidss_irq_disable_vblank(struct drm_crtc *crtc)
>  {
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	u32 hw_videoport = tcrtc->hw_videoport;
>  	unsigned long flags;
> @@ -53,7 +53,7 @@ void tidss_irq_disable_vblank(struct drm_crtc *crtc)
>  irqreturn_t tidss_irq_handler(int irq, void *arg)
>  {
>  	struct drm_device *ddev = (struct drm_device *)arg;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	unsigned int id;
>  	dispc_irq_t irqstatus;
>  
> @@ -95,7 +95,7 @@ void tidss_irq_resume(struct tidss_device *tidss)
>  
>  void tidss_irq_preinstall(struct drm_device *ddev)
>  {
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  
>  	spin_lock_init(&tidss->wait_lock);
>  
> @@ -109,7 +109,7 @@ void tidss_irq_preinstall(struct drm_device *ddev)
>  
>  int tidss_irq_postinstall(struct drm_device *ddev)
>  {
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	unsigned long flags;
>  	unsigned int i;
>  
> @@ -138,7 +138,7 @@ int tidss_irq_postinstall(struct drm_device *ddev)
>  
>  void tidss_irq_uninstall(struct drm_device *ddev)
>  {
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  
>  	tidss_runtime_get(tidss);
>  	dispc_set_irqenable(tidss->dispc, 0);
> diff --git a/drivers/gpu/drm/tidss/tidss_kms.c b/drivers/gpu/drm/tidss/tidss_kms.c
> index 4bd339a467a4..4b99e9fa84a5 100644
> --- a/drivers/gpu/drm/tidss/tidss_kms.c
> +++ b/drivers/gpu/drm/tidss/tidss_kms.c
> @@ -25,7 +25,7 @@
>  static void tidss_atomic_commit_tail(struct drm_atomic_state *old_state)
>  {
>  	struct drm_device *ddev = old_state->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  
>  	dev_dbg(ddev->dev, "%s\n", __func__);
>  
> diff --git a/drivers/gpu/drm/tidss/tidss_plane.c b/drivers/gpu/drm/tidss/tidss_plane.c
> index ff99b2dd4a17..23bb3e59504b 100644
> --- a/drivers/gpu/drm/tidss/tidss_plane.c
> +++ b/drivers/gpu/drm/tidss/tidss_plane.c
> @@ -22,7 +22,7 @@ static int tidss_plane_atomic_check(struct drm_plane *plane,
>  				    struct drm_plane_state *state)
>  {
>  	struct drm_device *ddev = plane->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct tidss_plane *tplane = to_tidss_plane(plane);
>  	const struct drm_format_info *finfo;
>  	struct drm_crtc_state *crtc_state;
> @@ -101,7 +101,7 @@ static void tidss_plane_atomic_update(struct drm_plane *plane,
>  				      struct drm_plane_state *old_state)
>  {
>  	struct drm_device *ddev = plane->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct tidss_plane *tplane = to_tidss_plane(plane);
>  	struct drm_plane_state *state = plane->state;
>  	u32 hw_videoport;
> @@ -133,7 +133,7 @@ static void tidss_plane_atomic_disable(struct drm_plane *plane,
>  				       struct drm_plane_state *old_state)
>  {
>  	struct drm_device *ddev = plane->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct tidss_plane *tplane = to_tidss_plane(plane);
>  
>  	dev_dbg(ddev->dev, "%s\n", __func__);
> -- 
> 2.25.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Jyri Sarha April 14, 2020, 9:55 a.m. UTC | #2

On 03/04/2020 16:58, Daniel Vetter wrote:
> Upcasting using a container_of macro is more typesafe, faster and
> easier for the compiler to optimize.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jyri Sarha <jsarha@ti.com>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>

Tested-by: Jyri Sarha <jsarha@ti.com>

> ---
>  drivers/gpu/drm/tidss/tidss_crtc.c  | 16 ++++++++--------
>  drivers/gpu/drm/tidss/tidss_drv.c   |  2 --
>  drivers/gpu/drm/tidss/tidss_drv.h   |  2 ++
>  drivers/gpu/drm/tidss/tidss_irq.c   | 12 ++++++------
>  drivers/gpu/drm/tidss/tidss_kms.c   |  2 +-
>  drivers/gpu/drm/tidss/tidss_plane.c |  6 +++---
>  6 files changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c
> index d4ce9bab8c7e..2396262c09e4 100644
> --- a/drivers/gpu/drm/tidss/tidss_crtc.c
> +++ b/drivers/gpu/drm/tidss/tidss_crtc.c
> @@ -24,7 +24,7 @@
>  static void tidss_crtc_finish_page_flip(struct tidss_crtc *tcrtc)
>  {
>  	struct drm_device *ddev = tcrtc->crtc.dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct drm_pending_vblank_event *event;
>  	unsigned long flags;
>  	bool busy;
> @@ -88,7 +88,7 @@ static int tidss_crtc_atomic_check(struct drm_crtc *crtc,
>  				   struct drm_crtc_state *state)
>  {
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct dispc_device *dispc = tidss->dispc;
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	u32 hw_videoport = tcrtc->hw_videoport;
> @@ -165,7 +165,7 @@ static void tidss_crtc_atomic_flush(struct drm_crtc *crtc,
>  {
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	unsigned long flags;
>  
>  	dev_dbg(ddev->dev,
> @@ -216,7 +216,7 @@ static void tidss_crtc_atomic_enable(struct drm_crtc *crtc,
>  {
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	const struct drm_display_mode *mode = &crtc->state->adjusted_mode;
>  	unsigned long flags;
>  	int r;
> @@ -259,7 +259,7 @@ static void tidss_crtc_atomic_disable(struct drm_crtc *crtc,
>  {
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	unsigned long flags;
>  
>  	dev_dbg(ddev->dev, "%s, event %p\n", __func__, crtc->state->event);
> @@ -295,7 +295,7 @@ enum drm_mode_status tidss_crtc_mode_valid(struct drm_crtc *crtc,
>  {
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  
>  	return dispc_vp_mode_valid(tidss->dispc, tcrtc->hw_videoport, mode);
>  }
> @@ -314,7 +314,7 @@ static const struct drm_crtc_helper_funcs tidss_crtc_helper_funcs = {
>  static int tidss_crtc_enable_vblank(struct drm_crtc *crtc)
>  {
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  
>  	dev_dbg(ddev->dev, "%s\n", __func__);
>  
> @@ -328,7 +328,7 @@ static int tidss_crtc_enable_vblank(struct drm_crtc *crtc)
>  static void tidss_crtc_disable_vblank(struct drm_crtc *crtc)
>  {
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  
>  	dev_dbg(ddev->dev, "%s\n", __func__);
>  
> diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c
> index 7d4465d58be8..99edc66ebdef 100644
> --- a/drivers/gpu/drm/tidss/tidss_drv.c
> +++ b/drivers/gpu/drm/tidss/tidss_drv.c
> @@ -147,8 +147,6 @@ static int tidss_probe(struct platform_device *pdev)
>  
>  	platform_set_drvdata(pdev, tidss);
>  
> -	ddev->dev_private = tidss;
> -
>  	ret = dispc_init(tidss);
>  	if (ret) {
>  		dev_err(dev, "failed to initialize dispc: %d\n", ret);
> diff --git a/drivers/gpu/drm/tidss/tidss_drv.h b/drivers/gpu/drm/tidss/tidss_drv.h
> index e2aa6436ad18..b23cd95c8d78 100644
> --- a/drivers/gpu/drm/tidss/tidss_drv.h
> +++ b/drivers/gpu/drm/tidss/tidss_drv.h
> @@ -33,6 +33,8 @@ struct tidss_device {
>  	struct drm_atomic_state *saved_state;
>  };
>  
> +#define to_tidss(__dev) container_of(__dev, struct tidss_device, ddev)
> +
>  int tidss_runtime_get(struct tidss_device *tidss);
>  void tidss_runtime_put(struct tidss_device *tidss);
>  
> diff --git a/drivers/gpu/drm/tidss/tidss_irq.c b/drivers/gpu/drm/tidss/tidss_irq.c
> index 612c046738e5..1b80f2d62e0a 100644
> --- a/drivers/gpu/drm/tidss/tidss_irq.c
> +++ b/drivers/gpu/drm/tidss/tidss_irq.c
> @@ -23,7 +23,7 @@ static void tidss_irq_update(struct tidss_device *tidss)
>  void tidss_irq_enable_vblank(struct drm_crtc *crtc)
>  {
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	u32 hw_videoport = tcrtc->hw_videoport;
>  	unsigned long flags;
> @@ -38,7 +38,7 @@ void tidss_irq_enable_vblank(struct drm_crtc *crtc)
>  void tidss_irq_disable_vblank(struct drm_crtc *crtc)
>  {
>  	struct drm_device *ddev = crtc->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
>  	u32 hw_videoport = tcrtc->hw_videoport;
>  	unsigned long flags;
> @@ -53,7 +53,7 @@ void tidss_irq_disable_vblank(struct drm_crtc *crtc)
>  irqreturn_t tidss_irq_handler(int irq, void *arg)
>  {
>  	struct drm_device *ddev = (struct drm_device *)arg;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	unsigned int id;
>  	dispc_irq_t irqstatus;
>  
> @@ -95,7 +95,7 @@ void tidss_irq_resume(struct tidss_device *tidss)
>  
>  void tidss_irq_preinstall(struct drm_device *ddev)
>  {
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  
>  	spin_lock_init(&tidss->wait_lock);
>  
> @@ -109,7 +109,7 @@ void tidss_irq_preinstall(struct drm_device *ddev)
>  
>  int tidss_irq_postinstall(struct drm_device *ddev)
>  {
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	unsigned long flags;
>  	unsigned int i;
>  
> @@ -138,7 +138,7 @@ int tidss_irq_postinstall(struct drm_device *ddev)
>  
>  void tidss_irq_uninstall(struct drm_device *ddev)
>  {
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  
>  	tidss_runtime_get(tidss);
>  	dispc_set_irqenable(tidss->dispc, 0);
> diff --git a/drivers/gpu/drm/tidss/tidss_kms.c b/drivers/gpu/drm/tidss/tidss_kms.c
> index 4bd339a467a4..4b99e9fa84a5 100644
> --- a/drivers/gpu/drm/tidss/tidss_kms.c
> +++ b/drivers/gpu/drm/tidss/tidss_kms.c
> @@ -25,7 +25,7 @@
>  static void tidss_atomic_commit_tail(struct drm_atomic_state *old_state)
>  {
>  	struct drm_device *ddev = old_state->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  
>  	dev_dbg(ddev->dev, "%s\n", __func__);
>  
> diff --git a/drivers/gpu/drm/tidss/tidss_plane.c b/drivers/gpu/drm/tidss/tidss_plane.c
> index ff99b2dd4a17..23bb3e59504b 100644
> --- a/drivers/gpu/drm/tidss/tidss_plane.c
> +++ b/drivers/gpu/drm/tidss/tidss_plane.c
> @@ -22,7 +22,7 @@ static int tidss_plane_atomic_check(struct drm_plane *plane,
>  				    struct drm_plane_state *state)
>  {
>  	struct drm_device *ddev = plane->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct tidss_plane *tplane = to_tidss_plane(plane);
>  	const struct drm_format_info *finfo;
>  	struct drm_crtc_state *crtc_state;
> @@ -101,7 +101,7 @@ static void tidss_plane_atomic_update(struct drm_plane *plane,
>  				      struct drm_plane_state *old_state)
>  {
>  	struct drm_device *ddev = plane->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct tidss_plane *tplane = to_tidss_plane(plane);
>  	struct drm_plane_state *state = plane->state;
>  	u32 hw_videoport;
> @@ -133,7 +133,7 @@ static void tidss_plane_atomic_disable(struct drm_plane *plane,
>  				       struct drm_plane_state *old_state)
>  {
>  	struct drm_device *ddev = plane->dev;
> -	struct tidss_device *tidss = ddev->dev_private;
> +	struct tidss_device *tidss = to_tidss(ddev);
>  	struct tidss_plane *tplane = to_tidss_plane(plane);
>  
>  	dev_dbg(ddev->dev, "%s\n", __func__);
>

diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c
index d4ce9bab8c7e..2396262c09e4 100644
--- a/drivers/gpu/drm/tidss/tidss_crtc.c
+++ b/drivers/gpu/drm/tidss/tidss_crtc.c
@@ -24,7 +24,7 @@ 
 static void tidss_crtc_finish_page_flip(struct tidss_crtc *tcrtc)
 {
 	struct drm_device *ddev = tcrtc->crtc.dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 	struct drm_pending_vblank_event *event;
 	unsigned long flags;
 	bool busy;
@@ -88,7 +88,7 @@  static int tidss_crtc_atomic_check(struct drm_crtc *crtc,
 				   struct drm_crtc_state *state)
 {
 	struct drm_device *ddev = crtc->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 	struct dispc_device *dispc = tidss->dispc;
 	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
 	u32 hw_videoport = tcrtc->hw_videoport;
@@ -165,7 +165,7 @@  static void tidss_crtc_atomic_flush(struct drm_crtc *crtc,
 {
 	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
 	struct drm_device *ddev = crtc->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 	unsigned long flags;
 
 	dev_dbg(ddev->dev,
@@ -216,7 +216,7 @@  static void tidss_crtc_atomic_enable(struct drm_crtc *crtc,
 {
 	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
 	struct drm_device *ddev = crtc->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 	const struct drm_display_mode *mode = &crtc->state->adjusted_mode;
 	unsigned long flags;
 	int r;
@@ -259,7 +259,7 @@  static void tidss_crtc_atomic_disable(struct drm_crtc *crtc,
 {
 	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
 	struct drm_device *ddev = crtc->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 	unsigned long flags;
 
 	dev_dbg(ddev->dev, "%s, event %p\n", __func__, crtc->state->event);
@@ -295,7 +295,7 @@  enum drm_mode_status tidss_crtc_mode_valid(struct drm_crtc *crtc,
 {
 	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
 	struct drm_device *ddev = crtc->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 
 	return dispc_vp_mode_valid(tidss->dispc, tcrtc->hw_videoport, mode);
 }
@@ -314,7 +314,7 @@  static const struct drm_crtc_helper_funcs tidss_crtc_helper_funcs = {
 static int tidss_crtc_enable_vblank(struct drm_crtc *crtc)
 {
 	struct drm_device *ddev = crtc->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 
 	dev_dbg(ddev->dev, "%s\n", __func__);
 
@@ -328,7 +328,7 @@  static int tidss_crtc_enable_vblank(struct drm_crtc *crtc)
 static void tidss_crtc_disable_vblank(struct drm_crtc *crtc)
 {
 	struct drm_device *ddev = crtc->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 
 	dev_dbg(ddev->dev, "%s\n", __func__);
 
diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c
index 7d4465d58be8..99edc66ebdef 100644
--- a/drivers/gpu/drm/tidss/tidss_drv.c
+++ b/drivers/gpu/drm/tidss/tidss_drv.c
@@ -147,8 +147,6 @@  static int tidss_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, tidss);
 
-	ddev->dev_private = tidss;
-
 	ret = dispc_init(tidss);
 	if (ret) {
 		dev_err(dev, "failed to initialize dispc: %d\n", ret);
diff --git a/drivers/gpu/drm/tidss/tidss_drv.h b/drivers/gpu/drm/tidss/tidss_drv.h
index e2aa6436ad18..b23cd95c8d78 100644
--- a/drivers/gpu/drm/tidss/tidss_drv.h
+++ b/drivers/gpu/drm/tidss/tidss_drv.h
@@ -33,6 +33,8 @@  struct tidss_device {
 	struct drm_atomic_state *saved_state;
 };
 
+#define to_tidss(__dev) container_of(__dev, struct tidss_device, ddev)
+
 int tidss_runtime_get(struct tidss_device *tidss);
 void tidss_runtime_put(struct tidss_device *tidss);
 
diff --git a/drivers/gpu/drm/tidss/tidss_irq.c b/drivers/gpu/drm/tidss/tidss_irq.c
index 612c046738e5..1b80f2d62e0a 100644
--- a/drivers/gpu/drm/tidss/tidss_irq.c
+++ b/drivers/gpu/drm/tidss/tidss_irq.c
@@ -23,7 +23,7 @@  static void tidss_irq_update(struct tidss_device *tidss)
 void tidss_irq_enable_vblank(struct drm_crtc *crtc)
 {
 	struct drm_device *ddev = crtc->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
 	u32 hw_videoport = tcrtc->hw_videoport;
 	unsigned long flags;
@@ -38,7 +38,7 @@  void tidss_irq_enable_vblank(struct drm_crtc *crtc)
 void tidss_irq_disable_vblank(struct drm_crtc *crtc)
 {
 	struct drm_device *ddev = crtc->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 	struct tidss_crtc *tcrtc = to_tidss_crtc(crtc);
 	u32 hw_videoport = tcrtc->hw_videoport;
 	unsigned long flags;
@@ -53,7 +53,7 @@  void tidss_irq_disable_vblank(struct drm_crtc *crtc)
 irqreturn_t tidss_irq_handler(int irq, void *arg)
 {
 	struct drm_device *ddev = (struct drm_device *)arg;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 	unsigned int id;
 	dispc_irq_t irqstatus;
 
@@ -95,7 +95,7 @@  void tidss_irq_resume(struct tidss_device *tidss)
 
 void tidss_irq_preinstall(struct drm_device *ddev)
 {
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 
 	spin_lock_init(&tidss->wait_lock);
 
@@ -109,7 +109,7 @@  void tidss_irq_preinstall(struct drm_device *ddev)
 
 int tidss_irq_postinstall(struct drm_device *ddev)
 {
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 	unsigned long flags;
 	unsigned int i;
 
@@ -138,7 +138,7 @@  int tidss_irq_postinstall(struct drm_device *ddev)
 
 void tidss_irq_uninstall(struct drm_device *ddev)
 {
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 
 	tidss_runtime_get(tidss);
 	dispc_set_irqenable(tidss->dispc, 0);
diff --git a/drivers/gpu/drm/tidss/tidss_kms.c b/drivers/gpu/drm/tidss/tidss_kms.c
index 4bd339a467a4..4b99e9fa84a5 100644
--- a/drivers/gpu/drm/tidss/tidss_kms.c
+++ b/drivers/gpu/drm/tidss/tidss_kms.c
@@ -25,7 +25,7 @@ 
 static void tidss_atomic_commit_tail(struct drm_atomic_state *old_state)
 {
 	struct drm_device *ddev = old_state->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 
 	dev_dbg(ddev->dev, "%s\n", __func__);
 
diff --git a/drivers/gpu/drm/tidss/tidss_plane.c b/drivers/gpu/drm/tidss/tidss_plane.c
index ff99b2dd4a17..23bb3e59504b 100644
--- a/drivers/gpu/drm/tidss/tidss_plane.c
+++ b/drivers/gpu/drm/tidss/tidss_plane.c
@@ -22,7 +22,7 @@  static int tidss_plane_atomic_check(struct drm_plane *plane,
 				    struct drm_plane_state *state)
 {
 	struct drm_device *ddev = plane->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 	struct tidss_plane *tplane = to_tidss_plane(plane);
 	const struct drm_format_info *finfo;
 	struct drm_crtc_state *crtc_state;
@@ -101,7 +101,7 @@  static void tidss_plane_atomic_update(struct drm_plane *plane,
 				      struct drm_plane_state *old_state)
 {
 	struct drm_device *ddev = plane->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 	struct tidss_plane *tplane = to_tidss_plane(plane);
 	struct drm_plane_state *state = plane->state;
 	u32 hw_videoport;
@@ -133,7 +133,7 @@  static void tidss_plane_atomic_disable(struct drm_plane *plane,
 				       struct drm_plane_state *old_state)
 {
 	struct drm_device *ddev = plane->dev;
-	struct tidss_device *tidss = ddev->dev_private;
+	struct tidss_device *tidss = to_tidss(ddev);
 	struct tidss_plane *tplane = to_tidss_plane(plane);
 
 	dev_dbg(ddev->dev, "%s\n", __func__);

[28/44] drm/tidss: Don't use drm_device->dev_private

Commit Message

Comments

Patch