Fix up rp1_dpi_pio for CONFIG_RP1_PIO=n builds#6851
Merged
njhollinghurst merged 2 commits intoraspberrypi:rpi-6.12.yfrom May 13, 2025
Merged
Fix up rp1_dpi_pio for CONFIG_RP1_PIO=n builds#6851njhollinghurst merged 2 commits intoraspberrypi:rpi-6.12.yfrom
njhollinghurst merged 2 commits intoraspberrypi:rpi-6.12.yfrom
Conversation
This reverts commit 95ac2a0. Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Move RP1 DPI's PIO-assisted Composite Sync generation code, previously released as a separate utility, into the kernel driver. There are 3 variants for progressive, generic interlaced and TV- style interlaced CSync, alongside the existing VSync fixup. Check that all of GPIOs 1-3 are mapped to DPI, so PIO won't try to snoop on a missing output, or override another device's pins. Add "force_csync" module parameter, for convenience of testing, as few tools can set DRM_MODE_FLAG_CSYNC. Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com> Signed-off-by: Phil Elwell <phil@raspberrypi.com>
njhollinghurst
approved these changes
May 13, 2025
Contributor
njhollinghurst
left a comment
njhollinghurst
left a comment
There was a problem hiding this comment.
Whoops. The flag was a later addition and I forgot to test this configuration.
Contributor
Author
|
Are you happy with my addition of the force_csync flag to the conditional? |
Contributor
Author
|
I'll take that as a yes. |
Contributor
|
Yes. The return value is ignored (and DPI still kinda words) but the warning may be useful for debug. |
popcornmix
added a commit
to raspberrypi/firmware
that referenced
this pull request
May 14, 2025
kernel: arm64: dts: bcm2712-rpi: Add uart0_dma parameter See: raspberrypi/linux#6838 kernel: configs: Enable SENSORS_POWERZ See: raspberrypi/linux#6845 kernel: wifi: brcmfmac: Include modinfo for 43456 CLM blob See: raspberrypi/linux#6843 kernel: nvme-pci: Re-enable NVME Host Memory Block (HMB) support See: raspberrypi/linux#6844 kernel: pisound-micro: Added pin_pull and pin_b_pull sysfs attributes for Pisound Micro See: raspberrypi/linux#6848 kernel: drm/rp1/rp1_dpi: Move Composite Sync generation into the kernel See: raspberrypi/linux#6826 kernel: Fix up rp1_dpi_pio for CONFIG_RP1_PIO=n builds See: raspberrypi/linux#6851
popcornmix
added a commit
to raspberrypi/rpi-firmware
that referenced
this pull request
May 14, 2025
kernel: arm64: dts: bcm2712-rpi: Add uart0_dma parameter See: raspberrypi/linux#6838 kernel: configs: Enable SENSORS_POWERZ See: raspberrypi/linux#6845 kernel: wifi: brcmfmac: Include modinfo for 43456 CLM blob See: raspberrypi/linux#6843 kernel: nvme-pci: Re-enable NVME Host Memory Block (HMB) support See: raspberrypi/linux#6844 kernel: pisound-micro: Added pin_pull and pin_b_pull sysfs attributes for Pisound Micro See: raspberrypi/linux#6848 kernel: drm/rp1/rp1_dpi: Move Composite Sync generation into the kernel See: raspberrypi/linux#6826 kernel: Fix up rp1_dpi_pio for CONFIG_RP1_PIO=n builds See: raspberrypi/linux#6851
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
If CONFIG_RP1_DPI_PIO is enabled but not CONFIG_RP1_PIO, the fallback version of rp1dpi_pio_start is used. This was not updated in #6826 when the force_csync parameter was added to the prototype.
Add the extra parameter, and take the opportunity to correct the commit name.