Commit fe8f5b2f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.2-2022-12-21' of... 

Merge tag 'amd-drm-fixes-6.2-2022-12-21' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-fixes-6.2-2022-12-21:

amdgpu:
- Avoid large variable on the stack
- S0ix fixes
- SMU 13.x fixes
- VCN fix
- Add missing fence reference

amdkfd:
- Fix init vm error handling
- Fix double release of compute pasid

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221221205828.6093-1-alexander.deucher@amd.com
parents 38624d2c c1c4a8b2

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

+3 −1
Original line number Diff line number Diff line
@@ -270,8 +270,10 @@ int amdgpu_amdkfd_get_pcie_bandwidth_mbytes(struct amdgpu_device *adev, bool is_ 
	(&((struct amdgpu_fpriv *)					\

		((struct drm_file *)(drm_priv))->driver_priv)->vm)



int amdgpu_amdkfd_gpuvm_set_vm_pasid(struct amdgpu_device *adev,

				     struct file *filp, u32 pasid);

int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct amdgpu_device *adev,

					struct file *filp, u32 pasid,

					struct file *filp,

					void **process_info,

					struct dma_fence **ef);

void amdgpu_amdkfd_gpuvm_release_process_vm(struct amdgpu_device *adev,

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

+28 −11
Original line number Diff line number Diff line
@@ -1429,10 +1429,9 @@ static void amdgpu_amdkfd_gpuvm_unpin_bo(struct amdgpu_bo *bo) 
	amdgpu_bo_unreserve(bo);

}



int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct amdgpu_device *adev,

					   struct file *filp, u32 pasid,

					   void **process_info,

					   struct dma_fence **ef)

int amdgpu_amdkfd_gpuvm_set_vm_pasid(struct amdgpu_device *adev,

				     struct file *filp, u32 pasid)



{

	struct amdgpu_fpriv *drv_priv;

	struct amdgpu_vm *avm;
@@ -1443,10 +1442,6 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct amdgpu_device *adev, 
		return ret;

	avm = &drv_priv->vm;



	/* Already a compute VM? */

	if (avm->process_info)

		return -EINVAL;



	/* Free the original amdgpu allocated pasid,

	 * will be replaced with kfd allocated pasid.

	 */
@@ -1455,14 +1450,36 @@ int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct amdgpu_device *adev, 
		amdgpu_vm_set_pasid(adev, avm, 0);

	}



	/* Convert VM into a compute VM */

	ret = amdgpu_vm_make_compute(adev, avm);

	ret = amdgpu_vm_set_pasid(adev, avm, pasid);

	if (ret)

		return ret;



	ret = amdgpu_vm_set_pasid(adev, avm, pasid);

	return 0;

}



int amdgpu_amdkfd_gpuvm_acquire_process_vm(struct amdgpu_device *adev,

					   struct file *filp,

					   void **process_info,

					   struct dma_fence **ef)

{

	struct amdgpu_fpriv *drv_priv;

	struct amdgpu_vm *avm;

	int ret;



	ret = amdgpu_file_to_fpriv(filp, &drv_priv);

	if (ret)

		return ret;

	avm = &drv_priv->vm;



	/* Already a compute VM? */

	if (avm->process_info)

		return -EINVAL;



	/* Convert VM into a compute VM */

	ret = amdgpu_vm_make_compute(adev, avm);

	if (ret)

		return ret;



	/* Initialize KFD part of the VM and process info */

	ret = init_kfd_vm(avm, process_info, ef);

	if (ret)

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

+3 −2
Original line number Diff line number Diff line
@@ -3016,14 +3016,15 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) 
			continue;

		}



		/* skip suspend of gfx and psp for S0ix

		/* skip suspend of gfx/mes and psp for S0ix

		 * gfx is in gfxoff state, so on resume it will exit gfxoff just

		 * like at runtime. PSP is also part of the always on hardware

		 * so no need to suspend it.

		 */

		if (adev->in_s0ix &&

		    (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP ||

		     adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX))

		     adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GFX ||

		     adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_MES))

			continue;



		/* XXX handle errors */

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

+2 −0
Original line number Diff line number Diff line
@@ -238,8 +238,10 @@ static int amdgpu_vm_sdma_update(struct amdgpu_vm_update_params *p, 
	/* Wait for PD/PT moves to be completed */

	dma_resv_iter_begin(&cursor, bo->tbo.base.resv, DMA_RESV_USAGE_KERNEL);

	dma_resv_for_each_fence_unlocked(&cursor, fence) {

		dma_fence_get(fence);

		r = drm_sched_job_add_dependency(&p->job->base, fence);

		if (r) {

			dma_fence_put(fence);

			dma_resv_iter_end(&cursor);

			return r;

		}

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

+2 −1
Original line number Diff line number Diff line
@@ -1342,7 +1342,8 @@ static int mes_v11_0_late_init(void *handle) 
{

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



	if (!amdgpu_in_reset(adev) &&

	/* it's only intended for use in mes_self_test case, not for s0ix and reset */

	if (!amdgpu_in_reset(adev) && !adev->in_s0ix &&

	    (adev->ip_versions[GC_HWIP][0] != IP_VERSION(11, 0, 3)))

		amdgpu_mes_self_test(adev);