drm/amdgpu/sa: move debugfs init into core amdgpu debugfs (15997544) · Commits · 戴 / test

drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1297,6 +1297,10 @@ int amdgpu_debugfs_init(struct amdgpu_device *adev)
		return r;
		}

		if (amdgpu_debugfs_sa_init(adev)) {
		dev_err(adev->dev, "failed to register debugfs file for SA\n");
		}

		return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_list,
		ARRAY_SIZE(amdgpu_debugfs_list));
		}

+2 −5

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@
		* produce command buffers which are send to the kernel and
		* put in IBs for execution by the requested ring.
		*/
		static int amdgpu_debugfs_sa_init(struct amdgpu_device *adev);

		/**
		* amdgpu_ib_get - request an IB (Indirect Buffer)
		@@ -295,9 +294,7 @@ int amdgpu_ib_pool_init(struct amdgpu_device *adev)
		}

		adev->ib_pool_ready = true;
		if (amdgpu_debugfs_sa_init(adev)) {
		dev_err(adev->dev, "failed to register debugfs file for SA\n");
		}

		return 0;
		}

		@@ -421,7 +418,7 @@ static const struct drm_info_list amdgpu_debugfs_sa_list[] = {

		#endif

		static int amdgpu_debugfs_sa_init(struct amdgpu_device *adev)
		int amdgpu_debugfs_sa_init(struct amdgpu_device *adev)
		{
		#if defined(CONFIG_DEBUG_FS)
		return amdgpu_debugfs_add_files(adev, amdgpu_debugfs_sa_list, 1);

+1 −0

Original line number	Diff line number	Diff line
		@@ -319,6 +319,7 @@ void amdgpu_sa_bo_free(struct amdgpu_device *adev,
		void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
		struct seq_file *m);
		#endif
		int amdgpu_debugfs_sa_init(struct amdgpu_device *adev);

		bool amdgpu_bo_support_uswc(u64 bo_flags);