8f9e91ad03
These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.12.y With the following command: git format-patch -N v6.12.27..HEAD (HEAD -> 8d3206ee456a5ecdf9ddbfd8e5e231e4f0cd716e) Exceptions: - (def)configs patches - github workflows patches - applied & reverted patches - readme patches - wireless patches Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
122 lines
2.8 KiB
Diff
122 lines
2.8 KiB
Diff
From 1a590854f9ca6871e3a873816c1c6722b3050e4b Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <mripard@kernel.org>
|
|
Date: Fri, 21 Jun 2024 16:20:46 +0100
|
|
Subject: [PATCH] drm/vc4: hvs: Use switch statement to simplify
|
|
vc4_hvs_get_fifo_from_output
|
|
|
|
Since we'll support BCM2712 soon, let's move the logic behind
|
|
vc4_hvs_get_fifo_from_output() to a switch to extend it more easily.
|
|
|
|
Signed-off-by: Maxime Ripard <mripard@kernel.org>
|
|
Reviewed-by: Maxime Ripard <mripard@kernel.org>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20240621152055.4180873-23-dave.stevenson@raspberrypi.com
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hvs.c | 77 +++++++++++++++++++----------------
|
|
1 file changed, 42 insertions(+), 35 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hvs.c
|
|
@@ -297,53 +297,60 @@ int vc4_hvs_get_fifo_from_output(struct
|
|
u32 reg;
|
|
int ret;
|
|
|
|
- if (vc4->gen == VC4_GEN_4)
|
|
+ switch (vc4->gen) {
|
|
+ case VC4_GEN_4:
|
|
return output;
|
|
|
|
- /*
|
|
- * NOTE: We should probably use drm_dev_enter()/drm_dev_exit()
|
|
- * here, but this function is only used during the DRM device
|
|
- * initialization, so we should be fine.
|
|
- */
|
|
-
|
|
- switch (output) {
|
|
- case 0:
|
|
- return 0;
|
|
-
|
|
- case 1:
|
|
- return 1;
|
|
-
|
|
- case 2:
|
|
- reg = HVS_READ(SCALER_DISPECTRL);
|
|
- ret = FIELD_GET(SCALER_DISPECTRL_DSP2_MUX_MASK, reg);
|
|
- if (ret == 0)
|
|
- return 2;
|
|
-
|
|
- return 0;
|
|
-
|
|
- case 3:
|
|
- reg = HVS_READ(SCALER_DISPCTRL);
|
|
- ret = FIELD_GET(SCALER_DISPCTRL_DSP3_MUX_MASK, reg);
|
|
- if (ret == 3)
|
|
- return -EPIPE;
|
|
+ case VC4_GEN_5:
|
|
+ /*
|
|
+ * NOTE: We should probably use
|
|
+ * drm_dev_enter()/drm_dev_exit() here, but this
|
|
+ * function is only used during the DRM device
|
|
+ * initialization, so we should be fine.
|
|
+ */
|
|
+
|
|
+ switch (output) {
|
|
+ case 0:
|
|
+ return 0;
|
|
+
|
|
+ case 1:
|
|
+ return 1;
|
|
+
|
|
+ case 2:
|
|
+ reg = HVS_READ(SCALER_DISPECTRL);
|
|
+ ret = FIELD_GET(SCALER_DISPECTRL_DSP2_MUX_MASK, reg);
|
|
+ if (ret == 0)
|
|
+ return 2;
|
|
+
|
|
+ return 0;
|
|
+
|
|
+ case 3:
|
|
+ reg = HVS_READ(SCALER_DISPCTRL);
|
|
+ ret = FIELD_GET(SCALER_DISPCTRL_DSP3_MUX_MASK, reg);
|
|
+ if (ret == 3)
|
|
+ return -EPIPE;
|
|
+
|
|
+ return ret;
|
|
+
|
|
+ case 4:
|
|
+ reg = HVS_READ(SCALER_DISPEOLN);
|
|
+ ret = FIELD_GET(SCALER_DISPEOLN_DSP4_MUX_MASK, reg);
|
|
+ if (ret == 3)
|
|
+ return -EPIPE;
|
|
+
|
|
+ return ret;
|
|
+
|
|
+ case 5:
|
|
+ reg = HVS_READ(SCALER_DISPDITHER);
|
|
+ ret = FIELD_GET(SCALER_DISPDITHER_DSP5_MUX_MASK, reg);
|
|
+ if (ret == 3)
|
|
+ return -EPIPE;
|
|
|
|
- return ret;
|
|
+ return ret;
|
|
|
|
- case 4:
|
|
- reg = HVS_READ(SCALER_DISPEOLN);
|
|
- ret = FIELD_GET(SCALER_DISPEOLN_DSP4_MUX_MASK, reg);
|
|
- if (ret == 3)
|
|
+ default:
|
|
return -EPIPE;
|
|
-
|
|
- return ret;
|
|
-
|
|
- case 5:
|
|
- reg = HVS_READ(SCALER_DISPDITHER);
|
|
- ret = FIELD_GET(SCALER_DISPDITHER_DSP5_MUX_MASK, reg);
|
|
- if (ret == 3)
|
|
- return -EPIPE;
|
|
-
|
|
- return ret;
|
|
+ }
|
|
|
|
default:
|
|
return -EPIPE;
|