drm/msm/a6xx: No zap shader is not an error
Subsystems (4)
PATCH 1/1 drm/msm/a6xx: No zap shader is not an error
From: Rob Clark <[email protected]>
Depending on platform firmware, a zap shader may not be required to take the GPU out of secure mode on boot, in which case we can just write RBBM_SECVID_TRUST_CNTL directly. Which we *mostly* handled, but missed clearing 'ret' resulting that hw_init() returned an error on these devices.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1 -0
@@ -527,6 +527,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu)dev_warn_once (gpu->dev->dev,"Zap shader not enabled - using SECVID_TRUST_CNTL instead\n" );gpu_write (gpu,REG_A6XX_RBBM_SECVID_TRUST_CNTL ,0x0 ); + ret =0 ; } out:
Signature · 6 lines
2.20.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Quoted 10 lines · Rob Clark
From: Rob Clark <[email protected]>
Depending on platform firmware, a zap shader may not be required to take the GPU out of secure mode on boot, in which case we can just write
RBBM_SECVID_TRUST_CNTLdirectly. Which we *mostly* handled, but missed clearing 'ret' resulting thathw_init()returned an error on these devices.Fixes abccb9fe3267 drm/msm/a6xx: Add zap shader loadSigned-off-by Rob Clark <[email protected]>
Quoted 19 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1
-0@@ -527,6 +527,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu)dev_warn_once (gpu->dev->dev,"Zap shader not enabled - using SECVID_TRUST_CNTL instead\n" );gpu_write (gpu,REG_A6XX_RBBM_SECVID_TRUST_CNTL ,0x0 ); + ret =0 ; } out:Signature · 1 line
2.20.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Quoted 10 lines · Rob Clark
From: Rob Clark <[email protected]>
Depending on platform firmware, a zap shader may not be required to take the GPU out of secure mode on boot, in which case we can just write
RBBM_SECVID_TRUST_CNTLdirectly. Which we *mostly* handled, but missed clearing 'ret' resulting thathw_init()returned an error on these devices.Fixes abccb9fe3267 drm/msm/a6xx: Add zap shader loadSigned-off-by Rob Clark <[email protected]>
Woo, I'm glad we finally got a chance to verify this on both types of systems.
Quoted 19 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1
-0@@ -527,6 +527,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu)dev_warn_once (gpu->dev->dev,"Zap shader not enabled - using SECVID_TRUST_CNTL instead\n" );gpu_write (gpu,REG_A6XX_RBBM_SECVID_TRUST_CNTL ,0x0 ); + ret =0 ; } out:Signature · 1 line
2.20.1
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Sean Paul
reviewerQuoted 10 lines · Rob Clark
From: Rob Clark <[email protected]>
Depending on platform firmware, a zap shader may not be required to take the GPU out of secure mode on boot, in which case we can just write
RBBM_SECVID_TRUST_CNTLdirectly. Which we *mostly* handled, but missed clearing 'ret' resulting thathw_init()returned an error on these devices.Fixes abccb9fe3267 drm/msm/a6xx: Add zap shader loadSigned-off-by Rob Clark <[email protected]>
As discussed on IRC, I've stuffed this in -misc-next-fixes for the next PR I'm sending out.
Sean
Quoted 19 lines
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 1 + 1 file changed, 1 insertion(+)drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1
-0@@ -527,6 +527,7 @@ static int a6xx_hw_init(struct msm_gpu *gpu)dev_warn_once (gpu->dev->dev,"Zap shader not enabled - using SECVID_TRUST_CNTL instead\n" );gpu_write (gpu,REG_A6XX_RBBM_SECVID_TRUST_CNTL ,0x0 ); + ret =0 ; } out:Signature · 1 line
2.20.1
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS