Commit 9b498efa authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: store noretry parameter per driver instance 



This will allow us to have different defaults per asic
in a future patch.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2fbb84ff

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

+7 −0
Original line number Diff line number Diff line
@@ -581,6 +581,13 @@ uint32_t amdgpu_amdkfd_get_asic_rev_id(struct kgd_dev *kgd) 
	return adev->rev_id;

}



int amdgpu_amdkfd_get_noretry(struct kgd_dev *kgd)

{

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



	return adev->gmc.noretry;

}



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)

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

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ uint64_t amdgpu_amdkfd_get_unique_id(struct kgd_dev *kgd); 
uint64_t amdgpu_amdkfd_get_mmio_remap_phys_addr(struct kgd_dev *kgd);

uint32_t amdgpu_amdkfd_get_num_gws(struct kgd_dev *kgd);

uint32_t amdgpu_amdkfd_get_asic_rev_id(struct kgd_dev *kgd);

int amdgpu_amdkfd_get_noretry(struct kgd_dev *kgd);

uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct kgd_dev *dst, struct kgd_dev *src);



/* Read user wptr from a specified user address space with page fault

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

+2 −0
Original line number Diff line number Diff line
@@ -1265,6 +1265,8 @@ static int amdgpu_device_check_arguments(struct amdgpu_device *adev) 
		dev_warn(adev->dev, "set kernel compute queue number to 8 due to invalid parameter provided by user\n");

	}



	amdgpu_gmc_noretry_set(adev);



	return 0;

}

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

+14 −0
Original line number Diff line number Diff line
@@ -413,6 +413,20 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev) 
	}

}



/**

 * amdgpu_noretry_set -- set per asic noretry defaults

 * @adev: amdgpu_device pointer

 *

 * Set a per asic default for the no-retry parameter.

 *

 */

void amdgpu_gmc_noretry_set(struct amdgpu_device *adev)

{

	struct amdgpu_gmc *gmc = &adev->gmc;



	gmc->noretry = amdgpu_noretry;

}



void amdgpu_gmc_set_vm_fault_masks(struct amdgpu_device *adev, int hub_type,

				   bool enable)

{

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

+2 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ struct amdgpu_gmc { 


	struct amdgpu_xgmi xgmi;

	struct amdgpu_irq_src	ecc_irq;

	int noretry;

};



#define amdgpu_gmc_flush_gpu_tlb(adev, vmid, vmhub, type) ((adev)->gmc.gmc_funcs->flush_gpu_tlb((adev), (vmid), (vmhub), (type)))
@@ -300,6 +301,7 @@ void amdgpu_gmc_ras_fini(struct amdgpu_device *adev); 
int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_device *adev);



extern void amdgpu_gmc_tmz_set(struct amdgpu_device *adev);

extern void amdgpu_gmc_noretry_set(struct amdgpu_device *adev);



extern void

amdgpu_gmc_set_vm_fault_masks(struct amdgpu_device *adev, int hub_type,

CRA Git | Maintained and supported by SUSTech CRA and CCSE