linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/msm/a6xx: fix for kernels without CONFIG_NVMEM
@ 2021-02-16 20:09 Jonathan Marek
  2021-02-17  3:06 ` Rob Clark
  0 siblings, 1 reply; 16+ messages in thread
From: Jonathan Marek @ 2021-02-16 20:09 UTC (permalink / raw)
  To: freedreno
  Cc: Rob Clark, Sean Paul, David Airlie, Daniel Vetter, Jordan Crouse,
	Sai Prakash Ranjan, Eric Anholt, Akhil P Oommen, Sharat Masetty,
	open list:DRM DRIVER FOR MSM ADRENO GPU,
	open list:DRM DRIVER FOR MSM ADRENO GPU, open list

Ignore nvmem_cell_get() EOPNOTSUPP error in the same way as a ENOENT error,
to fix the case where the kernel was compiled without CONFIG_NVMEM.

Fixes: fe7952c629da ("drm/msm: Add speed-bin support to a618 gpu")
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
---
 drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index ba8e9d3cf0fe..7fe5d97606aa 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -1356,10 +1356,10 @@ static int a6xx_set_supported_hw(struct device *dev, struct a6xx_gpu *a6xx_gpu,
 
 	cell = nvmem_cell_get(dev, "speed_bin");
 	/*
-	 * -ENOENT means that the platform doesn't support speedbin which is
-	 * fine
+	 * -ENOENT means no speed bin in device tree,
+	 * -EOPNOTSUPP means kernel was built without CONFIG_NVMEM
 	 */
-	if (PTR_ERR(cell) == -ENOENT)
+	if (PTR_ERR(cell) == -ENOENT || PTR_ERR(cell) == -EOPNOTSUPP)
 		return 0;
 	else if (IS_ERR(cell)) {
 		DRM_DEV_ERROR(dev,
-- 
2.26.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2021-04-03  4:40 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-16 20:09 [PATCH] drm/msm/a6xx: fix for kernels without CONFIG_NVMEM Jonathan Marek
2021-02-17  3:06 ` Rob Clark
2021-02-17 13:44   ` Akhil P Oommen
2021-02-17 19:08     ` Jordan Crouse
2021-02-17 20:18       ` Rob Clark
2021-02-17 20:35         ` Jonathan Marek
2021-02-18 12:28           ` Akhil P Oommen
2021-02-18 16:11             ` Rob Clark
2021-02-19 10:44               ` Akhil P Oommen
2021-02-19 16:00                 ` Rob Clark
2021-02-22 15:45                   ` Akhil P Oommen
2021-02-22 16:06                     ` Rob Clark
2021-04-01 20:12                       ` Rob Clark
2021-04-01 21:03                         ` Dmitry Baryshkov
2021-04-01 21:49                           ` Rob Clark
2021-04-03  4:39                             ` Akhil P Oommen

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).