提交 d090e7db 编写于 作者: A Alex Deucher

drm/amdgpu/display: move debugfs init into core amdgpu debugfs (v2)

In order to remove the load and unload drm callbacks,
we need to reorder the init sequence to move all the drm
debugfs file handling.  Do this for display.

v2: add config guard for DC
Tested-by: NThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Harry Wentland <harry.wentland@amd.com> (v1)
Acked-by: Christian König <christian.koenig@amd.com> (v1)
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
上级 40748929
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "amdgpu.h" #include "amdgpu.h"
#include "amdgpu_pm.h" #include "amdgpu_pm.h"
#include "amdgpu_dm_debugfs.h"
/** /**
* amdgpu_debugfs_add_files - Add simple debugfs entries * amdgpu_debugfs_add_files - Add simple debugfs entries
...@@ -1316,6 +1317,13 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev) ...@@ -1316,6 +1317,13 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev)
if (r) if (r)
DRM_ERROR("registering firmware debugfs failed (%d).\n", r); DRM_ERROR("registering firmware debugfs failed (%d).\n", r);
#if defined(CONFIG_DRM_AMD_DC)
if (amdgpu_device_has_dc_support(adev)) {
if (dtn_debugfs_init(adev))
DRM_ERROR("amdgpu: failed initialize dtn debugfs support.\n");
}
#endif
for (i = 0; i < AMDGPU_MAX_RINGS; ++i) { for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
struct amdgpu_ring *ring = adev->rings[i]; struct amdgpu_ring *ring = adev->rings[i];
......
...@@ -1008,11 +1008,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) ...@@ -1008,11 +1008,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
goto error; goto error;
} }
#if defined(CONFIG_DEBUG_FS)
if (dtn_debugfs_init(adev))
DRM_ERROR("amdgpu: failed initialize dtn debugfs support.\n");
#endif
DRM_DEBUG_DRIVER("KMS initialized.\n"); DRM_DEBUG_DRIVER("KMS initialized.\n");
return 0; return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册