Commit e5cba164 authored by Le Ma's avatar Le Ma Committed by Liu Chuang
Browse files

drm/amdgpu: move the drm client creation behind drm device registration 

mainline inclusion
from mainline-v6.8-rc3
commit c0125b848abecfbc944bebe2cab076f09455b230
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9TM7F
CVE: CVE-2024-36022

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c0125b848abecfbc944bebe2cab076f09455b230



--------------------------------

This patch is to eliminate interrupt warning below:

  "[drm] Fence fallback timer expired on ring sdma0.0".

An early vm pt clearing job is sent to SDMA ahead of interrupt enabled.
And re-locating the drm client creation following after drm_dev_register
looks like a more proper flow.

v2: wrap the drm client creation

Fixes: 1819200166ce ("drm/amdkfd: Export DMABufs from KFD using GEM handles")
Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarLiu Chuang <liuchuang40@huawei.com>
parent 55010a71

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

+21 −11
Original line number Diff line number Diff line
@@ -140,11 +140,31 @@ static void amdgpu_amdkfd_reset_work(struct work_struct *work) 
static const struct drm_client_funcs kfd_client_funcs = {

	.unregister	= drm_client_release,

};



int amdgpu_amdkfd_drm_client_create(struct amdgpu_device *adev)

{

	int ret;



	if (!adev->kfd.init_complete)

		return 0;



	ret = drm_client_init(&adev->ddev, &adev->kfd.client, "kfd",

			      &kfd_client_funcs);

	if (ret) {

		dev_err(adev->dev, "Failed to init DRM client: %d\n",

			ret);

		return ret;

	}



	drm_client_register(&adev->kfd.client);



	return 0;

}



void amdgpu_amdkfd_device_init(struct amdgpu_device *adev)

{

	int i;

	int last_valid_bit;

	int ret;



	amdgpu_amdkfd_gpuvm_init_mem_limits();
@@ -163,12 +183,6 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 
			.enable_mes = adev->enable_mes,

		};



		ret = drm_client_init(&adev->ddev, &adev->kfd.client, "kfd", &kfd_client_funcs);

		if (ret) {

			dev_err(adev->dev, "Failed to init DRM client: %d\n", ret);

			return;

		}



		/* this is going to have a few of the MSBs set that we need to

		 * clear

		 */
@@ -207,10 +221,6 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 


		adev->kfd.init_complete = kgd2kfd_device_init(adev->kfd.dev,

							&gpu_resources);

		if (adev->kfd.init_complete)

			drm_client_register(&adev->kfd.client);

		else

			drm_client_release(&adev->kfd.client);



		amdgpu_amdkfd_total_mem_size += adev->gmc.real_vram_size;

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

+2 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ int amdgpu_queue_mask_bit_to_set_resource_bit(struct amdgpu_device *adev, 
struct amdgpu_amdkfd_fence *amdgpu_amdkfd_fence_create(u64 context,

				struct mm_struct *mm,

				struct svm_range_bo *svm_bo);



int amdgpu_amdkfd_drm_client_create(struct amdgpu_device *adev);

#if defined(CONFIG_DEBUG_FS)

int kfd_debugfs_kfd_mem_limits(struct seq_file *m, void *data);

#endif

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

+4 −0
Original line number Diff line number Diff line
@@ -2161,6 +2161,10 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, 
	if (ret)

		goto err_pci;



	ret = amdgpu_amdkfd_drm_client_create(adev);

	if (ret)

		goto err_pci;



	/*

	 * 1. don't init fbdev on hw without DCE

	 * 2. don't init fbdev if there are no connectors