* [PATCH] drm/msm/a6xx: No zap shader is not an error
@ 2019-05-08 13:06 Rob Clark
2019-05-08 14:35 ` Sean Paul
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Rob Clark @ 2019-05-08 13:06 UTC (permalink / raw)
To: dri-devel
Cc: Rob Clark, Rob Clark, Sean Paul, David Airlie, Daniel Vetter,
Jordan Crouse, Sharat Masetty, linux-arm-msm, freedreno,
linux-kernel
From: Rob Clark <robdclark@chromium.org>
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@chromium.org>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/msm/a6xx: No zap shader is not an error
2019-05-08 13:06 [PATCH] drm/msm/a6xx: No zap shader is not an error Rob Clark
@ 2019-05-08 14:35 ` Sean Paul
2019-05-08 15:29 ` Jordan Crouse
2019-05-08 20:27 ` Sean Paul
2 siblings, 0 replies; 4+ messages in thread
From: Sean Paul @ 2019-05-08 14:35 UTC (permalink / raw)
To: Rob Clark
Cc: dri-devel, Rob Clark, Sean Paul, David Airlie, Daniel Vetter,
Jordan Crouse, Sharat Masetty, linux-arm-msm, freedreno,
linux-kernel
On Wed, May 08, 2019 at 06:06:52AM -0700, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> 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@chromium.org>
Reviewed-by: Sean Paul <sean@poorly.run>
> ---
> 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
>
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/msm/a6xx: No zap shader is not an error
2019-05-08 13:06 [PATCH] drm/msm/a6xx: No zap shader is not an error Rob Clark
2019-05-08 14:35 ` Sean Paul
@ 2019-05-08 15:29 ` Jordan Crouse
2019-05-08 20:27 ` Sean Paul
2 siblings, 0 replies; 4+ messages in thread
From: Jordan Crouse @ 2019-05-08 15:29 UTC (permalink / raw)
To: Rob Clark
Cc: dri-devel, Rob Clark, Sean Paul, David Airlie, Daniel Vetter,
Sharat Masetty, linux-arm-msm, freedreno, linux-kernel
On Wed, May 08, 2019 at 06:06:52AM -0700, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> 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@chromium.org>
Woo, I'm glad we finally got a chance to verify this on both types of systems.
Acked-by: Jordan Crouse <jcrouse@codeaurora.org>
> ---
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/msm/a6xx: No zap shader is not an error
2019-05-08 13:06 [PATCH] drm/msm/a6xx: No zap shader is not an error Rob Clark
2019-05-08 14:35 ` Sean Paul
2019-05-08 15:29 ` Jordan Crouse
@ 2019-05-08 20:27 ` Sean Paul
2 siblings, 0 replies; 4+ messages in thread
From: Sean Paul @ 2019-05-08 20:27 UTC (permalink / raw)
To: Rob Clark
Cc: dri-devel, Rob Clark, Sean Paul, David Airlie, Daniel Vetter,
Jordan Crouse, Sharat Masetty, linux-arm-msm, freedreno,
linux-kernel
On Wed, May 08, 2019 at 06:06:52AM -0700, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> 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@chromium.org>
As discussed on IRC, I've stuffed this in -misc-next-fixes for the next PR I'm
sending out.
Sean
> ---
> 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
>
--
Sean Paul, Software Engineer, Google / Chromium OS
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-08 20:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-08 13:06 [PATCH] drm/msm/a6xx: No zap shader is not an error Rob Clark
2019-05-08 14:35 ` Sean Paul
2019-05-08 15:29 ` Jordan Crouse
2019-05-08 20:27 ` Sean Paul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).