Commit 3e213851 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.20-2026-02-13' of... 

Merge tag 'amd-drm-next-6.20-2026-02-13' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-6.20-2026-02-13:

amdgpu:
- SMU 13.x fixes
- DC resume lag fix
- MPO fixes
- DCN 3.6 fix
- VSDB fixes
- HWSS clean up
- Replay fixes
- DCE cursor fixes
- DCN 3.5 SR DDR5 latency fixes
- HPD fixes
- Error path unwind fixes
- SMU13/14 mode1 reset fixes
- PSP 15 updates
- SMU 15 updates
- RAS fixes
- Sync fix in amdgpu_dma_buf_move_notify()
- HAINAN fix
- PSP 13.x fix
- GPUVM locking fix

amdkfd:
- APU GTT as VRAM fix

radeon:
- HAINAN fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20260213220825.1454189-1-alexander.deucher@amd.com
parents 42ebf3b3 fd1fa48b

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

+13 −6
Original line number Diff line number Diff line
@@ -878,6 +878,7 @@ static int kfd_mem_attach(struct amdgpu_device *adev, struct kgd_mem *mem, 
	struct amdgpu_bo *bo[2] = {NULL, NULL};

	struct amdgpu_bo_va *bo_va;

	bool same_hive = false;

	struct drm_exec exec;

	int i, ret;



	if (!va) {
@@ -958,19 +959,25 @@ static int kfd_mem_attach(struct amdgpu_device *adev, struct kgd_mem *mem, 
			goto unwind;

		}



		/* Add BO to VM internal data structures */

		ret = amdgpu_bo_reserve(bo[i], false);

		if (ret) {

			pr_debug("Unable to reserve BO during memory attach");

		drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0);

		drm_exec_until_all_locked(&exec) {

			ret = amdgpu_vm_lock_pd(vm, &exec, 0);

			drm_exec_retry_on_contention(&exec);

			if (unlikely(ret))

				goto unwind;

			ret = drm_exec_lock_obj(&exec, &bo[i]->tbo.base);

			drm_exec_retry_on_contention(&exec);

			if (unlikely(ret))

				goto unwind;

		}



		bo_va = amdgpu_vm_bo_find(vm, bo[i]);

		if (!bo_va)

			bo_va = amdgpu_vm_bo_add(adev, vm, bo[i]);

		else

			++bo_va->ref_count;

		attachment[i]->bo_va = bo_va;

		amdgpu_bo_unreserve(bo[i]);

		drm_exec_fini(&exec);

		if (unlikely(!attachment[i]->bo_va)) {

			ret = -ENOMEM;

			pr_err("Failed to add BO object to VM. ret == %d\n",

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

+0 −3
Original line number Diff line number Diff line
@@ -4652,9 +4652,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
			dev_info(adev->dev, "Pending hive reset.\n");

			amdgpu_set_init_level(adev,

					      AMDGPU_INIT_LEVEL_MINIMAL_XGMI);

		} else if (amdgpu_ip_version(adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 10) &&

				   !amdgpu_device_has_display_hardware(adev)) {

					r = psp_gpu_reset(adev);

		} else {

				tmp = amdgpu_reset_method;

				/* It should do a default reset when loading or reloading the driver,

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

+4 −1
Original line number Diff line number Diff line
@@ -2164,6 +2164,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev) 
	case IP_VERSION(13, 0, 11):

	case IP_VERSION(13, 0, 12):

	case IP_VERSION(13, 0, 14):

	case IP_VERSION(13, 0, 15):

	case IP_VERSION(14, 0, 0):

	case IP_VERSION(14, 0, 1):

	case IP_VERSION(14, 0, 4):
@@ -2988,9 +2989,11 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev) 
	case IP_VERSION(11, 5, 1):

	case IP_VERSION(11, 5, 2):

	case IP_VERSION(11, 5, 3):

	case IP_VERSION(11, 5, 4):

		adev->family = AMDGPU_FAMILY_GC_11_5_0;

		break;

	case IP_VERSION(11, 5, 4):

		adev->family = AMDGPU_FAMILY_GC_11_5_4;

		break;

	case IP_VERSION(12, 0, 0):

	case IP_VERSION(12, 0, 1):

	case IP_VERSION(12, 1, 0):

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

+8 −1
Original line number Diff line number Diff line
@@ -514,8 +514,15 @@ amdgpu_dma_buf_move_notify(struct dma_buf_attachment *attach) 
		r = dma_resv_reserve_fences(resv, 2);

		if (!r)

			r = amdgpu_vm_clear_freed(adev, vm, NULL);



		/* Don't pass 'ticket' to amdgpu_vm_handle_moved: we want the clear=true

		 * path to be used otherwise we might update the PT of another process

		 * while it's using the BO.

		 * With clear=true, amdgpu_vm_bo_update will sync to command submission

		 * from the same VM.

		 */

		if (!r)

			r = amdgpu_vm_handle_moved(adev, vm, ticket);

			r = amdgpu_vm_handle_moved(adev, vm, NULL);



		if (r && r != -EBUSY)

			DRM_ERROR("Failed to invalidate VM page tables (%d))\n",

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

+17 −5
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static int amdgpu_gem_object_open(struct drm_gem_object *obj, 
	struct amdgpu_vm *vm = &fpriv->vm;

	struct amdgpu_bo_va *bo_va;

	struct mm_struct *mm;

	struct drm_exec exec;

	int r;



	mm = amdgpu_ttm_tt_get_usermm(abo->tbo.ttm);
@@ -242,9 +243,18 @@ static int amdgpu_gem_object_open(struct drm_gem_object *obj, 
	    !amdgpu_vm_is_bo_always_valid(vm, abo))

		return -EPERM;



	r = amdgpu_bo_reserve(abo, false);

	if (r)

		return r;

	drm_exec_init(&exec, DRM_EXEC_IGNORE_DUPLICATES, 0);

	drm_exec_until_all_locked(&exec) {

		r = drm_exec_prepare_obj(&exec, &abo->tbo.base, 1);

		drm_exec_retry_on_contention(&exec);

		if (unlikely(r))

			goto out_unlock;



		r = amdgpu_vm_lock_pd(vm, &exec, 0);

		drm_exec_retry_on_contention(&exec);

		if (unlikely(r))

			goto out_unlock;

	}



	amdgpu_vm_bo_update_shared(abo);

	bo_va = amdgpu_vm_bo_find(vm, abo);
@@ -260,8 +270,7 @@ static int amdgpu_gem_object_open(struct drm_gem_object *obj, 
		amdgpu_bo_unreserve(abo);

		return r;

	}



	amdgpu_bo_unreserve(abo);

	drm_exec_fini(&exec);



	/* Validate and add eviction fence to DMABuf imports with dynamic

	 * attachment in compute VMs. Re-validation will be done by
@@ -294,7 +303,10 @@ static int amdgpu_gem_object_open(struct drm_gem_object *obj, 
		}

	}

	mutex_unlock(&vm->process_info->lock);

	return r;



out_unlock:

	drm_exec_fini(&exec);

	return r;

}