Commit 43f2c104 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2022-04-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



drm-misc-fixes for v5.18-rc5:
- Single fix removing applying PHYS_OFFSET twice in sunxi.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f692bb62-5620-1868-91b7-dffb8d6f9175@linux.intel.com
parents af2d861d dc3ae06c

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);