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

Commit ecd7963f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-amdkfd-next-2018-07-28' of git://people.freedesktop.org/~gabbayo/linux into drm-next 



This is amdkfd pull for 4.19. The major changes are:

- Add Raven support. Raven refers to Ryzen APUs with integrated GFXv9 GPU.
- Integrate GPU reset support

In addition, there are a couple of small fixes and improvements, such as:

- Better handling and reporting to user of VM faults
- Fix race upon context restore
- Allow the user to use specific Compute Units
- Basic power management

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180728122306.GA5235@ogabbay-vm
parents 6d52aacd b5aa3f4a

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

+35 −0
Original line number Diff line number Diff line
@@ -243,6 +243,33 @@ int amdgpu_amdkfd_resume(struct amdgpu_device *adev) 
	return r;

}



int amdgpu_amdkfd_pre_reset(struct amdgpu_device *adev)

{

	int r = 0;



	if (adev->kfd)

		r = kgd2kfd->pre_reset(adev->kfd);



	return r;

}



int amdgpu_amdkfd_post_reset(struct amdgpu_device *adev)

{

	int r = 0;



	if (adev->kfd)

		r = kgd2kfd->post_reset(adev->kfd);



	return r;

}



void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd)

{

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



	amdgpu_device_gpu_recover(adev, NULL, false);

}



int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

			void **mem_obj, uint64_t *gpu_addr,

			void **cpu_ptr)
@@ -461,6 +488,14 @@ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine, 
	return ret;

}



void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle)

{

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



	amdgpu_dpm_switch_power_profile(adev,

					PP_SMC_POWER_PROFILE_COMPUTE, !idle);

}



bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid)

{

	if (adev->kfd) {

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

+10 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ int amdgpu_amdkfd_evict_userptr(struct kgd_mem *mem, struct mm_struct *mm); 
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);



struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions(void);

struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions(void);
@@ -126,6 +127,12 @@ struct kfd2kgd_calls *amdgpu_amdkfd_gfx_9_0_get_functions(void); 


bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid);



int amdgpu_amdkfd_pre_reset(struct amdgpu_device *adev);



int amdgpu_amdkfd_post_reset(struct amdgpu_device *adev);



void amdgpu_amdkfd_gpu_reset(struct kgd_dev *kgd);



/* Shared API */

int alloc_gtt_mem(struct kgd_dev *kgd, size_t size,

			void **mem_obj, uint64_t *gpu_addr,
@@ -183,6 +190,9 @@ int amdgpu_amdkfd_gpuvm_map_gtt_bo_to_kernel(struct kgd_dev *kgd, 
int amdgpu_amdkfd_gpuvm_restore_process_bos(void *process_info,

					    struct dma_fence **ef);



int amdgpu_amdkfd_gpuvm_get_vm_fault_info(struct kgd_dev *kgd,

					      struct kfd_vm_fault_info *info);



void amdgpu_amdkfd_gpuvm_init_mem_limits(void);

void amdgpu_amdkfd_unreserve_system_memory_limit(struct amdgpu_bo *bo);

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

+27 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ static void set_vm_context_page_table_base(struct kgd_dev *kgd, uint32_t vmid, 
		uint32_t page_table_base);

static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid);

static int invalidate_tlbs_vmid(struct kgd_dev *kgd, uint16_t vmid);

static uint32_t read_vmid_from_vmfault_reg(struct kgd_dev *kgd);



/* Because of REG_GET_FIELD() being used, we put this function in the

 * asic specific file.
@@ -216,6 +217,10 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.invalidate_tlbs = invalidate_tlbs,

	.invalidate_tlbs_vmid = invalidate_tlbs_vmid,

	.submit_ib = amdgpu_amdkfd_submit_ib,

	.get_vm_fault_info = amdgpu_amdkfd_gpuvm_get_vm_fault_info,

	.read_vmid_from_vmfault_reg = read_vmid_from_vmfault_reg,

	.gpu_recover = amdgpu_amdkfd_gpu_reset,

	.set_compute_idle = amdgpu_amdkfd_set_compute_idle

};



struct kfd2kgd_calls *amdgpu_amdkfd_gfx_7_get_functions(void)
@@ -571,6 +576,9 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd, 
	unsigned long flags, end_jiffies;

	int retry;



	if (adev->in_gpu_reset)

		return -EIO;



	acquire_queue(kgd, pipe_id, queue_id);

	WREG32(mmCP_HQD_PQ_DOORBELL_CONTROL, 0);
@@ -882,6 +890,9 @@ static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid) 
	int vmid;

	unsigned int tmp;



	if (adev->in_gpu_reset)

		return -EIO;



	for (vmid = 0; vmid < 16; vmid++) {

		if (!amdgpu_amdkfd_is_kfd_vmid(adev, vmid))

			continue;
@@ -911,3 +922,19 @@ static int invalidate_tlbs_vmid(struct kgd_dev *kgd, uint16_t vmid) 
	RREG32(mmVM_INVALIDATE_RESPONSE);

	return 0;

}



 /**

  * read_vmid_from_vmfault_reg - read vmid from register

  *

  * adev: amdgpu_device pointer

  * @vmid: vmid pointer

  * read vmid from register (CIK).

  */

static uint32_t read_vmid_from_vmfault_reg(struct kgd_dev *kgd)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);



	uint32_t status = RREG32(mmVM_CONTEXT1_PROTECTION_FAULT_STATUS);



	return REG_GET_FIELD(status, VM_CONTEXT1_PROTECTION_FAULT_STATUS, VMID);

}

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

+9 −0
Original line number Diff line number Diff line
@@ -176,6 +176,9 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.invalidate_tlbs = invalidate_tlbs,

	.invalidate_tlbs_vmid = invalidate_tlbs_vmid,

	.submit_ib = amdgpu_amdkfd_submit_ib,

	.get_vm_fault_info = amdgpu_amdkfd_gpuvm_get_vm_fault_info,

	.gpu_recover = amdgpu_amdkfd_gpu_reset,

	.set_compute_idle = amdgpu_amdkfd_set_compute_idle

};



struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions(void)
@@ -568,6 +571,9 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd, 
	int retry;

	struct vi_mqd *m = get_mqd(mqd);



	if (adev->in_gpu_reset)

		return -EIO;



	acquire_queue(kgd, pipe_id, queue_id);



	if (m->cp_hqd_vmid == 0)
@@ -844,6 +850,9 @@ static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid) 
	int vmid;

	unsigned int tmp;



	if (adev->in_gpu_reset)

		return -EIO;



	for (vmid = 0; vmid < 16; vmid++) {

		if (!amdgpu_amdkfd_is_kfd_vmid(adev, vmid))

			continue;

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

+8 −0
Original line number Diff line number Diff line
@@ -213,6 +213,8 @@ static const struct kfd2kgd_calls kfd2kgd = { 
	.invalidate_tlbs = invalidate_tlbs,

	.invalidate_tlbs_vmid = invalidate_tlbs_vmid,

	.submit_ib = amdgpu_amdkfd_submit_ib,

	.gpu_recover = amdgpu_amdkfd_gpu_reset,

	.set_compute_idle = amdgpu_amdkfd_set_compute_idle

};



struct kfd2kgd_calls *amdgpu_amdkfd_gfx_9_0_get_functions(void)
@@ -679,6 +681,9 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd, 
	uint32_t temp;

	struct v9_mqd *m = get_mqd(mqd);



	if (adev->in_gpu_reset)

		return -EIO;



	acquire_queue(kgd, pipe_id, queue_id);



	if (m->cp_hqd_vmid == 0)
@@ -866,6 +871,9 @@ static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid) 
	int vmid;

	struct amdgpu_ring *ring = &adev->gfx.kiq.ring;



	if (adev->in_gpu_reset)

		return -EIO;



	if (ring->ready)

		return invalidate_tlbs_with_kiq(adev, pasid);