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

Jyri Sarha jsarha at ti.com
Tue Apr 14 09:55:29 UTC 2020


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 at intel.com>
> Cc: Jyri Sarha <jsarha at ti.com>
> Cc: Tomi Valkeinen <tomi.valkeinen at ti.com>

Tested-by: Jyri Sarha <jsarha at 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__);
> 


-- 
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki


More information about the dri-devel mailing list