Skip to content

drm/vc4: PV1 can be driven via any HVS channel, so adapt to allow it#6667

Merged
pelwell merged 2 commits intoraspberrypi:rpi-6.12.yfrom
6by9:rpi-6.12.y-drm2
Feb 14, 2025
Merged

drm/vc4: PV1 can be driven via any HVS channel, so adapt to allow it#6667
pelwell merged 2 commits intoraspberrypi:rpi-6.12.yfrom
6by9:rpi-6.12.y-drm2

Conversation

@6by9
Copy link
Contributor

@6by9 6by9 commented Feb 13, 2025

It was noted that if PV1 was in use to drive DSI1, then the writeback connector could not be used as HVS channel 2 was already in use.
The HVS allows PV1 (HVS output 2) to be driven by any HVS channel via the DSP3_MUX setting, but that was hardcoded to be either 2 (for PV1) or disabled for TXP.

Expand the available channels field for PV1, and configure DSP3_MUX accordingly.

https://forums.raspberrypi.com/viewtopic.php?p=2294596

6by9 added 2 commits February 13, 2025 11:36
It was noted that if PV1 was in use to drive DSI1, then the
writeback connector could not be used as HVS channel 2 was
already in use.
The HVS allows PV1 (HVS output 2) to be driven by any HVS
channel via the DSP3_MUX setting, but that was hardcoded to be
either 2 (for PV1) or disabled for TXP.

Expand the available channels field for PV1, and configure
DSP3_MUX accordingly.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
The tests on vc4 (BCM2835-7) were checking for DSI1 muxing being
to restricted channel 2, and therefore muxing with TXP was impossible.

As we no longer have that restriction, update the capabilities
defined for DSI1, move the tests that used to be impossible to the
valid list, and extend for additional combinations that are now
possible.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
@6by9
Copy link
Contributor Author

6by9 commented Feb 13, 2025

Confirmed on the forum thread as doing the job for them too.
I'll be sending this upstream as an improvement.

@pelwell pelwell merged commit 8d163a9 into raspberrypi:rpi-6.12.y Feb 14, 2025
12 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