Commit dfd4b508 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2025-08-16' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "Relatively quiet week, usual amdgpu/i915/xe fixes along with a set of
  fixes for fbdev format info, which fix some regressions seen in with
  rc1.

  bridge:
   - fix OF-node leak
   - fix documentation

  fbdev-emulation:
   - pass correct format info to drm_helper_mode_fill_fb_struct()

  panfrost:
   - print correct RSS size

  amdgpu:
   - PSP fix
   - VRAM reservation fix
   - CSA fix
   - Process kill fix

  i915:
   - Fix the implementation of wa_18038517565 [fbc]
   - Do not trigger Frame Change events from frontbuffer flush [psr]

  xe:
   - Some more xe_migrate_access_memory fixes (Auld)
   - Defer buffer object shrinker write-backs and GPU waits (Thomas)
   - HWMON fix for clamping limits (Karthik)
   - SRIOV-PF: Set VF LMEM BAR size (Michal)"

* tag 'drm-fixes-2025-08-16' of https://gitlab.freedesktop.org/drm/kernel:
  drm/xe/pf: Set VF LMEM BAR size
  drm/amdgpu: fix task hang from failed job submission during process kill
  drm/amdgpu: fix incorrect vm flags to map bo
  drm/amdgpu: fix vram reservation issue
  drm/amdgpu: Add PSP fw version check for fw reserve GFX command
  drm/xe/hwmon: Add SW clamp for power limits writes
  drm/xe: Defer buffer object shrinker write-backs and GPU waits
  drm/xe/migrate: prevent potential UAF
  drm/xe/migrate: don't overflow max copy size
  drm/xe/migrate: prevent infinite recursion
  drm/i915/psr: Do not trigger Frame Change events from frontbuffer flush
  drm/i915/fbc: fix the implementation of wa_18038517565
  drm/panfrost: Print RSS for tiler heap BO's in debugfs GEMS file
  drm/radeon: Pass along the format info from .fb_create() to drm_helper_mode_fill_fb_struct()
  drm/nouveau: Pass along the format info from .fb_create() to drm_helper_mode_fill_fb_struct()
  drm/omap: Pass along the format info from .fb_create() to drm_helper_mode_fill_fb_struct()
  drm/bridge: document HDMI CEC callbacks
  drm/bridge: Describe the newly introduced drm_connector parameter for drm_bridge_detect
  drm/bridge: fix OF node leak
parents d0efc9e4 00062ea0

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

+3 −0
Original line number Diff line number Diff line
@@ -1139,6 +1139,9 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
		}

	}



	if (!amdgpu_vm_ready(vm))

		return -EINVAL;



	r = amdgpu_vm_clear_freed(adev, vm, NULL);

	if (r)

		return r;

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

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	}



	r = amdgpu_vm_bo_map(adev, *bo_va, csa_addr, 0, size,

			     AMDGPU_PTE_READABLE | AMDGPU_PTE_WRITEABLE |

			     AMDGPU_PTE_EXECUTABLE);

			     AMDGPU_VM_PAGE_READABLE | AMDGPU_VM_PAGE_WRITEABLE |

			     AMDGPU_VM_PAGE_EXECUTABLE);



	if (r) {

		DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);

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

+16 −3
Original line number Diff line number Diff line
@@ -1039,15 +1039,28 @@ int psp_update_fw_reservation(struct psp_context *psp) 
{

	int ret;

	uint64_t reserv_addr, reserv_addr_ext;

	uint32_t reserv_size, reserv_size_ext;

	uint32_t reserv_size, reserv_size_ext, mp0_ip_ver;

	struct amdgpu_device *adev = psp->adev;



	mp0_ip_ver = amdgpu_ip_version(adev, MP0_HWIP, 0);



	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	if ((amdgpu_ip_version(adev, MP0_HWIP, 0) != IP_VERSION(14, 0, 2)) &&

	    (amdgpu_ip_version(adev, MP0_HWIP, 0) != IP_VERSION(14, 0, 3)))

	switch (mp0_ip_ver) {

	case IP_VERSION(14, 0, 2):

		if (adev->psp.sos.fw_version < 0x3b0e0d)

			return 0;

		break;



	case IP_VERSION(14, 0, 3):

		if (adev->psp.sos.fw_version < 0x3a0e14)

			return 0;

		break;



	default:

		return 0;

	}



	ret = psp_get_fw_reservation_info(psp, GFX_CMD_ID_FB_FW_RESERV_ADDR, &reserv_addr, &reserv_size);

	if (ret)

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

+11 −4
Original line number Diff line number Diff line
@@ -654,11 +654,10 @@ int amdgpu_vm_validate(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
 * Check if all VM PDs/PTs are ready for updates

 *

 * Returns:

 * True if VM is not evicting.

 * True if VM is not evicting and all VM entities are not stopped

 */

bool amdgpu_vm_ready(struct amdgpu_vm *vm)

{

	bool empty;

	bool ret;



	amdgpu_vm_eviction_lock(vm);
@@ -666,10 +665,18 @@ bool amdgpu_vm_ready(struct amdgpu_vm *vm) 
	amdgpu_vm_eviction_unlock(vm);



	spin_lock(&vm->status_lock);

	empty = list_empty(&vm->evicted);

	ret &= list_empty(&vm->evicted);

	spin_unlock(&vm->status_lock);



	return ret && empty;

	spin_lock(&vm->immediate.lock);

	ret &= !vm->immediate.stopped;

	spin_unlock(&vm->immediate.lock);



	spin_lock(&vm->delayed.lock);

	ret &= !vm->delayed.stopped;

	spin_unlock(&vm->delayed.lock);



	return ret;

}



/**

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

+1 −2
Original line number Diff line number Diff line
@@ -648,9 +648,8 @@ static void amdgpu_vram_mgr_del(struct ttm_resource_manager *man, 
	list_for_each_entry(block, &vres->blocks, link)

		vis_usage += amdgpu_vram_mgr_vis_size(adev, block);



	amdgpu_vram_mgr_do_reserve(man);



	drm_buddy_free_list(mm, &vres->blocks, vres->flags);

	amdgpu_vram_mgr_do_reserve(man);

	mutex_unlock(&mgr->lock);



	atomic64_sub(vis_usage, &mgr->vis_usage);