drm-misc-fixes for v5.18-rc5:

- Single fix removing applying PHYS_OFFSET twice in sunxi.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEuXvWqAysSYEJGuVH/lWMcqZwE8MFAmJo3LUACgkQ/lWMcqZw
 E8PZUhAAmwQ38ynlxBiawEEIOaRDh54m77KzU3VVcryYAIaDvNRV84v5BDrhYTLW
 PdFsRh71r/g0tmoSKkHifmkCSIovbU+5bArXYhdyI0ssiS0cH1+trtd0ZxZdP/mv
 Bq/KLw12UtrL/kGD06QNpVDGmkvJJU5NNlpaxslHjkfyQiPcMnLaH8E12vNtHWUh
 icKthAI0HjVEmFMC3rUW3UBERhO2uG0q2UtrVDn01bg+XWaUltlfLA7qm9d1I1dS
 M/eSAS3rBwOKmWRM4EDdlFSpUM8ZYiVfkWQIpThktxM2bkjXdRO9SY1Y3jzkrp1L
 ONXGCRof8q/DB3no4DBlqAcgTKkY+0JeCiJCzDiGm3qoxCeUj7rypLWR98tgHs7m
 zXp7c5vK2F4xknQz2O6xeM/GUDUgforAh3L2ZVBGh9howGd69wQTKtV+ThcJpeZ2
 mt+izcjyb9AN6z/7iit6vrOfwNgtPixyUW6iAQsM2At/yVbUQVbD8vTd8fId8bob
 y7Y2xjqvaSY5153OwxYE+qg1UTP48NqMBCdByN5v1j5VEoJE1KqC1XaIanFjVd8s
 +FPZJ6SpLb9hFe4MT+fsV3v4Svk2RcI9dcmow8f2gcD7nxzlAjuXuZjI8pMSChSH
 Q5W27g6RUMyxMlGsfcUqJhSwk5KGhH4BYjQDLUQpZFsx+BeaA4c=
 =eA+4
 -----END PGP SIGNATURE-----

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: Dave 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
This commit is contained in:
Dave Airlie 2022-04-29 10:02:04 +10:00
commit 43f2c104f0

View File

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