Commit 28801cc8 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.5-2023-07-20' of... 

Merge tag 'amd-drm-fixes-6.5-2023-07-20' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.5-2023-07-20:

amdgpu:
- More PCIe DPM fixes for Intel platforms
- DCN3.0.1 fixes
- Virtual display timer fix
- Async flip fix
- SMU13 clock reporting fixes
- Add missing PSP firmware declaration
- DP MST fix
- DCN3.1.x fixes
- Slab out of bounds fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230720133456.7826-1-alexander.deucher@amd.com
parents 534a7915 b13d3e9c

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

+2 −1
Original line number Diff line number Diff line
@@ -1709,7 +1709,8 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
			alloc_flags |= (flags & KFD_IOC_ALLOC_MEM_FLAGS_PUBLIC) ?

			AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED : 0;

		}

		xcp_id = fpriv->xcp_id == ~0 ? 0 : fpriv->xcp_id;

		xcp_id = fpriv->xcp_id == AMDGPU_XCP_NO_PARTITION ?

					0 : fpriv->xcp_id;

	} else if (flags & KFD_IOC_ALLOC_MEM_FLAGS_GTT) {

		domain = alloc_domain = AMDGPU_GEM_DOMAIN_GTT;

		alloc_flags = 0;

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

+3 −3
Original line number Diff line number Diff line
@@ -1229,13 +1229,13 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
		pasid = 0;

	}



	r = amdgpu_vm_init(adev, &fpriv->vm);

	r = amdgpu_xcp_open_device(adev, fpriv, file_priv);

	if (r)

		goto error_pasid;



	r = amdgpu_xcp_open_device(adev, fpriv, file_priv);

	r = amdgpu_vm_init(adev, &fpriv->vm, fpriv->xcp_id);

	if (r)

		goto error_vm;

		goto error_pasid;



	r = amdgpu_vm_set_pasid(adev, &fpriv->vm, pasid);

	if (r)

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

+1 −1
Original line number Diff line number Diff line
@@ -1382,7 +1382,7 @@ int amdgpu_mes_self_test(struct amdgpu_device *adev) 
		goto error_pasid;

	}



	r = amdgpu_vm_init(adev, vm);

	r = amdgpu_vm_init(adev, vm, -1);

	if (r) {

		DRM_ERROR("failed to initialize vm\n");

		goto error_pasid;

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

+3 −2
Original line number Diff line number Diff line
@@ -55,8 +55,9 @@ static enum hrtimer_restart amdgpu_vkms_vblank_simulate(struct hrtimer *timer) 
		DRM_WARN("%s: vblank timer overrun\n", __func__);



	ret = drm_crtc_handle_vblank(crtc);

	/* Don't queue timer again when vblank is disabled. */

	if (!ret)

		DRM_ERROR("amdgpu_vkms failure on handling vblank");

		return HRTIMER_NORESTART;



	return HRTIMER_RESTART;

}
@@ -81,7 +82,7 @@ static void amdgpu_vkms_disable_vblank(struct drm_crtc *crtc) 
{

	struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);



	hrtimer_cancel(&amdgpu_crtc->vblank_timer);

	hrtimer_try_to_cancel(&amdgpu_crtc->vblank_timer);

}



static bool amdgpu_vkms_get_vblank_timestamp(struct drm_crtc *crtc,

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

+3 −2
Original line number Diff line number Diff line
@@ -2121,13 +2121,14 @@ long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout) 
 *

 * @adev: amdgpu_device pointer

 * @vm: requested vm

 * @xcp_id: GPU partition selection id

 *

 * Init @vm fields.

 *

 * Returns:

 * 0 for success, error for failure.

 */

int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm)

int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, int32_t xcp_id)

{

	struct amdgpu_bo *root_bo;

	struct amdgpu_bo_vm *root;
@@ -2177,7 +2178,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm) 
	vm->evicting = false;



	r = amdgpu_vm_pt_create(adev, vm, adev->vm_manager.root_level,

				false, &root);

				false, &root, xcp_id);

	if (r)

		goto error_free_delayed;

	root_bo = &root->bo;