Commit 5f56e596 authored by Danilo Krummrich's avatar Danilo Krummrich Committed by Liviu Dudau
Browse files

drm/arm/hdlcd: replace drm->dev_private with drm_to_hdlcd_priv() 



Using drm_device->dev_private is deprecated. Since we've switched to
devm_drm_dev_alloc(), struct drm_device is now embedded in struct
hdlcd_drm_private, hence we can use container_of() to get the struct
drm_device instance instead.

Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Signed-off-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221026153431.72033-3-dakr@redhat.com
parent 9914013f

drivers/gpu/drm/arm/hdlcd_crtc.c

+3 −3
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static void hdlcd_plane_atomic_update(struct drm_plane *plane, 
	dest_h = drm_rect_height(&new_plane_state->dst);

	scanout_start = drm_fb_dma_get_gem_addr(fb, new_plane_state, 0);



	hdlcd = plane->dev->dev_private;

	hdlcd = drm_to_hdlcd_priv(plane->dev);

	hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_LENGTH, fb->pitches[0]);

	hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_PITCH, fb->pitches[0]);

	hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_COUNT, dest_h - 1);
@@ -297,7 +297,7 @@ static const struct drm_plane_funcs hdlcd_plane_funcs = { 


static struct drm_plane *hdlcd_plane_init(struct drm_device *drm)

{

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm);

	struct drm_plane *plane = NULL;

	u32 formats[ARRAY_SIZE(supported_formats)], i;

	int ret;
@@ -324,7 +324,7 @@ static struct drm_plane *hdlcd_plane_init(struct drm_device *drm) 


int hdlcd_setup_crtc(struct drm_device *drm)

{

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm);

	struct drm_plane *primary;

	int ret;

drivers/gpu/drm/arm/hdlcd_drv.c

+4 −6
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void hdlcd_irq_uninstall(struct hdlcd_drm_private *hdlcd) 


static int hdlcd_load(struct drm_device *drm, unsigned long flags)

{

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm);

	struct platform_device *pdev = to_platform_device(drm->dev);

	struct resource *res;

	u32 version;
@@ -190,7 +190,7 @@ static int hdlcd_show_underrun_count(struct seq_file *m, void *arg) 
{

	struct drm_info_node *node = (struct drm_info_node *)m->private;

	struct drm_device *drm = node->minor->dev;

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm);



	seq_printf(m, "underrun : %d\n", atomic_read(&hdlcd->buffer_underrun_count));

	seq_printf(m, "dma_end  : %d\n", atomic_read(&hdlcd->dma_end_count));
@@ -203,7 +203,7 @@ static int hdlcd_show_pxlclock(struct seq_file *m, void *arg) 
{

	struct drm_info_node *node = (struct drm_info_node *)m->private;

	struct drm_device *drm = node->minor->dev;

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm);

	unsigned long clkrate = clk_get_rate(hdlcd->clk);

	unsigned long mode_clock = hdlcd->crtc.mode.crtc_clock * 1000;
@@ -253,7 +253,6 @@ static int hdlcd_drm_bind(struct device *dev) 


	drm = &hdlcd->base;



	drm->dev_private = hdlcd;

	dev_set_drvdata(dev, drm);



	hdlcd_setup_mode_config(drm);
@@ -324,7 +323,7 @@ static int hdlcd_drm_bind(struct device *dev) 
static void hdlcd_drm_unbind(struct device *dev)

{

	struct drm_device *drm = dev_get_drvdata(dev);

	struct hdlcd_drm_private *hdlcd = drm->dev_private;

	struct hdlcd_drm_private *hdlcd = drm_to_hdlcd_priv(drm);



	drm_dev_unregister(drm);

	drm_kms_helper_poll_fini(drm);
@@ -339,7 +338,6 @@ static void hdlcd_drm_unbind(struct device *dev) 
		pm_runtime_disable(dev);

	of_reserved_mem_device_release(dev);

	drm_mode_config_cleanup(drm);

	drm->dev_private = NULL;

	dev_set_drvdata(dev, NULL);

}

drivers/gpu/drm/arm/hdlcd_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ struct hdlcd_drm_private { 
#endif

};



#define drm_to_hdlcd_priv(x)	container_of(x, struct hdlcd_drm_private, base)

#define crtc_to_hdlcd_priv(x)	container_of(x, struct hdlcd_drm_private, crtc)



static inline void hdlcd_write(struct hdlcd_drm_private *hdlcd,