drm: meson: drv: use macro when initializing vpu

This patch add new macro which is used to set WRARB/RDARB mode of
the VPU.

Signed-off-by: Julien Masson <jmasson@baylibre.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/86v9wv82f1.fsf@baylibre.com

diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 42af49afdd755c82c9ecfe3a39ca87284322675d..ae016618160608136dcb75646152eb41143eed68 100644 (file)
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c
@@ -140,10 +140,28 @@ static struct regmap_config meson_regmap_config = {
 
 static void meson_vpu_init(struct meson_drm *priv)
 {
-       writel_relaxed(0x210000, priv->io_base + _REG(VPU_RDARB_MODE_L1C1));
-       writel_relaxed(0x10000, priv->io_base + _REG(VPU_RDARB_MODE_L1C2));
-       writel_relaxed(0x900000, priv->io_base + _REG(VPU_RDARB_MODE_L2C1));
-       writel_relaxed(0x20000, priv->io_base + _REG(VPU_WRARB_MODE_L2C1));
+       u32 value;
+
+       /*
+        * Slave dc0 and dc5 connected to master port 1.
+        * By default other slaves are connected to master port 0.
+        */
+       value = VPU_RDARB_SLAVE_TO_MASTER_PORT(0, 1) |
+               VPU_RDARB_SLAVE_TO_MASTER_PORT(5, 1);
+       writel_relaxed(value, priv->io_base + _REG(VPU_RDARB_MODE_L1C1));
+
+       /* Slave dc0 connected to master port 1 */
+       value = VPU_RDARB_SLAVE_TO_MASTER_PORT(0, 1);
+       writel_relaxed(value, priv->io_base + _REG(VPU_RDARB_MODE_L1C2));
+
+       /* Slave dc4 and dc7 connected to master port 1 */
+       value = VPU_RDARB_SLAVE_TO_MASTER_PORT(4, 1) |
+               VPU_RDARB_SLAVE_TO_MASTER_PORT(7, 1);
+       writel_relaxed(value, priv->io_base + _REG(VPU_RDARB_MODE_L2C1));
+
+       /* Slave dc1 connected to master port 1 */
+       value = VPU_RDARB_SLAVE_TO_MASTER_PORT(1, 1);
+       writel_relaxed(value, priv->io_base + _REG(VPU_WRARB_MODE_L2C1));
 }
 
 static void meson_remove_framebuffers(void)

diff --git a/drivers/gpu/drm/meson/meson_registers.h b/drivers/gpu/drm/meson/meson_registers.h
index e5e87c2303b7ccd6402444b0fa3bb1c5673f5bd6..dfa693c3f16a6015566c12943d0c54119959ea77 100644 (file)
--- a/drivers/gpu/drm/meson/meson_registers.h
+++ b/drivers/gpu/drm/meson/meson_registers.h
@@ -1488,6 +1488,7 @@
 #define VPU_RDARB_MODE_L1C2 0x2799
 #define VPU_RDARB_MODE_L2C1 0x279d
 #define VPU_WRARB_MODE_L2C1 0x27a2
+#define                VPU_RDARB_SLAVE_TO_MASTER_PORT(dc, port) (port << (16 + dc))
 
 /* osd super scale */
 #define OSDSR_HV_SIZEIN 0x3130