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 08/14] drm/amdgpu/firmware: move debugfs init into core amdgpu debugfs
Date: Tue,  4 Feb 2020 22:48:46 -0500	[thread overview]
Message-ID: <20200205034852.4157-9-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 firmware.

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
index 7721f1416cdb..5bf43f20ec30 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
@@ -1256,6 +1256,10 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev)
 	if (r)
 		DRM_ERROR("registering register debugfs failed (%d).\n", r);
 
+	r = amdgpu_debugfs_firmware_init(adev);
+	if (r)
+		DRM_ERROR("registering firmware debugfs failed (%d).\n", r);
+
 	return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_list,
 					ARRAY_SIZE(amdgpu_debugfs_list));
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index d84a61e18bf8..4dc7145368fc 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3091,10 +3091,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
 	} else
 		adev->ucode_sysfs_en = true;
 
-	r = amdgpu_debugfs_firmware_init(adev);
-	if (r)
-		DRM_ERROR("registering firmware debugfs failed (%d).\n", r);
-
 	r = amdgpu_debugfs_init(adev);
 	if (r)
 		DRM_ERROR("Creating debugfs files failed (%d).\n", r);
-- 
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 ` Alex Deucher [this message]
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 ` [PATCH 10/14] drm/amdgpu/display: move debugfs init into core amdgpu debugfs Alex Deucher
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-9-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