aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorJordan Crouse <jcrouse@codeaurora.org>2018-10-05 16:06:05 -0400
committerRob Clark <robdclark@gmail.com>2018-10-07 14:40:28 -0400
commit3ce36b4542b585ed0231b175aee31020b2f289c2 (patch)
treeba668153bf621f4d505b931281bb259c08c6fc76 /drivers/gpu/drm
parent82e223a5d854e1f19f46a1a1ad3fae311f337c9a (diff)
drm/msm/a6xx: Remove CP perfcounter selects from the protected list
The CP performance counter selects were accidentally marked as protected so they couldn't be written from PM4 streams. Remove the protection because user space does have an interest in setting up their own counters. Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org> Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/msm/adreno/a6xx_gpu.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index e4ac95f20ca7..cdc3d59a659d 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -440,10 +440,8 @@ static int a6xx_hw_init(struct msm_gpu *gpu)
440 gpu_write(gpu, REG_A6XX_CP_PROTECT(22), A6XX_PROTECT_RW(0x900, 0x4d)); 440 gpu_write(gpu, REG_A6XX_CP_PROTECT(22), A6XX_PROTECT_RW(0x900, 0x4d));
441 gpu_write(gpu, REG_A6XX_CP_PROTECT(23), A6XX_PROTECT_RW(0x98d, 0x76)); 441 gpu_write(gpu, REG_A6XX_CP_PROTECT(23), A6XX_PROTECT_RW(0x98d, 0x76));
442 gpu_write(gpu, REG_A6XX_CP_PROTECT(24), 442 gpu_write(gpu, REG_A6XX_CP_PROTECT(24),
443 A6XX_PROTECT_RDONLY(0x8d0, 0x23));
444 gpu_write(gpu, REG_A6XX_CP_PROTECT(25),
445 A6XX_PROTECT_RDONLY(0x980, 0x4)); 443 A6XX_PROTECT_RDONLY(0x980, 0x4));
446 gpu_write(gpu, REG_A6XX_CP_PROTECT(26), A6XX_PROTECT_RW(0xa630, 0x0)); 444 gpu_write(gpu, REG_A6XX_CP_PROTECT(25), A6XX_PROTECT_RW(0xa630, 0x0));
447 445
448 /* Enable interrupts */ 446 /* Enable interrupts */
449 gpu_write(gpu, REG_A6XX_RBBM_INT_0_MASK, A6XX_INT_MASK); 447 gpu_write(gpu, REG_A6XX_RBBM_INT_0_MASK, A6XX_INT_MASK);