From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: Re: [PATCH] drm/msm/a6xx: No zap shader is not an error Date: Wed, 8 May 2019 16:27:21 -0400 Message-ID: <20190508202721.GL17077@art_vandelay> References: <20190508130726.27557-1-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20190508130726.27557-1-robdclark@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: Rob Clark Cc: dri-devel@lists.freedesktop.org, Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Sharat Masetty , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org On Wed, May 08, 2019 at 06:06:52AM -0700, Rob Clark wrote: > From: Rob Clark > > 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 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