Commit 56fb6f92 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-next-2024-05-25' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "Some fixes for the end of the merge window, mostly amdgpu and panthor,
  with one nouveau uAPI change that fixes a bad decision we made a few
  months back.

  nouveau:
   - fix bo metadata uAPI for vm bind

  panthor:
   - Fixes for panthor's heap logical block.
   - Reset on unrecoverable fault
   - Fix VM references.
   - Reset fix.

  xlnx:
   - xlnx compile and doc fixes.

  amdgpu:
   - Handle vbios table integrated info v2.3

  amdkfd:
   - Handle duplicate BOs in reserve_bo_and_cond_vms
   - Handle memory limitations on small APUs

  dp/mst:
   - MST null deref fix.

  bridge:
   - Don't let next bridge create connector in adv7511 to make probe
     work"

* tag 'drm-next-2024-05-25' of https://gitlab.freedesktop.org/drm/kernel:
  drm/amdgpu/atomfirmware: add intergrated info v2.3 table
  drm/mst: Fix NULL pointer dereference at drm_dp_add_payload_part2
  drm/amdkfd: Let VRAM allocations go to GTT domain on small APUs
  drm/amdkfd: handle duplicate BOs in reserve_bo_and_cond_vms
  drm/bridge: adv7511: Attach next bridge without creating connector
  drm/buddy: Fix the warn on's during force merge
  drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations
  drm/panthor: Call panthor_sched_post_reset() even if the reset failed
  drm/panthor: Reset the FW VM to NULL on unplug
  drm/panthor: Keep a ref to the VM at the panthor_kernel_bo level
  drm/panthor: Force an immediate reset on unrecoverable faults
  drm/panthor: Document drm_panthor_tiler_heap_destroy::handle validity constraints
  drm/panthor: Fix an off-by-one in the heap context retrieval logic
  drm/panthor: Relax the constraints on the tiler chunk size
  drm/panthor: Make sure the tiler initial/max chunks are consistent
  drm/panthor: Fix tiler OOM handling to allow incremental rendering
  drm: xlnx: zynqmp_dpsub: Fix compilation error
  drm: xlnx: zynqmp_dpsub: Fix few function comments
parents 0b32d436 32a0bb7e

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

+5 −0
Original line number Diff line number Diff line
@@ -455,6 +455,9 @@ void amdgpu_amdkfd_get_local_mem_info(struct amdgpu_device *adev, 
		else

			mem_info->local_mem_size_private =

					KFD_XCP_MEMORY_SIZE(adev, xcp->id);

	} else if (adev->flags & AMD_IS_APU) {

		mem_info->local_mem_size_public = (ttm_tt_pages_limit() << PAGE_SHIFT);

		mem_info->local_mem_size_private = 0;

	} else {

		mem_info->local_mem_size_public = adev->gmc.visible_vram_size;

		mem_info->local_mem_size_private = adev->gmc.real_vram_size -
@@ -824,6 +827,8 @@ u64 amdgpu_amdkfd_xcp_memory_size(struct amdgpu_device *adev, int xcp_id) 
		}

		do_div(tmp, adev->xcp_mgr->num_xcp_per_mem_partition);

		return ALIGN_DOWN(tmp, PAGE_SIZE);

	} else if (adev->flags & AMD_IS_APU) {

		return (ttm_tt_pages_limit() << PAGE_SHIFT);

	} else {

		return adev->gmc.real_vram_size;

	}

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

+13 −10
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ int amdgpu_amdkfd_reserve_mem_limit(struct amdgpu_device *adev, 
			return -EINVAL;



		vram_size = KFD_XCP_MEMORY_SIZE(adev, xcp_id);

		if (adev->gmc.is_app_apu) {

		if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) {

			system_mem_needed = size;

			ttm_mem_needed = size;

		}
@@ -232,7 +232,8 @@ int amdgpu_amdkfd_reserve_mem_limit(struct amdgpu_device *adev, 
		  "adev reference can't be null when vram is used");

	if (adev && xcp_id >= 0) {

		adev->kfd.vram_used[xcp_id] += vram_needed;

		adev->kfd.vram_used_aligned[xcp_id] += adev->gmc.is_app_apu ?

		adev->kfd.vram_used_aligned[xcp_id] +=

				(adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) ?

				vram_needed :

				ALIGN(vram_needed, VRAM_AVAILABLITY_ALIGN);

	}
@@ -260,7 +261,7 @@ void amdgpu_amdkfd_unreserve_mem_limit(struct amdgpu_device *adev, 


		if (adev) {

			adev->kfd.vram_used[xcp_id] -= size;

			if (adev->gmc.is_app_apu) {

			if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) {

				adev->kfd.vram_used_aligned[xcp_id] -= size;

				kfd_mem_limit.system_mem_used -= size;

				kfd_mem_limit.ttm_mem_used -= size;
@@ -889,7 +890,7 @@ static int kfd_mem_attach(struct amdgpu_device *adev, struct kgd_mem *mem, 
	 * if peer device has large BAR. In contrast, access over xGMI is

	 * allowed for both small and large BAR configurations of peer device

	 */

	if ((adev != bo_adev && !adev->gmc.is_app_apu) &&

	if ((adev != bo_adev && !(adev->gmc.is_app_apu || adev->flags & AMD_IS_APU)) &&

	    ((mem->domain == AMDGPU_GEM_DOMAIN_VRAM) ||

	     (mem->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL) ||

	     (mem->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP))) {
@@ -1188,7 +1189,8 @@ static int reserve_bo_and_cond_vms(struct kgd_mem *mem, 
	int ret;



	ctx->sync = &mem->sync;

	drm_exec_init(&ctx->exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0);

	drm_exec_init(&ctx->exec, DRM_EXEC_INTERRUPTIBLE_WAIT |

		      DRM_EXEC_IGNORE_DUPLICATES, 0);

	drm_exec_until_all_locked(&ctx->exec) {

		ctx->n_vms = 0;

		list_for_each_entry(entry, &mem->attachments, list) {
@@ -1656,7 +1658,7 @@ size_t amdgpu_amdkfd_get_available_memory(struct amdgpu_device *adev, 
		- atomic64_read(&adev->vram_pin_size)

		- reserved_for_pt;



	if (adev->gmc.is_app_apu) {

	if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) {

		system_mem_available = no_system_mem_limit ?

					kfd_mem_limit.max_system_mem_limit :

					kfd_mem_limit.max_system_mem_limit -
@@ -1704,7 +1706,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
	if (flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM) {

		domain = alloc_domain = AMDGPU_GEM_DOMAIN_VRAM;



		if (adev->gmc.is_app_apu) {

		if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) {

			domain = AMDGPU_GEM_DOMAIN_GTT;

			alloc_domain = AMDGPU_GEM_DOMAIN_GTT;

			alloc_flags = 0;
@@ -1951,7 +1953,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( 
	if (size) {

		if (!is_imported &&

		   (mem->bo->preferred_domains == AMDGPU_GEM_DOMAIN_VRAM ||

		   (adev->gmc.is_app_apu &&

		   ((adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) &&

		    mem->bo->preferred_domains == AMDGPU_GEM_DOMAIN_GTT)))

			*size = bo_size;

		else
@@ -2373,7 +2375,8 @@ static int import_obj_create(struct amdgpu_device *adev, 
	(*mem)->dmabuf = dma_buf;

	(*mem)->bo = bo;

	(*mem)->va = va;

	(*mem)->domain = (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) && !adev->gmc.is_app_apu ?

	(*mem)->domain = (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) &&

			 !(adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) ?

			 AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT;



	(*mem)->mapped_to_gpu_memory = 0;

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

+15 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ union igp_info { 
	struct atom_integrated_system_info_v1_11 v11;

	struct atom_integrated_system_info_v1_12 v12;

	struct atom_integrated_system_info_v2_1 v21;

	struct atom_integrated_system_info_v2_3 v23;

};



union umc_info {
@@ -360,6 +361,20 @@ amdgpu_atomfirmware_get_vram_info(struct amdgpu_device *adev, 
					if (vram_type)

						*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);

					break;

				case 3:

					mem_channel_number = igp_info->v23.umachannelnumber;

					if (!mem_channel_number)

						mem_channel_number = 1;

					mem_type = igp_info->v23.memorytype;

					if (mem_type == LpDdr5MemType)

						mem_channel_width = 32;

					else

						mem_channel_width = 64;

					if (vram_width)

						*vram_width = mem_channel_number * mem_channel_width;

					if (vram_type)

						*vram_type = convert_atom_mem_type_to_vram_type(adev, mem_type);

					break;

				default:

					return -EINVAL;

				}

drivers/gpu/drm/amd/amdkfd/kfd_migrate.c

+1 −1
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev) 
	if (amdgpu_ip_version(adev, GC_HWIP, 0) < IP_VERSION(9, 0, 1))

		return -EINVAL;



	if (adev->gmc.is_app_apu)

	if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU)

		return 0;



	pgmap = &kfddev->pgmap;

drivers/gpu/drm/amd/amdkfd/kfd_svm.c

+4 −2
Original line number Diff line number Diff line
@@ -2619,7 +2619,8 @@ svm_range_best_restore_location(struct svm_range *prange, 
		return -1;

	}



	if (node->adev->gmc.is_app_apu)

	if (node->adev->gmc.is_app_apu ||

	    node->adev->flags & AMD_IS_APU)

		return 0;



	if (prange->preferred_loc == gpuid ||
@@ -3337,7 +3338,8 @@ svm_range_best_prefetch_location(struct svm_range *prange) 
		goto out;

	}



	if (bo_node->adev->gmc.is_app_apu) {

	if (bo_node->adev->gmc.is_app_apu ||

	    bo_node->adev->flags & AMD_IS_APU) {

		best_loc = 0;

		goto out;

	}