Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6867e1b5 authored by Monk Liu's avatar Monk Liu Committed by Alex Deucher
Browse files

drm/amdgpu:fix vf_error_put 



1,it should not work on non-SR-IOV case
2,the NO_VBIOS error is incorrect, should
handle it under detect_sriov_bios.
3,wrap the whole detect_sriov_bios with sriov check

Signed-off-by: default avatarMonk Liu <Monk.Liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ef4c166d

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

+11 −10
Original line number Diff line number Diff line
@@ -2032,6 +2032,7 @@ static int amdgpu_resume(struct amdgpu_device *adev) 


static void amdgpu_device_detect_sriov_bios(struct amdgpu_device *adev)

{

	if (amdgpu_sriov_vf(adev)) {

		if (adev->is_atom_fw) {

			if (amdgpu_atomfirmware_gpu_supports_virtualization(adev))

				adev->virt.caps |= AMDGPU_SRIOV_CAPS_SRIOV_VBIOS;
@@ -2039,6 +2040,10 @@ static void amdgpu_device_detect_sriov_bios(struct amdgpu_device *adev) 
			if (amdgpu_atombios_has_gpu_virtualization_table(adev))

				adev->virt.caps |= AMDGPU_SRIOV_CAPS_SRIOV_VBIOS;

		}



		if (!(adev->virt.caps & AMDGPU_SRIOV_CAPS_SRIOV_VBIOS))

			amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_NO_VBIOS, 0, 0);

	}

}



/**
@@ -2207,7 +2212,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	if (amdgpu_need_post(adev)) {

		if (!adev->bios) {

			dev_err(adev->dev, "no vBIOS found\n");

			amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_NO_VBIOS, 0, 0);

			r = -EINVAL;

			goto failed;

		}
@@ -2215,7 +2219,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
		r = amdgpu_atom_asic_init(adev->mode_info.atom_context);

		if (r) {

			dev_err(adev->dev, "gpu post error!\n");

			amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_GPU_POST_ERROR, 0, 0);

			goto failed;

		}

	} else {
@@ -3019,7 +3022,6 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) 
		}

	} else {

		dev_err(adev->dev, "asic resume failed (%d).\n", r);

		amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_ASIC_RESUME_FAIL, 0, r);

		for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {

			if (adev->rings[i] && adev->rings[i]->sched.thread) {

				kthread_unpark(adev->rings[i]->sched.thread);
@@ -3033,7 +3035,6 @@ int amdgpu_gpu_reset(struct amdgpu_device *adev) 
	if (r) {

		/* bad news, how to tell it to userspace ? */

		dev_info(adev->dev, "GPU reset failed\n");

		amdgpu_vf_error_put(adev, AMDGIM_ERROR_VF_GPU_RESET_FAIL, 0, r);

	}

	else {

		dev_info(adev->dev, "GPU reset successed!\n");

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

+6 −1
Original line number Diff line number Diff line
@@ -31,7 +31,12 @@ void amdgpu_vf_error_put(struct amdgpu_device *adev, 
			 uint64_t error_data)

{

	int index;

	uint16_t error_code = AMDGIM_ERROR_CODE(AMDGIM_ERROR_CATEGORY_VF, sub_error_code);

	uint16_t error_code;



	if (!amdgpu_sriov_vf(adev))

		return;



	error_code = AMDGIM_ERROR_CODE(AMDGIM_ERROR_CATEGORY_VF, sub_error_code);



	mutex_lock(&adev->virt.vf_errors.lock);

	index = adev->virt.vf_errors.write_count % AMDGPU_VF_ERROR_ENTRY_SIZE;