Skip to contentSkip to conversation

drm/msm: handle for EPROBE_DEFER for of_icc_get

PATCH Superseded Jonathan Marek 2 participants 4 messages Jul 1, 2020

Subsystems (4)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/msm: handle for EPROBE_DEFER for of_icc_get

Check for EPROBE_DEFER instead of silently not using icc if the msm driver probes before the interconnect driver.

Only check for EPROBE_DEFER because of_icc_get can return other errors that we want to ignore (ENODATA).

Remove the WARN_ON in msm_gpu_cleanup because INIT_LIST_HEAD won't have been called on the list yet when going through the defer error path.

---
 drivers/gpu/drm/msm/adreno/adreno_gpu.c | 17 ++++++++++++++---
 drivers/gpu/drm/msm/msm_gpu.c           |  2 --
 2 files changed, 14 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +14 -3
index 89673c7ed473..393c00425d68 100644
@@ -940,12 +940,20 @@ static int adreno_get_pwrlevels(struct device *dev,
 		 */
 		gpu->icc_path = of_icc_get(dev, NULL);
 	}
-	if (IS_ERR(gpu->icc_path))
+	if (IS_ERR(gpu->icc_path)) {
+		ret = PTR_ERR(gpu->icc_path);
 		gpu->icc_path = NULL;
+		if (ret == -EPROBE_DEFER)
+			return ret;
+	}
 
 	gpu->ocmem_icc_path = of_icc_get(dev, "ocmem");
-	if (IS_ERR(gpu->ocmem_icc_path))
+	if (IS_ERR(gpu->ocmem_icc_path)) {
+		ret = PTR_ERR(gpu->ocmem_icc_path);
 		gpu->ocmem_icc_path = NULL;
+		if (ret == -EPROBE_DEFER)
+			return ret;
+	}
 
 	return 0;
 }
@@ -996,6 +1004,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
 	struct adreno_platform_config *config = pdev->dev.platform_data;
 	struct msm_gpu_config adreno_gpu_config  = { 0 };
 	struct msm_gpu *gpu = &adreno_gpu->base;
+	int ret;
 
 	adreno_gpu->funcs = funcs;
 	adreno_gpu->info = adreno_info(config->rev);
@@ -1007,7 +1016,9 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
 
 	adreno_gpu_config.nr_rings = nr_rings;
 
-	adreno_get_pwrlevels(&pdev->dev, gpu);
+	ret = adreno_get_pwrlevels(&pdev->dev, gpu);
+	if (ret)
+		return ret;
 
 	pm_runtime_set_autosuspend_delay(&pdev->dev,
 		adreno_gpu->info->inactive_period);
drivers/gpu/drm/msm/msm_gpu.c +0 -2
index a22d30622306..ccf9a0dd9706 100644
@@ -959,8 +959,6 @@ void msm_gpu_cleanup(struct msm_gpu *gpu)
 
 	DBG("%s", gpu->name);
 
-	WARN_ON(!list_empty(&gpu->active_list));
-
 	for (i = 0; i < ARRAY_SIZE(gpu->rb); i++) {
 		msm_ringbuffer_destroy(gpu->rb[i]);
 		gpu->rb[i] = NULL;
Signature · 1 line
2.26.1
#1 lore raw

Hi Jonathan,

Quoted 2 lines · Jonathan Marek

Check for EPROBE_DEFER instead of silently not using icc if the msm driver probes before the interconnect driver.

Agreed with supporting deferred ICC probing.

Quoted 2 lines

Only check for EPROBE_DEFER because of_icc_get can return other errors that we want to ignore (ENODATA).

What would be the -ENODATA case?

If the 'interconnects' property is not specified of_icc_get() returns NULL, shouldn't all (or most) errors be propagated rather than staying silent?

Thanks

Matthias
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
Quoted 6 lines · Matthias Kaehlcke

Hi Jonathan,

Quoted 2 lines · Jonathan Marek

Check for EPROBE_DEFER instead of silently not using icc if the msm driver probes before the interconnect driver.

Quoted 7 lines

Agreed with supporting deferred ICC probing.

Quoted 2 lines

Only check for EPROBE_DEFER because of_icc_get can return other errors that we want to ignore (ENODATA).

What would be the -ENODATA case?

The of_icc_get for the ocmem_icc_path can return -ENODATA when the ocmem path is not specified (it is optional and only relevant for a3xx/a4xx).

Quoted 7 lines

If the 'interconnects' property is not specified of_icc_get() returns NULL, shouldn't all (or most) errors be propagated rather than staying silent?

Thanks

Matthias

#3 lore raw
Quoted 9 lines · Jonathan Marek
Quoted 8 lines · Matthias Kaehlcke

Hi Jonathan,

Quoted 2 lines · Jonathan Marek

Check for EPROBE_DEFER instead of silently not using icc if the msm driver probes before the interconnect driver.

Agreed with supporting deferred ICC probing.

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Only check for EPROBE_DEFER because of_icc_get can return other errors that we want to ignore (ENODATA).

What would be the -ENODATA case?

The of_icc_get for the ocmem_icc_path can return -ENODATA when the ocmem path is not specified (it is optional and only relevant for a3xx/a4xx).

Thanks for the clarification!

In this case it seems reasonable to me to return any error for the 'gfx-mem' path and all errors except -ENODATA for 'ocmem'.