drm/amdgpu: add common gmc_ras_fini function (2adf1344) · Commits · 戴 / test

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

+26 −0

Original line number	Diff line number	Diff line
		@@ -306,3 +306,29 @@ bool amdgpu_gmc_filter_faults(struct amdgpu_device *adev, uint64_t addr,
		gmc->fault_hash[hash].idx = gmc->last_fault++;
		return false;
		}

		void amdgpu_gmc_ras_fini(struct amdgpu_device *adev)
		{
		if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC) &&
		adev->umc.ras_if) {
		struct ras_common_if *ras_if = adev->umc.ras_if;
		struct ras_ih_if ih_info = {
		.head = *ras_if,
		.cb = amdgpu_umc_process_ras_data_cb,
		};

		amdgpu_ras_late_fini(adev, ras_if, &ih_info);
		kfree(ras_if);
		}

		if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&
		adev->mmhub.ras_if) {
		struct ras_common_if *ras_if = adev->mmhub.ras_if;
		struct ras_ih_if ih_info = {
		.cb = NULL,
		};

		amdgpu_ras_late_fini(adev, ras_if, &ih_info);
		kfree(ras_if);
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -233,5 +233,6 @@ void amdgpu_gmc_agp_location(struct amdgpu_device *adev,
		struct amdgpu_gmc *mc);
		bool amdgpu_gmc_filter_faults(struct amdgpu_device *adev, uint64_t addr,
		uint16_t pasid, uint64_t timestamp);
		void amdgpu_gmc_ras_fini(struct amdgpu_device *adev);

		#endif

+1 −27

Original line number	Diff line number	Diff line
		@@ -1108,33 +1108,7 @@ static int gmc_v9_0_sw_fini(void *handle)
		struct amdgpu_device adev = (struct amdgpu_device )handle;
		void *stolen_vga_buf;

		if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC) &&
		adev->umc.ras_if) {
		struct ras_common_if *ras_if = adev->umc.ras_if;
		struct ras_ih_if ih_info = {
		.head = *ras_if,
		};

		/* remove fs first */
		amdgpu_ras_debugfs_remove(adev, ras_if);
		amdgpu_ras_sysfs_remove(adev, ras_if);
		/* remove the IH */
		amdgpu_ras_interrupt_remove_handler(adev, &ih_info);
		amdgpu_ras_feature_enable(adev, ras_if, 0);
		kfree(ras_if);
		}

		if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&
		adev->mmhub.ras_if) {
		struct ras_common_if *ras_if = adev->mmhub.ras_if;

		/* remove fs and disable ras feature */
		amdgpu_ras_debugfs_remove(adev, ras_if);
		amdgpu_ras_sysfs_remove(adev, ras_if);
		amdgpu_ras_feature_enable(adev, ras_if, 0);
		kfree(ras_if);
		}

		amdgpu_gmc_ras_fini(adev);
		amdgpu_gem_force_release(adev);
		amdgpu_vm_manager_fini(adev);