* [PATCH] drm/msm: Fix removal of valid error case when checking speed_bin
@ 2021-03-30 1:34 John Stultz
2021-03-30 3:36 ` Akhil P Oommen
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: John Stultz @ 2021-03-30 1:34 UTC (permalink / raw)
To: lkml
Cc: John Stultz, Rob Clark, Sean Paul, Jordan Crouse, Eric Anholt,
Douglas Anderson, linux-arm-msm, freedreno, Bjorn Andersson,
YongQin Liu
Commit 7bf168c8fe8c ("drm/msm: Fix speed-bin support not to
access outside valid memory"), reworked the nvmem reading of
"speed_bin", but in doing so dropped handling of the -ENOENT
case which was previously documented as "fine".
That change resulted in the db845c board display to fail to
start, with the following error:
adreno 5000000.gpu: [drm:a6xx_gpu_init] *ERROR* failed to read speed-bin (-2). Some OPPs may not be supported by hardware
Thus, this patch simply re-adds the ENOENT handling so the lack
of the speed_bin entry isn't fatal for display, and gets things
working on db845c.
Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: Jordan Crouse <jcrouse@codeaurora.org>
Cc: Eric Anholt <eric@anholt.net>
Cc: Douglas Anderson <dianders@chromium.org>
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: YongQin Liu <yongqin.liu@linaro.org>
Reported-by: YongQin Liu <yongqin.liu@linaro.org>
Fixes: 7bf168c8fe8c ("drm/msm: Fix speed-bin support not to access outside valid memory")
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index 690409ca8a186..cb2df8736ca85 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -1406,7 +1406,13 @@ static int a6xx_set_supported_hw(struct device *dev, struct a6xx_gpu *a6xx_gpu,
int ret;
ret = nvmem_cell_read_u16(dev, "speed_bin", &speedbin);
- if (ret) {
+ /*
+ * -ENOENT means that the platform doesn't support speedbin which is
+ * fine
+ */
+ if (ret == -ENOENT) {
+ return 0;
+ } else if (ret) {
DRM_DEV_ERROR(dev,
"failed to read speed-bin (%d). Some OPPs may not be supported by hardware",
ret);
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/msm: Fix removal of valid error case when checking speed_bin
2021-03-30 1:34 [PATCH] drm/msm: Fix removal of valid error case when checking speed_bin John Stultz
@ 2021-03-30 3:36 ` Akhil P Oommen
2021-03-30 15:14 ` Doug Anderson
2021-04-05 17:21 ` John Stultz
2 siblings, 0 replies; 4+ messages in thread
From: Akhil P Oommen @ 2021-03-30 3:36 UTC (permalink / raw)
To: John Stultz, lkml
Cc: Rob Clark, Sean Paul, Jordan Crouse, Eric Anholt,
Douglas Anderson, linux-arm-msm, freedreno, Bjorn Andersson,
YongQin Liu
On 3/30/2021 7:04 AM, John Stultz wrote:
> Commit 7bf168c8fe8c ("drm/msm: Fix speed-bin support not to
> access outside valid memory"), reworked the nvmem reading of
> "speed_bin", but in doing so dropped handling of the -ENOENT
> case which was previously documented as "fine".
>
> That change resulted in the db845c board display to fail to
> start, with the following error:
>
> adreno 5000000.gpu: [drm:a6xx_gpu_init] *ERROR* failed to read speed-bin (-2). Some OPPs may not be supported by hardware
>
> Thus, this patch simply re-adds the ENOENT handling so the lack
> of the speed_bin entry isn't fatal for display, and gets things
> working on db845c.
>
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Sean Paul <sean@poorly.run>
> Cc: Jordan Crouse <jcrouse@codeaurora.org>
> Cc: Eric Anholt <eric@anholt.net>
> Cc: Douglas Anderson <dianders@chromium.org>
> Cc: linux-arm-msm@vger.kernel.org
> Cc: freedreno@lists.freedesktop.org
> Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
> Cc: YongQin Liu <yongqin.liu@linaro.org>
> Reported-by: YongQin Liu <yongqin.liu@linaro.org>
> Fixes: 7bf168c8fe8c ("drm/msm: Fix speed-bin support not to access outside valid memory")
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
> drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> index 690409ca8a186..cb2df8736ca85 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> @@ -1406,7 +1406,13 @@ static int a6xx_set_supported_hw(struct device *dev, struct a6xx_gpu *a6xx_gpu,
> int ret;
>
> ret = nvmem_cell_read_u16(dev, "speed_bin", &speedbin);
> - if (ret) {
> + /*
> + * -ENOENT means that the platform doesn't support speedbin which is
> + * fine
> + */
> + if (ret == -ENOENT) {
> + return 0;
> + } else if (ret) {
> DRM_DEV_ERROR(dev,
> "failed to read speed-bin (%d). Some OPPs may not be supported by hardware",
> ret);
>
Reviewed-by: Akhil P Oommen <akhilpo@codeaurora.org>
This looks "fine" to me. ;)
-Akhil.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/msm: Fix removal of valid error case when checking speed_bin
2021-03-30 1:34 [PATCH] drm/msm: Fix removal of valid error case when checking speed_bin John Stultz
2021-03-30 3:36 ` Akhil P Oommen
@ 2021-03-30 15:14 ` Doug Anderson
2021-04-05 17:21 ` John Stultz
2 siblings, 0 replies; 4+ messages in thread
From: Doug Anderson @ 2021-03-30 15:14 UTC (permalink / raw)
To: John Stultz
Cc: lkml, Rob Clark, Sean Paul, Jordan Crouse, Eric Anholt,
linux-arm-msm, freedreno, Bjorn Andersson, YongQin Liu
Hi,
On Mon, Mar 29, 2021 at 6:34 PM John Stultz <john.stultz@linaro.org> wrote:
>
> Commit 7bf168c8fe8c ("drm/msm: Fix speed-bin support not to
> access outside valid memory"), reworked the nvmem reading of
> "speed_bin", but in doing so dropped handling of the -ENOENT
> case which was previously documented as "fine".
>
> That change resulted in the db845c board display to fail to
> start, with the following error:
>
> adreno 5000000.gpu: [drm:a6xx_gpu_init] *ERROR* failed to read speed-bin (-2). Some OPPs may not be supported by hardware
>
> Thus, this patch simply re-adds the ENOENT handling so the lack
> of the speed_bin entry isn't fatal for display, and gets things
> working on db845c.
>
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Sean Paul <sean@poorly.run>
> Cc: Jordan Crouse <jcrouse@codeaurora.org>
> Cc: Eric Anholt <eric@anholt.net>
> Cc: Douglas Anderson <dianders@chromium.org>
> Cc: linux-arm-msm@vger.kernel.org
> Cc: freedreno@lists.freedesktop.org
> Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
> Cc: YongQin Liu <yongqin.liu@linaro.org>
> Reported-by: YongQin Liu <yongqin.liu@linaro.org>
> Fixes: 7bf168c8fe8c ("drm/msm: Fix speed-bin support not to access outside valid memory")
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
> drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
Reviewed-by: Douglas Anderson <dianders@chromium.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/msm: Fix removal of valid error case when checking speed_bin
2021-03-30 1:34 [PATCH] drm/msm: Fix removal of valid error case when checking speed_bin John Stultz
2021-03-30 3:36 ` Akhil P Oommen
2021-03-30 15:14 ` Doug Anderson
@ 2021-04-05 17:21 ` John Stultz
2 siblings, 0 replies; 4+ messages in thread
From: John Stultz @ 2021-04-05 17:21 UTC (permalink / raw)
To: lkml
Cc: Rob Clark, Sean Paul, Jordan Crouse, Eric Anholt,
Douglas Anderson, linux-arm-msm, freedreno, Bjorn Andersson,
YongQin Liu
On Mon, Mar 29, 2021 at 6:34 PM John Stultz <john.stultz@linaro.org> wrote:
>
> Commit 7bf168c8fe8c ("drm/msm: Fix speed-bin support not to
> access outside valid memory"), reworked the nvmem reading of
> "speed_bin", but in doing so dropped handling of the -ENOENT
> case which was previously documented as "fine".
>
> That change resulted in the db845c board display to fail to
> start, with the following error:
>
> adreno 5000000.gpu: [drm:a6xx_gpu_init] *ERROR* failed to read speed-bin (-2). Some OPPs may not be supported by hardware
>
> Thus, this patch simply re-adds the ENOENT handling so the lack
> of the speed_bin entry isn't fatal for display, and gets things
> working on db845c.
Hey Folks,
Just wanted to re-ping you on this, as it resolves a regression
introduced in 5.12-rc5 and I'm not yet seeing this in -next. Would be
nice to have this in place before 5.12 final.
thanks
-john
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-05 17:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-30 1:34 [PATCH] drm/msm: Fix removal of valid error case when checking speed_bin John Stultz
2021-03-30 3:36 ` Akhil P Oommen
2021-03-30 15:14 ` Doug Anderson
2021-04-05 17:21 ` John Stultz
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).