AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Deucher <alexdeucher@gmail.com>
To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: Alex Deucher <alexander.deucher@amd.com>
Subject: [PATCH 10/14] drm/amdgpu/display: move debugfs init into core amdgpu debugfs
Date: Tue,  4 Feb 2020 22:48:48 -0500	[thread overview]
Message-ID: <20200205034852.4157-11-alexander.deucher@amd.com> (raw)
In-Reply-To: <20200205034852.4157-1-alexander.deucher@amd.com>

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.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c       | 6 ++++++
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
index 5bf43f20ec30..82d30bae2ba0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
@@ -32,6 +32,7 @@
 
 #include "amdgpu.h"
 #include "amdgpu_pm.h"
+#include "amdgpu_dm_debugfs.h"
 
 /**
  * amdgpu_debugfs_add_files - Add simple debugfs entries
@@ -1260,6 +1261,11 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev)
 	if (r)
 		DRM_ERROR("registering firmware debugfs failed (%d).\n", r);
 
+	if (amdgpu_device_has_dc_support(adev)) {
+		if (dtn_debugfs_init(adev))
+			DRM_ERROR("amdgpu: failed initialize dtn debugfs support.\n");
+	}
+
 	return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_list,
 					ARRAY_SIZE(amdgpu_debugfs_list));
 }
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 7c094bfe07e2..efe74a8a8ace 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -991,11 +991,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
 		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");
 
 	return 0;
-- 
2.24.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

  parent reply	other threads:[~2020-02-05  3:49 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-05  3:48 [PATCH 00/14] amdgpu: remove load and unload callbacks Alex Deucher
2020-02-05  3:48 ` [PATCH 01/14] drm/amdgpu: rename amdgpu_debugfs_preempt_cleanup Alex Deucher
2020-02-05  3:48 ` [PATCH 02/14] drm/amdgpu/ttm: move debugfs init into core amdgpu debugfs Alex Deucher
2020-02-05  3:48 ` [PATCH 03/14] drm/amdgpu/pm: " Alex Deucher
2020-02-05  3:48 ` [PATCH 04/14] drm/amdgpu/sa: " Alex Deucher
2020-02-05  3:48 ` [PATCH 05/14] drm/amdgpu/fence: " Alex Deucher
2020-02-05  3:48 ` [PATCH 06/14] drm/amdgpu/gem: " Alex Deucher
2020-02-05  3:48 ` [PATCH 07/14] drm/amdgpu/regs: " Alex Deucher
2020-02-05  3:48 ` [PATCH 08/14] drm/amdgpu/firmware: " Alex Deucher
2020-02-05  3:48 ` [PATCH 09/14] drm/amdgpu: don't call drm_connector_register for non-MST ports Alex Deucher
2020-02-05  3:48 ` Alex Deucher [this message]
2020-02-05  3:48 ` [PATCH 11/14] drm/amd/display: move dpcd debugfs members setup Alex Deucher
2020-02-05  3:48 ` [PATCH 12/14] drm/amdgpu/display: add a late register connector callback Alex Deucher
2020-02-05  3:48 ` [PATCH 13/14] drm/amdgpu/ring: move debugfs init into core amdgpu debugfs Alex Deucher
2020-02-05  3:48 ` [PATCH 14/14] drm/amdgpu: drop legacy drm load and unload callbacks Alex Deucher
2020-02-05  8:42 ` [PATCH 00/14] amdgpu: remove " Christian König
2020-02-05  9:04 ` Thomas Zimmermann
2020-02-05 14:24 ` Harry Wentland

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200205034852.4157-11-alexander.deucher@amd.com \
    --to=alexdeucher@gmail.com \
    --cc=alexander.deucher@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox