Unverified Commit e05162c0 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm: Store new plane state in a variable for atomic_update and disable 



In order to store the new plane state in a subsequent helper, let's move
the plane->state dereferences into a variable.

This was done using the following coccinelle script, plus some hand
changes for vmwgfx:

@ plane_atomic_func @
identifier helpers;
identifier func;
@@

(
 static const struct drm_plane_helper_funcs helpers = {
 	...,
 	.atomic_disable = func,
	...,
 };
|
 static const struct drm_plane_helper_funcs helpers = {
 	...,
 	.atomic_update = func,
	...,
 };
)

@ has_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
identifier new_state;
symbol old_state;
@@

 func(struct drm_plane *plane, struct drm_plane_state *old_state)
 {
 	...
 	struct drm_plane_state *new_state = plane->state;
	...
 }

@ depends on !has_new_state_old_state @
identifier plane_atomic_func.func;
identifier plane;
symbol old_state;
@@

 func(struct drm_plane *plane, struct drm_plane_state *old_state)
 {
+	struct drm_plane_state *new_state = plane->state;
 	<+...
-	plane->state
+	new_state
	...+>
 }

@ has_new_state_state @
identifier plane_atomic_func.func;
identifier plane;
identifier new_state;
symbol state;
@@

 func(struct drm_plane *plane, struct drm_plane_state *state)
 {
 	...
 	struct drm_plane_state *new_state = plane->state;
	...
 }

@ depends on !has_new_state_state @
identifier plane_atomic_func.func;
identifier plane;
symbol state;
@@

 func(struct drm_plane *plane, struct drm_plane_state *state)
 {
+	struct drm_plane_state *new_plane_state = plane->state;
 	<+...
-	plane->state
+	new_plane_state
	...+>
 }

@ has_new_state_old_s @
identifier plane_atomic_func.func;
identifier plane;
identifier new_state;
symbol old_s;
@@

 func(struct drm_plane *plane, struct drm_plane_state *old_s)
 {
 	...
 	struct drm_plane_state *new_state = plane->state;
	...
 }

@ depends on !has_new_state_old_s @
identifier plane_atomic_func.func;
identifier plane;
symbol old_s;
@@

 func(struct drm_plane *plane, struct drm_plane_state *old_s)
 {
+	struct drm_plane_state *new_s = plane->state;
 	<+...
-	plane->state
+	new_s
	...+>
 }

Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20210219120032.260676-1-maxime@cerno.tech
parent 0b6aaf9d

drivers/gpu/drm/arc/arcpgu_crtc.c

+4 −3
Original line number Diff line number Diff line
@@ -147,14 +147,15 @@ static const struct drm_crtc_helper_funcs arc_pgu_crtc_helper_funcs = { 
static void arc_pgu_plane_atomic_update(struct drm_plane *plane,

					struct drm_plane_state *state)

{

	struct drm_plane_state *new_plane_state = plane->state;

	struct arcpgu_drm_private *arcpgu;

	struct drm_gem_cma_object *gem;



	if (!plane->state->crtc || !plane->state->fb)

	if (!new_plane_state->crtc || !new_plane_state->fb)

		return;



	arcpgu = crtc_to_arcpgu_priv(plane->state->crtc);

	gem = drm_fb_cma_get_gem_obj(plane->state->fb, 0);

	arcpgu = crtc_to_arcpgu_priv(new_plane_state->crtc);

	gem = drm_fb_cma_get_gem_obj(new_plane_state->fb, 0);

	arc_pgu_write(arcpgu, ARCPGU_REG_BUF0_ADDR, gem->paddr);

}

drivers/gpu/drm/arm/hdlcd_crtc.c

+4 −3
Original line number Diff line number Diff line
@@ -262,7 +262,8 @@ static int hdlcd_plane_atomic_check(struct drm_plane *plane, 
static void hdlcd_plane_atomic_update(struct drm_plane *plane,

				      struct drm_plane_state *state)

{

	struct drm_framebuffer *fb = plane->state->fb;

	struct drm_plane_state *new_plane_state = plane->state;

	struct drm_framebuffer *fb = new_plane_state->fb;

	struct hdlcd_drm_private *hdlcd;

	u32 dest_h;

	dma_addr_t scanout_start;
@@ -270,8 +271,8 @@ static void hdlcd_plane_atomic_update(struct drm_plane *plane, 
	if (!fb)

		return;



	dest_h = drm_rect_height(&plane->state->dst);

	scanout_start = drm_fb_cma_get_gem_addr(fb, plane->state, 0);

	dest_h = drm_rect_height(&new_plane_state->dst);

	scanout_start = drm_fb_cma_get_gem_addr(fb, new_plane_state, 0);



	hdlcd = plane->dev->dev_private;

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

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

+3 −2
Original line number Diff line number Diff line
@@ -733,12 +733,13 @@ static void atmel_hlcdc_plane_atomic_disable(struct drm_plane *p, 
static void atmel_hlcdc_plane_atomic_update(struct drm_plane *p,

					    struct drm_plane_state *old_s)

{

	struct drm_plane_state *new_s = p->state;

	struct atmel_hlcdc_plane *plane = drm_plane_to_atmel_hlcdc_plane(p);

	struct atmel_hlcdc_plane_state *hstate =

			drm_plane_state_to_atmel_hlcdc_plane_state(p->state);

			drm_plane_state_to_atmel_hlcdc_plane_state(new_s);

	u32 sr;



	if (!p->state->crtc || !p->state->fb)

	if (!new_s->crtc || !new_s->fb)

		return;



	if (!hstate->base.visible) {

drivers/gpu/drm/kmb/kmb_plane.c

+10 −9
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ static void config_csc(struct kmb_drm_private *kmb, int plane_id) 
static void kmb_plane_atomic_update(struct drm_plane *plane,

				    struct drm_plane_state *state)

{

	struct drm_plane_state *new_plane_state = plane->state;

	struct drm_framebuffer *fb;

	struct kmb_drm_private *kmb;

	unsigned int width;
@@ -293,10 +294,10 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, 
	int num_planes;

	static dma_addr_t addr[MAX_SUB_PLANES];



	if (!plane || !plane->state || !state)

	if (!plane || !new_plane_state || !state)

		return;



	fb = plane->state->fb;

	fb = new_plane_state->fb;

	if (!fb)

		return;

	num_planes = fb->format->num_planes;
@@ -313,10 +314,10 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, 
	}

	spin_unlock_irq(&kmb->irq_lock);



	src_w = (plane->state->src_w >> 16);

	src_h = plane->state->src_h >> 16;

	crtc_x = plane->state->crtc_x;

	crtc_y = plane->state->crtc_y;

	src_w = (new_plane_state->src_w >> 16);

	src_h = new_plane_state->src_h >> 16;

	crtc_x = new_plane_state->crtc_x;

	crtc_y = new_plane_state->crtc_y;



	drm_dbg(&kmb->drm,

		"src_w=%d src_h=%d, fb->format->format=0x%x fb->flags=0x%x\n",
@@ -333,7 +334,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, 
	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_WIDTH(plane_id),

		      (width * fb->format->cpp[0]));



	addr[Y_PLANE] = drm_fb_cma_get_gem_addr(fb, plane->state, 0);

	addr[Y_PLANE] = drm_fb_cma_get_gem_addr(fb, new_plane_state, 0);

	kmb_write_lcd(kmb, LCD_LAYERn_DMA_START_ADDR(plane_id),

		      addr[Y_PLANE] + fb->offsets[0]);

	val = get_pixel_format(fb->format->format);
@@ -345,7 +346,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, 
		kmb_write_lcd(kmb, LCD_LAYERn_DMA_CB_LINE_WIDTH(plane_id),

			      (width * fb->format->cpp[0]));



		addr[U_PLANE] = drm_fb_cma_get_gem_addr(fb, plane->state,

		addr[U_PLANE] = drm_fb_cma_get_gem_addr(fb, new_plane_state,

							U_PLANE);

		/* check if Cb/Cr is swapped*/

		if (num_planes == 3 && (val & LCD_LAYER_CRCB_ORDER))
@@ -367,7 +368,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, 
				      ((width) * fb->format->cpp[0]));



			addr[V_PLANE] = drm_fb_cma_get_gem_addr(fb,

								plane->state,

								new_plane_state,

								V_PLANE);



			/* check if Cb/Cr is swapped*/

drivers/gpu/drm/mediatek/mtk_drm_plane.c

+14 −12
Original line number Diff line number Diff line
@@ -175,7 +175,8 @@ static int mtk_plane_atomic_check(struct drm_plane *plane, 
static void mtk_plane_atomic_disable(struct drm_plane *plane,

				     struct drm_plane_state *old_state)

{

	struct mtk_plane_state *state = to_mtk_plane_state(plane->state);

	struct drm_plane_state *new_state = plane->state;

	struct mtk_plane_state *state = to_mtk_plane_state(new_state);



	state->pending.enable = false;

	wmb(); /* Make sure the above parameter is set before update */
@@ -185,9 +186,10 @@ static void mtk_plane_atomic_disable(struct drm_plane *plane, 
static void mtk_plane_atomic_update(struct drm_plane *plane,

				    struct drm_plane_state *old_state)

{

	struct mtk_plane_state *state = to_mtk_plane_state(plane->state);

	struct drm_crtc *crtc = plane->state->crtc;

	struct drm_framebuffer *fb = plane->state->fb;

	struct drm_plane_state *new_state = plane->state;

	struct mtk_plane_state *state = to_mtk_plane_state(new_state);

	struct drm_crtc *crtc = new_state->crtc;

	struct drm_framebuffer *fb = new_state->fb;

	struct drm_gem_object *gem;

	struct mtk_drm_gem_obj *mtk_gem;

	unsigned int pitch, format;
@@ -196,7 +198,7 @@ static void mtk_plane_atomic_update(struct drm_plane *plane, 
	if (!crtc || WARN_ON(!fb))

		return;



	if (!plane->state->visible) {

	if (!new_state->visible) {

		mtk_plane_atomic_disable(plane, old_state);

		return;

	}
@@ -207,18 +209,18 @@ static void mtk_plane_atomic_update(struct drm_plane *plane, 
	pitch = fb->pitches[0];

	format = fb->format->format;



	addr += (plane->state->src.x1 >> 16) * fb->format->cpp[0];

	addr += (plane->state->src.y1 >> 16) * pitch;

	addr += (new_state->src.x1 >> 16) * fb->format->cpp[0];

	addr += (new_state->src.y1 >> 16) * pitch;



	state->pending.enable = true;

	state->pending.pitch = pitch;

	state->pending.format = format;

	state->pending.addr = addr;

	state->pending.x = plane->state->dst.x1;

	state->pending.y = plane->state->dst.y1;

	state->pending.width = drm_rect_width(&plane->state->dst);

	state->pending.height = drm_rect_height(&plane->state->dst);

	state->pending.rotation = plane->state->rotation;

	state->pending.x = new_state->dst.x1;

	state->pending.y = new_state->dst.y1;

	state->pending.width = drm_rect_width(&new_state->dst);

	state->pending.height = drm_rect_height(&new_state->dst);

	state->pending.rotation = new_state->rotation;

	wmb(); /* Make sure the above parameters are set before update */

	state->pending.dirty = true;

}