On Wed, May 08, 2019 at 06:06:52AM -0700, Rob Clark wrote: > From: Rob Clark <robdclark@xxxxxxxxxxxx> > > 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. > > Fixes: abccb9fe3267 drm/msm/a6xx: Add zap shader load > Signed-off-by: Rob Clark <robdclark@xxxxxxxxxxxx> Woo, I'm glad we finally got a chance to verify this on both types of systems. Acked-by: Jordan Crouse <jcrouse@xxxxxxxxxxxxxx> > --- > drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > index ec24508b9d68..e74dce474250 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > @@ -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: > -- > 2.20.1 > -- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
