diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-16 23:40:32 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-17 15:11:22 +0200 |
| commit | 20ea6adbf199097c4f5f591ffee088340630dae4 (patch) | |
| tree | d6719d95e136611a1c25bbf7789652d6d402779d /target/linux/bcm27xx/patches-5.15/950-0756-drm-vc4-kms-Store-channel-in-local-variable.patch | |
| parent | bca05bd072180dc38ef740b37ded9572a6db1981 (diff) | |
| download | upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.gz upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.bz2 upstream-20ea6adbf199097c4f5f591ffee088340630dae4.zip | |
bcm27xx: add support for linux v5.15
Build system: x86_64
Build-tested: bcm2708, bcm2709, bcm2710, bcm2711
Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B
Signed-off-by: Marty Jones <mj8263788@gmail.com>
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0756-drm-vc4-kms-Store-channel-in-local-variable.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0756-drm-vc4-kms-Store-channel-in-local-variable.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0756-drm-vc4-kms-Store-channel-in-local-variable.patch b/target/linux/bcm27xx/patches-5.15/950-0756-drm-vc4-kms-Store-channel-in-local-variable.patch new file mode 100644 index 0000000000..e15e0a7135 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.15/950-0756-drm-vc4-kms-Store-channel-in-local-variable.patch @@ -0,0 +1,70 @@ +From 753f22ccb26a9085c987700206bdf6724be9b547 Mon Sep 17 00:00:00 2001 +From: Maxime Ripard <maxime@cerno.tech> +Date: Fri, 4 Mar 2022 15:58:51 +0100 +Subject: [PATCH] drm/vc4: kms: Store channel in local variable + +We use the channel from our vc4_crtc_state structure in multiple places, +let's store it in a local variable to make it cleaner. + +Signed-off-by: Maxime Ripard <maxime@cerno.tech> +--- + drivers/gpu/drm/vc4/vc4_kms.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_kms.c +@@ -286,13 +286,14 @@ static void vc5_hvs_pv_muxing_commit(str + for_each_new_crtc_in_state(state, crtc, crtc_state, i) { + struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state); + struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); ++ unsigned int channel = vc4_state->assigned_channel; + + if (!vc4_state->update_muxing) + continue; + + switch (vc4_crtc->data->hvs_output) { + case 2: +- mux = (vc4_state->assigned_channel == 2) ? 0 : 1; ++ mux = (channel == 2) ? 0 : 1; + reg = HVS_READ(SCALER_DISPECTRL); + HVS_WRITE(SCALER_DISPECTRL, + (reg & ~SCALER_DISPECTRL_DSP2_MUX_MASK) | +@@ -300,10 +301,10 @@ static void vc5_hvs_pv_muxing_commit(str + break; + + case 3: +- if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED) ++ if (channel == VC4_HVS_CHANNEL_DISABLED) + mux = 3; + else +- mux = vc4_state->assigned_channel; ++ mux = channel; + + reg = HVS_READ(SCALER_DISPCTRL); + HVS_WRITE(SCALER_DISPCTRL, +@@ -312,10 +313,10 @@ static void vc5_hvs_pv_muxing_commit(str + break; + + case 4: +- if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED) ++ if (channel == VC4_HVS_CHANNEL_DISABLED) + mux = 3; + else +- mux = vc4_state->assigned_channel; ++ mux = channel; + + reg = HVS_READ(SCALER_DISPEOLN); + HVS_WRITE(SCALER_DISPEOLN, +@@ -325,10 +326,10 @@ static void vc5_hvs_pv_muxing_commit(str + break; + + case 5: +- if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED) ++ if (channel == VC4_HVS_CHANNEL_DISABLED) + mux = 3; + else +- mux = vc4_state->assigned_channel; ++ mux = channel; + + reg = HVS_READ(SCALER_DISPDITHER); + HVS_WRITE(SCALER_DISPDITHER, |