diff options
| author |   Rob Clark <robdclark@chromium.org> | 2019-05-08 06:06:52 -0700 |
|---|---|---|
| committer |   Sean Paul <seanpaul@chromium.org> | 2019-05-08 16:00:54 -0400 |
| commit | 15273ffd7efdf6e9f21c4e4beef6539229167343 (patch) | |
| tree | 7804ecce403c084defa63849bc82add84a9b4ae8 /drivers/gpu/drm/msm/adreno/a6xx_gpu.c | |
| parent | drm/cma-helper: Fix drm_gem_cma_free_object() (diff) | |
| download | linux-dev-15273ffd7efdf6e9f21c4e4beef6539229167343.tar.xz linux-dev-15273ffd7efdf6e9f21c4e4beef6539229167343.zip | |
drm/msm/a6xx: No zap shader is not an error
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")
Acked-by: Jordan Crouse <jcrouse@codeaurora.org>
Reviewed-by: Sean Paul <sean@poorly.run>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190508130726.27557-1-robdclark@gmail.com
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
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: |