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: Fixup duplicated macro definition in vc4_firmware_kms #5537

Merged
merged 1 commit into from
Jul 12, 2023

Conversation

6by9
Copy link
Contributor

@6by9 6by9 commented Jul 12, 2023

Both vc4_drv.h and vc4_firmware_kms.c had definitions for to_vc4_crtc.

Rename the fkms one to make it unique, and drop the magic define vc4_crtc vc4_kms_crtc
define to_vc4_crtc to_vc4_kms_crtc
that renamed half the variable and function names in a slightly unexpected way.

Both vc4_drv.h and vc4_firmware_kms.c had definitions for
to_vc4_crtc.

Rename the fkms one to make it unique, and drop the magic
define vc4_crtc vc4_kms_crtc
define to_vc4_crtc to_vc4_kms_crtc
that renamed half the variable and function names in a slightly
unexpected way.

Signed-off-by: Dave Stevenson <[email protected]>
@6by9
Copy link
Contributor Author

6by9 commented Jul 12, 2023

A cursory check of fkms on Pi4 seems to say it works.

@popcornmix
Copy link
Collaborator

Works for me.

@pelwell pelwell merged commit 67548d6 into raspberrypi:rpi-6.5.y Jul 12, 2023
5 of 11 checks passed
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