The protected register table was taken from the msm-3.4 downstream
driver. Update it to the ranges of the msm-3.10 kgsl driver, keeping the
wider 0x100-0x13f RBBM range and also covering the VBIF QoS and AXI
registers at 0x3040-0x305f that the driver programs.

Fixes: 7198e6b03155 ("drm/msm: add a3xx gpu support")
Signed-off-by: Dmitry Baryshkov <[email protected]>
---
 drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c 
b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
index 7e03b7305493..1de4277ebf9a 100644
--- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
@@ -288,25 +288,28 @@ static int a3xx_hw_init(struct msm_gpu *gpu)
        gpu_write(gpu, REG_A3XX_CP_PROTECT_CTRL, 0x00000007);
 
        /* RBBM registers */
-       gpu_write(gpu, REG_A3XX_CP_PROTECT(0), 0x63000040);
+       gpu_write(gpu, REG_A3XX_CP_PROTECT(0), 0x60000060);
        gpu_write(gpu, REG_A3XX_CP_PROTECT(1), 0x62000080);
        gpu_write(gpu, REG_A3XX_CP_PROTECT(2), 0x600000cc);
        gpu_write(gpu, REG_A3XX_CP_PROTECT(3), 0x60000108);
        gpu_write(gpu, REG_A3XX_CP_PROTECT(4), 0x64000140);
-       gpu_write(gpu, REG_A3XX_CP_PROTECT(5), 0x66000400);
+       gpu_write(gpu, REG_A3XX_CP_PROTECT(5), 0x6000018c);
+       gpu_write(gpu, REG_A3XX_CP_PROTECT(6), 0x66000400);
 
        /* CP registers */
-       gpu_write(gpu, REG_A3XX_CP_PROTECT(6), 0x65000700);
-       gpu_write(gpu, REG_A3XX_CP_PROTECT(7), 0x610007d8);
-       gpu_write(gpu, REG_A3XX_CP_PROTECT(8), 0x620007e0);
-       gpu_write(gpu, REG_A3XX_CP_PROTECT(9), 0x61001178);
-       gpu_write(gpu, REG_A3XX_CP_PROTECT(10), 0x64001180);
+       gpu_write(gpu, REG_A3XX_CP_PROTECT(7), 0x65000700);
+       gpu_write(gpu, REG_A3XX_CP_PROTECT(8), 0x610007b0);
+       gpu_write(gpu, REG_A3XX_CP_PROTECT(9), 0x610007d8);
+       gpu_write(gpu, REG_A3XX_CP_PROTECT(10), 0x620007e0);
+       gpu_write(gpu, REG_A3XX_CP_PROTECT(11), 0x61001178);
+       gpu_write(gpu, REG_A3XX_CP_PROTECT(12), 0x64001180);
 
        /* RB registers */
-       gpu_write(gpu, REG_A3XX_CP_PROTECT(11), 0x60003300);
+       gpu_write(gpu, REG_A3XX_CP_PROTECT(13), 0x60003300);
 
        /* VBIF registers */
-       gpu_write(gpu, REG_A3XX_CP_PROTECT(12), 0x6b00c000);
+       gpu_write(gpu, REG_A3XX_CP_PROTECT(14), 0x6600c000);
+       gpu_write(gpu, REG_A3XX_CP_PROTECT(15), 0x6500c100);
 
        /* NOTE: PM4/micro-engine firmware registers look to be the same
         * for a2xx and a3xx.. we could possibly push that part down to

-- 
2.47.3

Reply via email to