Commit dd0ae064 authored by Graham Sider's avatar Graham Sider Committed by Alex Deucher
Browse files

drm/amdkfd: convert KFD_IS_SOC to IP version checking 



Defined as GC HWIP >= IP_VERSION(9, 0, 1).

Also defines KFD_GC_VERSION to return GC HWIP version.

Signed-off-by: default avatarGraham Sider <Graham.Sider@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 73729a7d

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

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p, 
	/* Return gpu_id as doorbell offset for mmap usage */

	args->doorbell_offset = KFD_MMAP_TYPE_DOORBELL;

	args->doorbell_offset |= KFD_MMAP_GPU_ID(args->gpu_id);

	if (KFD_IS_SOC15(dev->device_info->asic_family))

	if (KFD_IS_SOC15(dev))

		/* On SOC15 ASICs, include the doorbell offset within the

		 * process doorbell frame, which is 2 pages.

		 */

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

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int allocate_doorbell(struct qcm_process_device *qpd, struct queue *q) 
{

	struct kfd_dev *dev = qpd->dqm->dev;



	if (!KFD_IS_SOC15(dev->device_info->asic_family)) {

	if (!KFD_IS_SOC15(dev)) {

		/* On pre-SOC15 chips we need to use the queue ID to

		 * preserve the user mode ABI.

		 */
@@ -202,7 +202,7 @@ static void deallocate_doorbell(struct qcm_process_device *qpd, 
	unsigned int old;

	struct kfd_dev *dev = qpd->dqm->dev;



	if (!KFD_IS_SOC15(dev->device_info->asic_family) ||

	if (!KFD_IS_SOC15(dev) ||

	    q->properties.type == KFD_QUEUE_TYPE_SDMA ||

	    q->properties.type == KFD_QUEUE_TYPE_SDMA_XGMI)

		return;

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -183,7 +183,8 @@ enum cache_policy { 
	cache_policy_noncoherent

};



#define KFD_IS_SOC15(chip) ((chip) >= CHIP_VEGA10)

#define KFD_GC_VERSION(dev) ((dev)->adev->ip_versions[GC_HWIP][0])

#define KFD_IS_SOC15(dev)   ((KFD_GC_VERSION(dev)) >= (IP_VERSION(9, 0, 1)))



struct kfd_event_interrupt_class {

	bool (*interrupt_isr)(struct kfd_dev *dev,

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

+1 −1
Original line number Diff line number Diff line
@@ -1431,7 +1431,7 @@ static int init_doorbell_bitmap(struct qcm_process_device *qpd, 
	int range_start = dev->shared_resources.non_cp_doorbells_start;

	int range_end = dev->shared_resources.non_cp_doorbells_end;



	if (!KFD_IS_SOC15(dev->device_info->asic_family))

	if (!KFD_IS_SOC15(dev))

		return 0;



	qpd->doorbell_bitmap =