| Message ID | 20240517195021.8873-1-robdclark@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | drm/msm/adreno: Check for zap node availability | expand |
On Fri, May 17, 2024 at 12:50:19PM -0700, Rob Clark wrote: > From: Rob Clark <robdclark@chromium.org> > > This should allow disabling the zap node via an overlay, for slbounce. > > Suggested-by: Nikita Travkin <nikita@trvn.ru> > Signed-off-by: Rob Clark <robdclark@chromium.org> > --- > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Fri, May 17, 2024 at 12:50:19PM -0700, Rob Clark wrote: > From: Rob Clark <robdclark@chromium.org> > > This should allow disabling the zap node via an overlay, for slbounce. > > Suggested-by: Nikita Travkin <nikita@trvn.ru> > Signed-off-by: Rob Clark <robdclark@chromium.org> > --- > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > index d9ea15994ae9..a00241e3373b 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > @@ -46,7 +46,7 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, > } > > np = of_get_child_by_name(dev->of_node, "zap-shader"); > - if (!np) { > + if (!np || !of_device_is_available(np)) { if (!of_device_is_available(np)) { would cover both cases and be slightly cleaner imho... But this looks reasonable either way. Reviewed-by: Bjorn Andersson <quic_bjorande@quicinc.com> Regards, Bjorn > zap_available = false; > return -ENODEV; > } > -- > 2.45.1 >
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index d9ea15994ae9..a00241e3373b 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -46,7 +46,7 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, } np = of_get_child_by_name(dev->of_node, "zap-shader"); - if (!np) { + if (!np || !of_device_is_available(np)) { zap_available = false; return -ENODEV; }