Skip to content

Commit 43f2c10

Browse files
committed
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 <[email protected]> From: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents af2d861 + dc3ae06 commit 43f2c10

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

drivers/gpu/drm/sun4i/sun4i_frontend.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,21 +222,18 @@ void sun4i_frontend_update_buffer(struct sun4i_frontend *frontend,
222222

223223
/* Set the physical address of the buffer in memory */
224224
paddr = drm_fb_cma_get_gem_addr(fb, state, 0);
225-
paddr -= PHYS_OFFSET;
226225
DRM_DEBUG_DRIVER("Setting buffer #0 address to %pad\n", &paddr);
227226
regmap_write(frontend->regs, SUN4I_FRONTEND_BUF_ADDR0_REG, paddr);
228227

229228
if (fb->format->num_planes > 1) {
230229
paddr = drm_fb_cma_get_gem_addr(fb, state, swap ? 2 : 1);
231-
paddr -= PHYS_OFFSET;
232230
DRM_DEBUG_DRIVER("Setting buffer #1 address to %pad\n", &paddr);
233231
regmap_write(frontend->regs, SUN4I_FRONTEND_BUF_ADDR1_REG,
234232
paddr);
235233
}
236234

237235
if (fb->format->num_planes > 2) {
238236
paddr = drm_fb_cma_get_gem_addr(fb, state, swap ? 1 : 2);
239-
paddr -= PHYS_OFFSET;
240237
DRM_DEBUG_DRIVER("Setting buffer #2 address to %pad\n", &paddr);
241238
regmap_write(frontend->regs, SUN4I_FRONTEND_BUF_ADDR2_REG,
242239
paddr);

0 commit comments

Comments
 (0)