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: rp1: rp1-dpi: Fix optional dependency on RP1_PIO #6535

Merged

Conversation

njhollinghurst
Copy link
Contributor

Add optional dependency to Kconfig, and conditionally compile PIO-dependent code. Add a mode validation function to reject interlaced modes when RP1_PIO is not present.

@njhollinghurst
Copy link
Contributor Author

Purported fix for #6529, in testing with various defconfigs...

@6by9
Copy link
Contributor

6by9 commented Dec 12, 2024

I think you want IS_REACHABLE.
Simple use of ifdef has a tendency to do bad things if one half gets built-in and the other half is a module.

@njhollinghurst
Copy link
Contributor Author

Ah yes, I think I do want that.

At the Kconfig level, this documentation suggests there's already a trap for built-in depending on module (though it's far from obvious from the syntax how it achieves that...)

@6by9
Copy link
Contributor

6by9 commented Dec 12, 2024

LGTM

@njhollinghurst njhollinghurst marked this pull request as ready for review December 12, 2024 18:53
@njhollinghurst
Copy link
Contributor Author

njhollinghurst commented Dec 12, 2024

Tested and works as expected with CONFIG_RP1_PIO=m, y and undefined.

Add optional dependency to Kconfig, and conditionally compile
PIO-dependent code. Add a mode validation function to reject
interlaced modes when RP1_PIO is not present.

Signed-off-by: Nick Hollinghurst <[email protected]>
@njhollinghurst njhollinghurst merged commit 80533a9 into raspberrypi:rpi-6.6.y Dec 12, 2024
12 checks passed
@njhollinghurst njhollinghurst deleted the dpi-interlace-optional branch December 12, 2024 19:45
popcornmix added a commit to raspberrypi/firmware that referenced this pull request Dec 16, 2024
kernel: RP1 DPI: Add interlaced modes
See: raspberrypi/linux#6529

kernel: ASoC: allo-piano-dac-plus: Fix volume limit locking
See: raspberrypi/linux#6532

kernel: drm: vc4: txp: Do not allow 24bpp formats when transposing
See: raspberrypi/linux#6533

kernel: ASoC: allo-piano-dac-plus: Suppress -517 errors
See: raspberrypi/linux#6534

kernel: drm: rp1: rp1-dpi: Fix optional dependency on RP1_PIO
See: raspberrypi/linux#6535

kernel: serial: sc16is7xx: announce support for SER_RS485_RTS_ON_SEND
See: raspberrypi/linux#6540
popcornmix added a commit to raspberrypi/rpi-firmware that referenced this pull request Dec 16, 2024
kernel: RP1 DPI: Add interlaced modes
See: raspberrypi/linux#6529

kernel: ASoC: allo-piano-dac-plus: Fix volume limit locking
See: raspberrypi/linux#6532

kernel: drm: vc4: txp: Do not allow 24bpp formats when transposing
See: raspberrypi/linux#6533

kernel: ASoC: allo-piano-dac-plus: Suppress -517 errors
See: raspberrypi/linux#6534

kernel: drm: rp1: rp1-dpi: Fix optional dependency on RP1_PIO
See: raspberrypi/linux#6535

kernel: serial: sc16is7xx: announce support for SER_RS485_RTS_ON_SEND
See: raspberrypi/linux#6540
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