Commit 5b983db8 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdkfd: clean up parameters in kgd2kfd_probe 



We can get the pdev and asic type from the adev.  No need
to pass them explicitly.

v2: squash in build fix for !CONFIG_HSA_AMD from Anson

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6d46d419

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

+1 −2
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev) 
	if (!kfd_initialized)

		return;



	adev->kfd.dev = kgd2kfd_probe((struct kgd_dev *)adev,

				      adev->pdev, adev->asic_type, vf);

	adev->kfd.dev = kgd2kfd_probe((struct kgd_dev *)adev, vf);



	if (adev->kfd.dev)

		amdgpu_amdkfd_total_mem_size += adev->gmc.real_vram_size;

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

+2 −4
Original line number Diff line number Diff line
@@ -322,8 +322,7 @@ int kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm, 
#if IS_ENABLED(CONFIG_HSA_AMD)

int kgd2kfd_init(void);

void kgd2kfd_exit(void);

struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, struct pci_dev *pdev,

			      unsigned int asic_type, bool vf);

struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, bool vf);

bool kgd2kfd_device_init(struct kfd_dev *kfd,

			 struct drm_device *ddev,

			 const struct kgd2kfd_shared_resources *gpu_resources);
@@ -347,8 +346,7 @@ static inline void kgd2kfd_exit(void) 
}



static inline

struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, struct pci_dev *pdev,

					unsigned int asic_type, bool vf)

struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, bool vf)

{

	return NULL;

}

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

+5 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "amdgpu_amdkfd.h"

#include "kfd_smi_events.h"

#include "kfd_migrate.h"

#include "amdgpu.h"



#define MQD_SIZE_ALIGNED 768
@@ -691,12 +692,14 @@ static void kfd_gtt_sa_fini(struct kfd_dev *kfd); 


static int kfd_resume(struct kfd_dev *kfd);



struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd,

	struct pci_dev *pdev, unsigned int asic_type, bool vf)

struct kfd_dev *kgd2kfd_probe(struct kgd_dev *kgd, bool vf)

{

	struct kfd_dev *kfd;

	const struct kfd_device_info *device_info;

	const struct kfd2kgd_calls *f2g;

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

	unsigned int asic_type = adev->asic_type;

	struct pci_dev *pdev = adev->pdev;



	if (asic_type >= sizeof(kfd_supported_devices) / (sizeof(void *) * 2)

		|| asic_type >= sizeof(kfd2kgd_funcs) / sizeof(void *)) {