2e715fb4fc
Add support for BCM2712 (Raspberry Pi 5).
3bb5880ab3
Patches were generated from the diff between linux kernel branch linux-6.1.y
and rpi-6.1.y from raspberry pi kernel source:
- git format-patch linux-6.1.y...rpi-6.1.y
Build system: x86_64
Build-tested: bcm2708, bcm2709, bcm2710, bcm2711
Run-tested: bcm2710/RPi3B, bcm2711/RPi4B
Signed-off-by: Marty Jones <mj8263788@gmail.com>
[Remove applied and reverted patches, squash patches and config commits]
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
26 lines
787 B
Diff
26 lines
787 B
Diff
From 01139e4e9141d031c6f4f00371e5eb52fa78839e Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Tue, 5 Dec 2023 18:28:19 +0000
|
|
Subject: [PATCH] drm/vc4: Correct HVS muxing setup for the moplet
|
|
|
|
The moplet registers as VC4_ENCODER_TYPE_TXP1 and can be
|
|
fed from mux output 2 of HVS channel 1.
|
|
|
|
Correct the option which checked for VC4_ENCODER_TYPE_TXP0
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_kms.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_kms.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
|
|
@@ -365,7 +365,7 @@ static void vc6_hvs_pv_muxing_commit(str
|
|
mux = 0;
|
|
break;
|
|
|
|
- case VC4_ENCODER_TYPE_TXP0:
|
|
+ case VC4_ENCODER_TYPE_TXP1:
|
|
mux = 2;
|
|
break;
|
|
|