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

drm/amdkfd: replace trivial funcs with direct access 



These get funcs simply return an adev field. Replace funcs/calls with
direct field accesses instead.

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

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

+0 −30
Original line number Diff line number Diff line
@@ -521,16 +521,6 @@ uint64_t amdgpu_amdkfd_get_vram_usage(struct amdgpu_device *adev) 
	return amdgpu_vram_mgr_usage(vram_man);

}



uint64_t amdgpu_amdkfd_get_hive_id(struct amdgpu_device *adev)

{

	return adev->gmc.xgmi.hive_id;

}



uint64_t amdgpu_amdkfd_get_unique_id(struct amdgpu_device *adev)

{

	return adev->unique_id;

}



uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct amdgpu_device *dst,

					  struct amdgpu_device *src)

{
@@ -630,26 +620,6 @@ int amdgpu_amdkfd_get_pcie_bandwidth_mbytes(struct amdgpu_device *adev, bool is_ 
	return (num_lanes_factor * gen_speed_mbits_factor)/BITS_PER_BYTE;

}



uint64_t amdgpu_amdkfd_get_mmio_remap_phys_addr(struct amdgpu_device *adev)

{

	return adev->rmmio_remap.bus_addr;

}



uint32_t amdgpu_amdkfd_get_num_gws(struct amdgpu_device *adev)

{

	return adev->gds.gws_size;

}



uint32_t amdgpu_amdkfd_get_asic_rev_id(struct amdgpu_device *adev)

{

	return adev->rev_id;

}



int amdgpu_amdkfd_get_noretry(struct amdgpu_device *adev)

{

	return adev->gmc.noretry;

}



int amdgpu_amdkfd_submit_ib(struct amdgpu_device *adev,

				enum kgd_engine_type engine,

				uint32_t vmid, uint64_t gpu_addr,

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

+0 −6
Original line number Diff line number Diff line
@@ -224,12 +224,6 @@ int amdgpu_amdkfd_get_dmabuf_info(struct amdgpu_device *adev, int dma_buf_fd, 
				  size_t buffer_size, uint32_t *metadata_size,

				  uint32_t *flags);

uint64_t amdgpu_amdkfd_get_vram_usage(struct amdgpu_device *adev);

uint64_t amdgpu_amdkfd_get_hive_id(struct amdgpu_device *adev);

uint64_t amdgpu_amdkfd_get_unique_id(struct amdgpu_device *adev);

uint64_t amdgpu_amdkfd_get_mmio_remap_phys_addr(struct amdgpu_device *adev);

uint32_t amdgpu_amdkfd_get_num_gws(struct amdgpu_device *adev);

uint32_t amdgpu_amdkfd_get_asic_rev_id(struct amdgpu_device *adev);

int amdgpu_amdkfd_get_noretry(struct amdgpu_device *adev);

uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct amdgpu_device *dst,

					  struct amdgpu_device *src);

int amdgpu_amdkfd_get_xgmi_bandwidth_mbytes(struct amdgpu_device *dst,

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

+2 −2
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ static int kfd_ioctl_alloc_memory_of_gpu(struct file *filep, 
			err = -EINVAL;

			goto err_unlock;

		}

		offset = amdgpu_amdkfd_get_mmio_remap_phys_addr(dev->adev);

		offset = dev->adev->rmmio_remap.bus_addr;

		if (!offset) {

			err = -ENOMEM;

			goto err_unlock;
@@ -2066,7 +2066,7 @@ static int kfd_mmio_mmap(struct kfd_dev *dev, struct kfd_process *process, 
	if (vma->vm_end - vma->vm_start != PAGE_SIZE)

		return -EINVAL;



	address = amdgpu_amdkfd_get_mmio_remap_phys_addr(dev->adev);

	address = dev->adev->rmmio_remap.bus_addr;



	vma->vm_flags |= VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_NORESERVE |

				VM_DONTDUMP | VM_PFNMAP;

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

+4 −4
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ static int kfd_gws_init(struct kfd_dev *kfd) 
		|| (kfd->device_info->asic_family == CHIP_ALDEBARAN

			&& kfd->mec2_fw_version >= 0x28))

		ret = amdgpu_amdkfd_alloc_gws(kfd->adev,

				amdgpu_amdkfd_get_num_gws(kfd->adev), &kfd->gws);

				kfd->adev->gds.gws_size, &kfd->gws);



	return ret;

}
@@ -994,9 +994,9 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
		goto kfd_doorbell_error;

	}



	kfd->hive_id = amdgpu_amdkfd_get_hive_id(kfd->adev);

	kfd->hive_id = kfd->adev->gmc.xgmi.hive_id;



	kfd->noretry = amdgpu_amdkfd_get_noretry(kfd->adev);

	kfd->noretry = kfd->adev->gmc.noretry;



	if (kfd_interrupt_init(kfd)) {

		dev_err(kfd_device, "Error initializing interrupts\n");
@@ -1014,7 +1014,7 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
	 */

	if (kfd_gws_init(kfd)) {

		dev_err(kfd_device, "Could not allocate %d gws\n",

			amdgpu_amdkfd_get_num_gws(kfd->adev));

			kfd->adev->gds.gws_size);

		goto gws_error;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ int pqm_set_gws(struct process_queue_manager *pqm, unsigned int qid, 
		return ret;



	pqn->q->gws = mem;

	pdd->qpd.num_gws = gws ? amdgpu_amdkfd_get_num_gws(dev->adev) : 0;

	pdd->qpd.num_gws = gws ? dev->adev->gds.gws_size : 0;



	return pqn->q->device->dqm->ops.update_queue(pqn->q->device->dqm,

							pqn->q, NULL);