Commit 8c30eecc authored by Danilo Krummrich's avatar Danilo Krummrich Committed by Sam Ravnborg
Browse files

drm/gem: rename struct drm_gem_dma_object.{paddr => dma_addr} 



The field paddr of struct drm_gem_dma_object holds a DMA address, which
might actually be a physical address. However, depending on the platform,
it can also be a bus address or a virtual address managed by an IOMMU.

Hence, rename the field to dma_addr, which is more applicable.

In order to do this renaming the following coccinelle script was used:

```
	@@
	struct drm_gem_dma_object *gem;
	@@

	- gem->paddr
	+ gem->dma_addr

	@@
	struct drm_gem_dma_object gem;
	@@

	- gem.paddr
	+ gem.dma_addr

	@exists@
	typedef dma_addr_t;
	symbol paddr;
	@@

	dma_addr_t paddr;
	<...
	- paddr
	+ dma_addr
	...>

	@@
	symbol paddr;
	@@
	dma_addr_t
	- paddr
	+ dma_addr
	;

```

This patch is compile-time tested with:

```
	make ARCH={x86_64,arm,arm64} allyesconfig
	make ARCH={x86_64,arm,arm64} drivers/gpu/drm`
```

Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220802000405.949236-5-dakr@redhat.com
parent 4a83c26a

drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ komeda_fb_none_afbc_size_check(struct komeda_dev *mdev, struct komeda_fb *kfb, 
		}



		min_size = komeda_fb_get_pixel_addr(kfb, 0, fb->height, i)

			 - to_drm_gem_dma_obj(obj)->paddr;

			 - to_drm_gem_dma_obj(obj)->dma_addr;

		if (obj->size < min_size) {

			DRM_DEBUG_KMS("The fb->obj[%d] size: 0x%zx lower than the minimum requirement: 0x%llx.\n",

				      i, obj->size, min_size);
@@ -260,7 +260,7 @@ komeda_fb_get_pixel_addr(struct komeda_fb *kfb, int x, int y, int plane) 
			+ plane_y * fb->pitches[plane];

	}



	return obj->paddr + offset;

	return obj->dma_addr + offset;

}



/* if the fb can be supported by a specific layer */

drivers/gpu/drm/arm/malidp_mw.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ malidp_mw_encoder_atomic_check(struct drm_encoder *encoder, 
			return -EINVAL;

		}

		mw_state->pitches[i] = fb->pitches[i];

		mw_state->addrs[i] = obj->paddr + fb->offsets[i];

		mw_state->addrs[i] = obj->dma_addr + fb->offsets[i];

	}

	mw_state->n_planes = n_planes;

drivers/gpu/drm/arm/malidp_planes.c

+6 −6
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ static void malidp_set_plane_base_addr(struct drm_framebuffer *fb, 
				       struct malidp_plane *mp,

				       int plane_index)

{

	dma_addr_t paddr;

	dma_addr_t dma_addr;

	u16 ptr;

	struct drm_plane *plane = &mp->base;

	bool afbc = fb->modifier ? true : false;
@@ -729,7 +729,7 @@ static void malidp_set_plane_base_addr(struct drm_framebuffer *fb, 
	 * and _AD_CROP_V registers.

	 */

	if (!afbc) {

		paddr = drm_fb_dma_get_gem_addr(fb, plane->state,

		dma_addr = drm_fb_dma_get_gem_addr(fb, plane->state,

						   plane_index);

	} else {

		struct drm_gem_dma_object *obj;
@@ -738,11 +738,11 @@ static void malidp_set_plane_base_addr(struct drm_framebuffer *fb, 


		if (WARN_ON(!obj))

			return;

		paddr = obj->paddr;

		dma_addr = obj->dma_addr;

	}



	malidp_hw_write(mp->hwdev, lower_32_bits(paddr), ptr);

	malidp_hw_write(mp->hwdev, upper_32_bits(paddr), ptr + 4);

	malidp_hw_write(mp->hwdev, lower_32_bits(dma_addr), ptr);

	malidp_hw_write(mp->hwdev, upper_32_bits(dma_addr), ptr + 4);

}



static void malidp_de_set_plane_afbc(struct drm_plane *plane)

drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static void aspeed_gfx_pipe_update(struct drm_simple_display_pipe *pipe, 
	gem = drm_fb_dma_get_gem_obj(fb, 0);

	if (!gem)

		return;

	writel(gem->paddr, priv->base + CRT_ADDR);

	writel(gem->dma_addr, priv->base + CRT_ADDR);

}



static int aspeed_gfx_enable_vblank(struct drm_simple_display_pipe *pipe)

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

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ static void atmel_hlcdc_plane_update_buffers(struct atmel_hlcdc_plane *plane, 
	for (i = 0; i < state->nplanes; i++) {

		struct drm_gem_dma_object *gem = drm_fb_dma_get_gem_obj(fb, i);



		state->dscrs[i]->addr = gem->paddr + state->offsets[i];

		state->dscrs[i]->addr = gem->dma_addr + state->offsets[i];



		atmel_hlcdc_layer_write_reg(&plane->layer,

					    ATMEL_HLCDC_LAYER_PLANE_HEAD(i),