Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drm/vc4: Correct address offset for planes with src_[xy] offsets #5654

Merged
merged 1 commit into from
Oct 17, 2023

Conversation

6by9
Copy link
Contributor

@6by9 6by9 commented Oct 16, 2023

11cf37e switched to using drm_fb_dma_get_gem_addr instead of drm_fb_dma_get_gem_obj and adding fb->offset[].

However the tiled formats need to compute the offset in a more involved manner than drm_fb_dma_get_gem_addr applies, and we were ending up with the offset for src_[xy] being applied twice.

Switch back to using drm_fb_dma_get_gem_obj and fully computing the offsets ourselves.

Fixes: 11cf37e ("drm/vc4: Move the buffer offset out of the vc4_plane_state")

11cf37e switched to using drm_fb_dma_get_gem_addr instead of
drm_fb_dma_get_gem_obj and adding fb->offset[].

However the tiled formats need to compute the offset in a more
involved manner than drm_fb_dma_get_gem_addr applies, and we
were ending up with the offset for src_[xy] being applied twice.

Switch back to using drm_fb_dma_get_gem_obj and fully computing
the offsets ourselves.

Fixes: 11cf37e ("drm/vc4: Move the buffer offset out of the vc4_plane_state")
Signed-off-by: Dave Stevenson <[email protected]>
@popcornmix
Copy link
Collaborator

Tested with dual monitor and X. Without the PR I see same desktop on both screens. With the PR I see separate desktops.
Kodi still seems functional a number of formats.

LGTM

@6by9
Copy link
Contributor Author

6by9 commented Oct 17, 2023

AFAIK Kodi doesn't use source rectangles (only destination rects for letterboxing), so wouldn't be affected anyway.

@pelwell pelwell merged commit 6ab30a5 into raspberrypi:rpi-6.1.y Oct 17, 2023
11 of 12 checks passed
popcornmix added a commit to raspberrypi/firmware that referenced this pull request Oct 17, 2023
kernel: drivers: media: rp1_cfe: Fix link validate test for pixel format
See: raspberrypi/linux#5657

kernel: drm/vc4: Correct address offset for planes with src_[xy] offsets
See: raspberrypi/linux#5654

kernel: input: touchscreen: edt-ft5x06: Suppress bogus data on startup
See: raspberrypi/linux#5645

kernel: vc_mem: Add the DMA memcpy support from bcm2708_fb
See: raspberrypi/linux#5651

kernel: dts: bcm2712: Set default I2C baudrates to 100kHz
See: raspberrypi/linux#5653

kernel: MCP23017: allow specification of the i2c bus
See: raspberrypi/linux#5650

kernel: Revert: bcm2708_fb: Hack out dma support
See: raspberrypi/linux#5648

firmware: config: Add [pi5] to config.txt on 2711 and earlier platforms

userland: bcm_host: Update kms/fkms check for pi5
popcornmix added a commit to raspberrypi/rpi-firmware that referenced this pull request Oct 17, 2023
kernel: drivers: media: rp1_cfe: Fix link validate test for pixel format
See: raspberrypi/linux#5657

kernel: drm/vc4: Correct address offset for planes with src_[xy] offsets
See: raspberrypi/linux#5654

kernel: input: touchscreen: edt-ft5x06: Suppress bogus data on startup
See: raspberrypi/linux#5645

kernel: vc_mem: Add the DMA memcpy support from bcm2708_fb
See: raspberrypi/linux#5651

kernel: dts: bcm2712: Set default I2C baudrates to 100kHz
See: raspberrypi/linux#5653

kernel: MCP23017: allow specification of the i2c bus
See: raspberrypi/linux#5650

kernel: Revert: bcm2708_fb: Hack out dma support
See: raspberrypi/linux#5648

firmware: config: Add [pi5] to config.txt on 2711 and earlier platforms

userland: bcm_host: Update kms/fkms check for pi5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants