Unverified Commit dc3ae06c authored by Samuel Holland's avatar Samuel Holland Committed by Maxime Ripard
Browse files

drm/sun4i: Remove obsolete references to PHYS_OFFSET 



commit b4bdc4fb ("soc: sunxi: Deal with the MBUS DMA offsets in a
central place") added a platform device notifier that sets the DMA
offset for all of the display engine frontend and backend devices.

The code applying the offset to DMA buffer physical addresses was then
removed from the backend driver in commit 756668ba ("drm/sun4i:
backend: Remove the MBUS quirks"), but the code subtracting PHYS_OFFSET
was left in the frontend driver.

As a result, the offset was applied twice in the frontend driver. This
likely went unnoticed because it only affects specific configurations
(scaling or certain pixel formats) where the frontend is used, on boards
with both one of these older SoCs and more than 1 GB of DRAM.

In addition, the references to PHYS_OFFSET prevent compiling the driver
on architectures where PHYS_OFFSET is not defined.

Fixes: b4bdc4fb ("soc: sunxi: Deal with the MBUS DMA offsets in a central place")
Reviewed-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220424162633.12369-4-samuel@sholland.org
parent 94f4c496

drivers/gpu/drm/sun4i/sun4i_frontend.c

+0 −3
Original line number Diff line number Diff line
@@ -222,13 +222,11 @@ void sun4i_frontend_update_buffer(struct sun4i_frontend *frontend, 


	/* Set the physical address of the buffer in memory */

	paddr = drm_fb_cma_get_gem_addr(fb, state, 0);

	paddr -= PHYS_OFFSET;

	DRM_DEBUG_DRIVER("Setting buffer #0 address to %pad\n", &paddr);

	regmap_write(frontend->regs, SUN4I_FRONTEND_BUF_ADDR0_REG, paddr);



	if (fb->format->num_planes > 1) {

		paddr = drm_fb_cma_get_gem_addr(fb, state, swap ? 2 : 1);

		paddr -= PHYS_OFFSET;

		DRM_DEBUG_DRIVER("Setting buffer #1 address to %pad\n", &paddr);

		regmap_write(frontend->regs, SUN4I_FRONTEND_BUF_ADDR1_REG,

			     paddr);
@@ -236,7 +234,6 @@ void sun4i_frontend_update_buffer(struct sun4i_frontend *frontend, 


	if (fb->format->num_planes > 2) {

		paddr = drm_fb_cma_get_gem_addr(fb, state, swap ? 1 : 2);

		paddr -= PHYS_OFFSET;

		DRM_DEBUG_DRIVER("Setting buffer #2 address to %pad\n", &paddr);

		regmap_write(frontend->regs, SUN4I_FRONTEND_BUF_ADDR2_REG,

			     paddr);