Commit aabf3a95 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdkfd: remove duplicated PCIE atomics request 



Since amdgpu has always requested PCIE atomics, kfd don't
need duplicated PCIE atomics enablement. Referring to amdgpu
request result is enough.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b2109d8e

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

+7 −0
Original line number Diff line number Diff line
@@ -668,6 +668,13 @@ bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid) 
	return false;

}



bool amdgpu_amdkfd_have_atomics_support(struct kgd_dev *kgd)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;



	return adev->have_atomics_support;

}



#ifndef CONFIG_HSA_AMD

bool amdkfd_fence_check_mm(struct dma_fence *f, struct mm_struct *mm)

{

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine, 
				uint32_t vmid, uint64_t gpu_addr,

				uint32_t *ib_cmd, uint32_t ib_len);

void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle);

bool amdgpu_amdkfd_have_atomics_support(struct kgd_dev *kgd);



struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions(void);

struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions(void);

drivers/gpu/drm/amd/amdkfd/kfd_device.c

+4 −6
Original line number Diff line number Diff line
@@ -504,17 +504,15 @@ struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, 
	 * 32 and 64-bit requests are possible and must be

	 * supported.

	 */

	ret = pci_enable_atomic_ops_to_root(pdev,

			PCI_EXP_DEVCAP2_ATOMIC_COMP32 |

			PCI_EXP_DEVCAP2_ATOMIC_COMP64);

	if (device_info->needs_pci_atomics && ret < 0) {

	kfd->pci_atomic_requested = amdgpu_amdkfd_have_atomics_support(kgd);

	if (device_info->needs_pci_atomics &&

	    !kfd->pci_atomic_requested) {

		dev_info(kfd_device,

			 "skipped device %x:%x, PCI rejects atomics\n",

			 pdev->vendor, pdev->device);

		kfree(kfd);

		return NULL;

	} else if (!ret)

		kfd->pci_atomic_requested = true;

	}



	kfd->kgd = kgd;

	kfd->device_info = device_info;

CRA Git | Maintained and supported by SUSTech CRA and CCSE