mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 00:11:13 +00:00
71 lines
2.2 KiB
Diff
71 lines
2.2 KiB
Diff
|
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,
|