Commit 5f58da2b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2021-12-03-1' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Bit of an uptick in patch count this week, though it's all relatively
  small overall.

  I suspect msm has been queuing up a few fixes to skew it here.
  Otherwise amdgpu has a scattered bunch of small fixes, and then some
  vc4, i915.

  virtio-gpu changes an rc1 introduced uAPI mistake, and makes it
  operate more like other drivers. This should be fine as no userspace
  relies on the behaviour yet.

  Summary:

  dma-buf:
   - memory leak fix

  msm:
   - kasan found memory overwrite
   - mmap flags
   - fencing error bug
   - ioctl NULL ptr
   - uninit var
   - devfreqless devices fix
   - dsi lanes fix
   - dp: avoid unpowered aux xfers

  amdgpu:
   - IP discovery based enumeration fixes
   - vkms fixes
   - DSC fixes for DP MST
   - Audio fix for hotplug with tiled displays
   - Misc display fixes
   - DP tunneling fix
   - DP fix
   - Aldebaran fix

  amdkfd:
   - Locking fix
   - Static checker fix
   - Fix double free

  i915:
   - backlight regression
   - Intel HDR backlight detection fix
   - revert TGL workaround that caused hangs

  virtio-gpu:
   - switch back to drm_poll

  vc4:
   - memory leak
   - error check fix
   - HVS modesetting fixes"

* tag 'drm-fixes-2021-12-03-1' of git://anongit.freedesktop.org/drm/drm: (41 commits)
  Revert "drm/i915: Implement Wa_1508744258"
  drm/amdkfd: process_info lock not needed for svm
  drm/amdgpu: adjust the kfd reset sequence in reset sriov function
  drm/amd/display: add connector type check for CRC source set
  drm/amdkfd: fix double free mem structure
  drm/amdkfd: set "r = 0" explicitly before goto
  drm/amd/display: Add work around for tunneled MST.
  drm/amd/display: Fix for the no Audio bug with Tiled Displays
  drm/amd/display: Clear DPCD lane settings after repeater training
  drm/amd/display: Allow DSC on supported MST branch devices
  drm/amdgpu: Don't halt RLC on GFX suspend
  drm/amdgpu: fix the missed handling for SDMA2 and SDMA3
  drm/amdgpu: check atomic flag to differeniate with legacy path
  drm/amdgpu: cancel the correct hrtimer on exit
  drm/amdgpu/sriov/vcn: add new vcn ip revision check case for SIENNA_CICHLID
  drm/i915/dp: Perform 30ms delay after source OUI write
  dma-buf: system_heap: Use 'for_each_sgtable_sg' in pages free flow
  drm/i915: Add support for panels with VESA backlights with PWM enable/disable
  drm/vc4: kms: Fix previous HVS commit wait
  drm/vc4: kms: Don't duplicate pending commit
  ...
parents a51e3ac4 a687efed

drivers/dma-buf/heaps/system_heap.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static void system_heap_dma_buf_release(struct dma_buf *dmabuf) 
	int i;



	table = &buffer->sg_table;

	for_each_sg(table->sgl, sg, table->nents, i) {

	for_each_sgtable_sg(table, sg, i) {

		struct page *page = sg_page(sg);



		__free_pages(page, compound_order(page));

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

+5 −3
Original line number Diff line number Diff line
@@ -1396,7 +1396,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
	struct sg_table *sg = NULL;

	uint64_t user_addr = 0;

	struct amdgpu_bo *bo;

	struct drm_gem_object *gobj;

	struct drm_gem_object *gobj = NULL;

	u32 domain, alloc_domain;

	u64 alloc_flags;

	int ret;
@@ -1506,13 +1506,15 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
	remove_kgd_mem_from_kfd_bo_list(*mem, avm->process_info);

	drm_vma_node_revoke(&gobj->vma_node, drm_priv);

err_node_allow:

	drm_gem_object_put(gobj);

	/* Don't unreserve system mem limit twice */

	goto err_reserve_limit;

err_bo_create:

	unreserve_mem_limit(adev, size, alloc_domain, !!sg);

err_reserve_limit:

	mutex_destroy(&(*mem)->lock);

	if (gobj)

		drm_gem_object_put(gobj);

	else

		kfree(*mem);

err:

	if (sg) {

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

+10 −6
Original line number Diff line number Diff line
@@ -3833,7 +3833,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 
	/* disable all interrupts */

	amdgpu_irq_disable_all(adev);

	if (adev->mode_info.mode_config_initialized){

		if (!amdgpu_device_has_dc_support(adev))

		if (!drm_drv_uses_atomic_modeset(adev_to_drm(adev)))

			drm_helper_force_disable_all(adev_to_drm(adev));

		else

			drm_atomic_helper_shutdown(adev_to_drm(adev));
@@ -4289,6 +4289,8 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, 
{

	int r;



	amdgpu_amdkfd_pre_reset(adev);



	if (from_hypervisor)

		r = amdgpu_virt_request_full_gpu(adev, true);

	else
@@ -4316,6 +4318,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, 


	amdgpu_irq_gpu_reset_resume_helper(adev);

	r = amdgpu_ib_ring_tests(adev);

	amdgpu_amdkfd_post_reset(adev);



error:

	if (!r && adev->virt.gim_feature & AMDGIM_FEATURE_GIM_FLR_VRAMLOST) {
@@ -5030,6 +5033,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 


		cancel_delayed_work_sync(&tmp_adev->delayed_init_work);



		if (!amdgpu_sriov_vf(tmp_adev))

			amdgpu_amdkfd_pre_reset(tmp_adev);



		/*
@@ -5129,7 +5133,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
			drm_sched_start(&ring->sched, !tmp_adev->asic_reset_res);

		}



		if (!amdgpu_device_has_dc_support(tmp_adev) && !job_signaled) {

		if (!drm_drv_uses_atomic_modeset(adev_to_drm(tmp_adev)) && !job_signaled) {

			drm_helper_resume_force_mode(adev_to_drm(tmp_adev));

		}
@@ -5148,8 +5152,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 


skip_sched_resume:

	list_for_each_entry(tmp_adev, device_list_handle, reset_list) {

		/* unlock kfd */

		if (!need_emergency_restart)

		/* unlock kfd: SRIOV would do it separately */

		if (!need_emergency_restart && !amdgpu_sriov_vf(tmp_adev))

			amdgpu_amdkfd_post_reset(tmp_adev);



		/* kfd_post_reset will do nothing if kfd device is not initialized,

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

+3 −0
Original line number Diff line number Diff line
@@ -157,6 +157,8 @@ static int hw_id_map[MAX_HWIP] = { 
	[HDP_HWIP]	= HDP_HWID,

	[SDMA0_HWIP]	= SDMA0_HWID,

	[SDMA1_HWIP]	= SDMA1_HWID,

	[SDMA2_HWIP]    = SDMA2_HWID,

	[SDMA3_HWIP]    = SDMA3_HWID,

	[MMHUB_HWIP]	= MMHUB_HWID,

	[ATHUB_HWIP]	= ATHUB_HWID,

	[NBIO_HWIP]	= NBIF_HWID,
@@ -918,6 +920,7 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev) 
		case IP_VERSION(3, 0, 64):

		case IP_VERSION(3, 1, 1):

		case IP_VERSION(3, 0, 2):

		case IP_VERSION(3, 0, 192):

			amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);

			if (!amdgpu_sriov_vf(adev))

				amdgpu_device_ip_block_add(adev, &jpeg_v3_0_ip_block);

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

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
		break;

	case IP_VERSION(3, 0, 0):

	case IP_VERSION(3, 0, 64):

	case IP_VERSION(3, 0, 192):

		if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 3, 0))

			fw_name = FIRMWARE_SIENNA_CICHLID;

		else