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

Async updates backport to 6.1 #5861

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Conversation

6by9
Copy link
Contributor

@6by9 6by9 commented Jan 17, 2024

#5827 and #5860 backported to 6.1

vc4_plane_async_set_fb directly overwrites the plane address in
the dlist entry, but hadn't been updated for the GEN6 / 2712
dlist format, corrupting the address in the process.

Add support for the 2712 dlist format to the function.

Fixes: 1ab1fbb ("drm/vc4: hvs: Support BCM2712 HVS")
Signed-off-by: Dave Stevenson <[email protected]>
@pelwell
Copy link
Contributor

pelwell commented Jan 17, 2024

../drivers/gpu/drm/vc4/vc4_plane.c: In function ‘vc4_plane_atomic_async_check’:
../drivers/gpu/drm/vc4/vc4_plane.c:2201:13: error: ‘vc4’ undeclared (first use in this function)
 2201 |         if (vc4->gen >= VC4_GEN_6)
      |             ^~~

@6by9
Copy link
Contributor Author

6by9 commented Jan 17, 2024

Missed getting the vc4 pointer here too. Updating.

vc4_plane_atomic_async_check was always calling vc4_plane_mode_set
to validate and generate the dlist for the check. If async_check
decided it had to fall back to a sync commit, then this GEN4/5
dlist could get used on GEN6.

Call either vc4_plane_mode_set or vc6_plane_mode_set as appropriate.

Fixes: 1ab1fbb ("drm/vc4: hvs: Support BCM2712 HVS")
Signed-off-by: Dave Stevenson <[email protected]>
@6by9
Copy link
Contributor Author

6by9 commented Jan 17, 2024

Should be fixed now.

@pelwell
Copy link
Contributor

pelwell commented Jan 17, 2024

Feel free to merge both of these when the build checks pass.

@pelwell pelwell merged commit bfe9276 into raspberrypi:rpi-6.1.y Jan 17, 2024
11 of 12 checks passed
popcornmix added a commit to raspberrypi/firmware that referenced this pull request Jan 18, 2024
kernel: drivers/gpu/drm/panel:Fixed display issues with several screens
See: raspberrypi/linux#5818

kernel: Async updates backport to 6.1
See: raspberrypi/linux#5861
popcornmix added a commit to raspberrypi/rpi-firmware that referenced this pull request Jan 18, 2024
kernel: drivers/gpu/drm/panel:Fixed display issues with several screens
See: raspberrypi/linux#5818

kernel: Async updates backport to 6.1
See: raspberrypi/linux#5861
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