From: Konrad Dybcio <[email protected]>
adreno_load_gpu() calls the GPU's debugfs_init hook for both the
primary and the render minor. Since the DRM debugfs rework both minors
share one debugfs root, so every file the hook creates is created
twice, and the second attempt fails with "already exists".
Since the DRM debugfs rework:(commit 0b30d57acafc ("drm/debugfs: rework
debugfs directory creation v5")) both minors share one root, and
commit e76e7ec8f162 ("drm/debugfs: drop debugfs_init() for the render
and accel node v2") made the core call a driver's debugfs_init only for
the primary minor. Adreno's second call predates that: commit
331dc0bc195b ("drm/msm: add a5xx specific debugfs") added it in 2017,
when each minor had its own debugfs root and the render node needed its
own copy of the files.
Remove the odd call to fix 'already exists' warnings.
Signed-off-by: Konrad Dybcio <[email protected]>
---
drivers/gpu/drm/msm/adreno/adreno_device.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c
b/drivers/gpu/drm/msm/adreno/adreno_device.c
index 7108d4aa59b5..8154371e04eb 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_device.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_device.c
@@ -123,10 +123,8 @@ struct msm_gpu *adreno_load_gpu(struct drm_device *dev)
pm_runtime_put_autosuspend(&pdev->dev);
#ifdef CONFIG_DEBUG_FS
- if (gpu->funcs->debugfs_init) {
+ if (gpu->funcs->debugfs_init)
gpu->funcs->debugfs_init(gpu, dev->primary);
- gpu->funcs->debugfs_init(gpu, dev->render);
- }
#endif
return gpu;
--
2.56.0
