Commit 7ee04901 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull drm fixes from Dave Airlie:
 "Fixes from the last week (or 3 weeks in amdgpu case), after amdgpu,
  it's xe and nouveau then a few scattered core fixes.

  core:
   - fix rounding in drm_fixp2int_round()

  bridge:
   - fix documentation for DRM_BRIDGE_OP_EDID

  sun4i:
   - fix 64-bit division on 32-bit architectures

  tests:
   - fix dependency on DRM_KMS_HELPER

  probe-helper:
   - never return negative values from .get_modes() plus driver fixes

  xe:
   - invalidate userptr vma on page pin fault
   - fail early on sysfs file creation error
   - skip VMA pinning on xe_exec if no batches

  nouveau:
   - clear bo resource bus after eviction
   - documentation fixes
   - don't check devinit disable on GSP

  amdgpu:
   - Freesync fixes
   - UAF IOCTL fixes
   - Fix mmhub client ID mapping
   - IH 7.0 fix
   - DML2 fixes
   - VCN 4.0.6 fix
   - GART bind fix
   - GPU reset fix
   - SR-IOV fix
   - OD table handling fixes
   - Fix TA handling on boards without display hardware
   - DML1 fix
   - ABM fix
   - eDP panel fix
   - DPPCLK fix
   - HDCP fix
   - Revert incorrect error case handling in ioremap
   - VPE fix
   - HDMI fixes
   - SDMA 4.4.2 fix
   - Other misc fixes

  amdkfd:
   - Fix duplicate BO handling in process restore"

* tag 'drm-next-2024-03-22' of https://gitlab.freedesktop.org/drm/kernel: (50 commits)
  drm/amdgpu/pm: Don't use OD table on Arcturus
  drm/amdgpu: drop setting buffer funcs in sdma442
  drm/amd/display: Fix noise issue on HDMI AV mute
  drm/amd/display: Revert Remove pixle rate limit for subvp
  Revert "drm/amdgpu/vpe: don't emit cond exec command under collaborate mode"
  Revert "drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device_init()"
  drm/amd/display: Add a dc_state NULL check in dc_state_release
  drm/amd/display: Return the correct HDCP error code
  drm/amd/display: Implement wait_for_odm_update_pending_complete
  drm/amd/display: Lock all enabled otg pipes even with no planes
  drm/amd/display: Amend coasting vtotal for replay low hz
  drm/amd/display: Fix idle check for shared firmware state
  drm/amd/display: Update odm when ODM combine is changed on an otg master pipe with no plane
  drm/amd/display: Init DPPCLK from SMU on dcn32
  drm/amd/display: Add monitor patch for specific eDP
  drm/amd/display: Allow dirty rects to be sent to dmub when abm is active
  drm/amd/display: Override min required DCFCLK in dml1_validate
  drm/amdgpu: Bypass display ta if display hw is not available
  drm/amdgpu: correct the KGQ fallback message
  drm/amdgpu/pm: Check the validity of overdiver power limit
  ...
parents 661dc190 cafd86cb

drivers/gpu/drm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ config DRM_USE_DYNAMIC_DEBUG 
config DRM_KUNIT_TEST_HELPERS

	tristate

	depends on DRM && KUNIT

	select DRM_KMS_HELPER

	help

	  KUnit Helpers for KMS drivers.
@@ -80,7 +81,6 @@ config DRM_KUNIT_TEST 
	select DRM_EXEC

	select DRM_EXPORT_FOR_TESTS if m

	select DRM_GEM_SHMEM_HELPER

	select DRM_KMS_HELPER

	select DRM_KUNIT_TEST_HELPERS

	select DRM_LIB_RANDOM

	select PRIME_NUMBERS

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

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ int amdgpu_amdkfd_drm_client_create(struct amdgpu_device *adev) 
{

	int ret;



	if (!adev->kfd.init_complete)

	if (!adev->kfd.init_complete || adev->kfd.client.dev)

		return 0;



	ret = drm_client_init(&adev->ddev, &adev->kfd.client, "kfd",

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

+10 −4
Original line number Diff line number Diff line
@@ -2869,15 +2869,17 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence __rcu * 


	mutex_lock(&process_info->lock);



	drm_exec_init(&exec, 0, 0);

	drm_exec_init(&exec, DRM_EXEC_IGNORE_DUPLICATES, 0);

	drm_exec_until_all_locked(&exec) {

		list_for_each_entry(peer_vm, &process_info->vm_list_head,

				    vm_list_node) {

			ret = amdgpu_vm_lock_pd(peer_vm, &exec, 2);

			drm_exec_retry_on_contention(&exec);

			if (unlikely(ret))

			if (unlikely(ret)) {

				pr_err("Locking VM PD failed, ret: %d\n", ret);

				goto ttm_reserve_fail;

			}

		}



		/* Reserve all BOs and page tables/directory. Add all BOs from

		 * kfd_bo_list to ctx.list
@@ -2889,10 +2891,12 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence __rcu * 
			gobj = &mem->bo->tbo.base;

			ret = drm_exec_prepare_obj(&exec, gobj, 1);

			drm_exec_retry_on_contention(&exec);

			if (unlikely(ret))

			if (unlikely(ret)) {

				pr_err("drm_exec_prepare_obj failed, ret: %d\n", ret);

				goto ttm_reserve_fail;

			}

		}

	}



	amdgpu_sync_create(&sync_obj);
@@ -2950,8 +2954,10 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence __rcu * 
	 * validations above would invalidate DMABuf imports again.

	 */

	ret = process_validate_vms(process_info, &exec.ticket);

	if (ret)

	if (ret) {

		pr_debug("Validating VMs failed, ret: %d\n", ret);

		goto validate_map_fail;

	}



	/* Update mappings not managed by KFD */

	list_for_each_entry(peer_vm, &process_info->vm_list_head,

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

+6 −10
Original line number Diff line number Diff line
@@ -4040,10 +4040,8 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	 * early on during init and before calling to RREG32.

	 */

	adev->reset_domain = amdgpu_reset_create_reset_domain(SINGLE_DEVICE, "amdgpu-reset-dev");

	if (!adev->reset_domain) {

		r = -ENOMEM;

		goto unmap_memory;

	}

	if (!adev->reset_domain)

		return -ENOMEM;



	/* detect hw virtualization here */

	amdgpu_detect_virtualization(adev);
@@ -4053,7 +4051,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	r = amdgpu_device_get_job_timeout_settings(adev);

	if (r) {

		dev_err(adev->dev, "invalid lockup_timeout parameter syntax\n");

		goto unmap_memory;

		return r;

	}



	amdgpu_device_set_mcbp(adev);
@@ -4061,12 +4059,12 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	/* early init functions */

	r = amdgpu_device_ip_early_init(adev);

	if (r)

		goto unmap_memory;

		return r;



	/* Get rid of things like offb */

	r = drm_aperture_remove_conflicting_pci_framebuffers(adev->pdev, &amdgpu_kms_driver);

	if (r)

		goto unmap_memory;

		return r;



	/* Enable TMZ based on IP_VERSION */

	amdgpu_gmc_tmz_set(adev);
@@ -4076,7 +4074,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	if (adev->gmc.xgmi.supported) {

		r = adev->gfxhub.funcs->get_xgmi_info(adev);

		if (r)

			goto unmap_memory;

			return r;

	}



	/* enable PCIE atomic ops */
@@ -4345,8 +4343,6 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
failed:

	amdgpu_vf_error_trans_all(adev);



unmap_memory:

	iounmap(adev->rmmio);

	return r;

}

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

+4 −1
Original line number Diff line number Diff line
@@ -2479,8 +2479,11 @@ static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work) 
	}

	for (i = 0; i < mgpu_info.num_dgpu; i++) {

		adev = mgpu_info.gpu_ins[i].adev;

		if (!adev->kfd.init_complete)

		if (!adev->kfd.init_complete) {

			kgd2kfd_init_zone_device(adev);

			amdgpu_amdkfd_device_init(adev);

			amdgpu_amdkfd_drm_client_create(adev);

		}

		amdgpu_ttm_set_buffer_funcs_status(adev, true);

	}

}