Commit 3a97a299 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2023-07-14-1' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "There were a bunch of fixes lined up for 2 weeks, so we have quite a
  few scattered fixes, mostly amdgpu and i915, but ttm has a bunch and
  nouveau makes an appearance.

  So a bit busier than usual for rc2, but nothing seems out of the
  ordinary.

  fbdev:
   - dma: Fix documented default preferred_bpp value

  ttm:
   - fix warning that we shouldn't mix && and ||
   - never consider pinned BOs for eviction&swap
   - Don't leak a resource on eviction error
   - Don't leak a resource on swapout move error
   - fix bulk_move corruption when adding a entry

  client:
   - Send hotplug event after registering a client

  dma-buf:
   - keep the signaling time of merged fences v3
   - fix an error pointer vs NULL bug

  sched:
   - wait for all deps in kill jobs
   - call set fence parent from scheduled

  i915:
   - Don't preserve dpll_hw_state for slave crtc in Bigjoiner
   - Consider OA buffer boundary when zeroing out reports
   - Remove dead code from gen8_pte_encode
   - Fix one wrong caching mode enum usage

  amdgpu:
   - SMU i2c locking fix
   - Fix a possible deadlock in process restoration for ROCm apps
   - Disable PCIe lane/speed switching on Intel platforms (the platforms
     don't support it)

  nouveau:
   - disp: fix HDMI on gt215+
   - disp/g94: enable HDMI
   - acr: Abort loading ACR if no firmware was found
   - bring back blit subchannel for pre nv50 GPUs
   - Fix drm_dp_remove_payload() invocation

  ivpu:
   - Fix VPU register access in irq disable
   - Clear specific interrupt status bits on C0

  bridge:
   - dw_hdmi: fix connector access for scdc
   - ti-sn65dsi86: Fix auxiliary bus lifetime

  panel:
   - simple: Add connector_type for innolux_at043tn24
   - simple: Add Powertip PH800480T013 drm_display_mode flags"

* tag 'drm-fixes-2023-07-14-1' of git://anongit.freedesktop.org/drm/drm: (32 commits)
  drm/nouveau: bring back blit subchannel for pre nv50 GPUs
  drm/nouveau/acr: Abort loading ACR if no firmware was found
  drm/amd: Align SMU11 SMU_MSG_OverridePcieParameters implementation with SMU13
  drm/amd: Move helper for dynamic speed switch check out of smu13
  drm/amd/pm: conditionally disable pcie lane/speed switching for SMU13
  drm/amd/pm: share the code around SMU13 pcie parameters update
  drm/amdgpu: avoid restore process run into dead loop.
  drm/amd/pm: fix smu i2c data read risk
  drm/nouveau/disp/g94: enable HDMI
  drm/nouveau/disp: fix HDMI on gt215+
  drm/client: Send hotplug event after registering a client
  drm/i915: Fix one wrong caching mode enum usage
  drm/i915: Remove dead code from gen8_pte_encode
  drm/i915/perf: Consider OA buffer boundary when zeroing out reports
  drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner
  drm/ttm: never consider pinned BOs for eviction&swap
  drm/fbdev-dma: Fix documented default preferred_bpp value
  dma-buf: fix an error pointer vs NULL bug
  accel/ivpu: Clear specific interrupt status bits on C0
  accel/ivpu: Fix VPU register access in irq disable
  ...
parents ddbd9161 38d88d5e

drivers/accel/ivpu/ivpu_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ struct ivpu_wa_table { 
	bool punit_disabled;

	bool clear_runtime_mem;

	bool d3hot_after_power_off;

	bool interrupt_clear_with_0;

};



struct ivpu_hw_info;

drivers/accel/ivpu/ivpu_hw_mtl.c

+13 −7
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ static void ivpu_hw_wa_init(struct ivpu_device *vdev) 
	vdev->wa.punit_disabled = ivpu_is_fpga(vdev);

	vdev->wa.clear_runtime_mem = false;

	vdev->wa.d3hot_after_power_off = true;



	if (ivpu_device_id(vdev) == PCI_DEVICE_ID_MTL && ivpu_revision(vdev) < 4)

		vdev->wa.interrupt_clear_with_0 = true;

}



static void ivpu_hw_timeouts_init(struct ivpu_device *vdev)
@@ -885,7 +888,7 @@ static void ivpu_hw_mtl_irq_disable(struct ivpu_device *vdev) 
	REGB_WR32(MTL_BUTTRESS_GLOBAL_INT_MASK, 0x1);

	REGB_WR32(MTL_BUTTRESS_LOCAL_INT_MASK, BUTTRESS_IRQ_DISABLE_MASK);

	REGV_WR64(MTL_VPU_HOST_SS_ICB_ENABLE_0, 0x0ull);

	REGB_WR32(MTL_VPU_HOST_SS_FW_SOC_IRQ_EN, 0x0);

	REGV_WR32(MTL_VPU_HOST_SS_FW_SOC_IRQ_EN, 0x0);

}



static void ivpu_hw_mtl_irq_wdt_nce_handler(struct ivpu_device *vdev)
@@ -973,12 +976,15 @@ static u32 ivpu_hw_mtl_irqb_handler(struct ivpu_device *vdev, int irq) 
		schedule_recovery = true;

	}



	/* This must be done after interrupts are cleared at the source. */

	if (IVPU_WA(interrupt_clear_with_0))

		/*

	 * Clear local interrupt status by writing 0 to all bits.

	 * This must be done after interrupts are cleared at the source.

		 * Writing 1 triggers an interrupt, so we can't perform read update write.

		 * Clear local interrupt status by writing 0 to all bits.

		 */

		REGB_WR32(MTL_BUTTRESS_INTERRUPT_STAT, 0x0);

	else

		REGB_WR32(MTL_BUTTRESS_INTERRUPT_STAT, status);



	/* Re-enable global interrupt */

	REGB_WR32(MTL_BUTTRESS_GLOBAL_INT_MASK, 0x0);

drivers/dma-buf/dma-fence-unwrap.c

+22 −4
Original line number Diff line number Diff line
@@ -66,18 +66,36 @@ struct dma_fence *__dma_fence_unwrap_merge(unsigned int num_fences, 
{

	struct dma_fence_array *result;

	struct dma_fence *tmp, **array;

	ktime_t timestamp;

	unsigned int i;

	size_t count;



	count = 0;

	timestamp = ns_to_ktime(0);

	for (i = 0; i < num_fences; ++i) {

		dma_fence_unwrap_for_each(tmp, &iter[i], fences[i])

			if (!dma_fence_is_signaled(tmp))

		dma_fence_unwrap_for_each(tmp, &iter[i], fences[i]) {

			if (!dma_fence_is_signaled(tmp)) {

				++count;

			} else if (test_bit(DMA_FENCE_FLAG_TIMESTAMP_BIT,

					    &tmp->flags)) {

				if (ktime_after(tmp->timestamp, timestamp))

					timestamp = tmp->timestamp;

			} else {

				/*

				 * Use the current time if the fence is

				 * currently signaling.

				 */

				timestamp = ktime_get();

			}

		}

	}



	/*

	 * If we couldn't find a pending fence just return a private signaled

	 * fence with the timestamp of the last signaled one.

	 */

	if (count == 0)

		return dma_fence_get_stub();

		return dma_fence_allocate_private_stub(timestamp);



	array = kmalloc_array(count, sizeof(*array), GFP_KERNEL);

	if (!array)
@@ -138,7 +156,7 @@ struct dma_fence *__dma_fence_unwrap_merge(unsigned int num_fences, 
	} while (tmp);



	if (count == 0) {

		tmp = dma_fence_get_stub();

		tmp = dma_fence_allocate_private_stub(ktime_get());

		goto return_tmp;

	}

drivers/dma-buf/dma-fence.c

+4 −3
Original line number Diff line number Diff line
@@ -150,16 +150,17 @@ EXPORT_SYMBOL(dma_fence_get_stub); 


/**

 * dma_fence_allocate_private_stub - return a private, signaled fence

 * @timestamp: timestamp when the fence was signaled

 *

 * Return a newly allocated and signaled stub fence.

 */

struct dma_fence *dma_fence_allocate_private_stub(void)

struct dma_fence *dma_fence_allocate_private_stub(ktime_t timestamp)

{

	struct dma_fence *fence;



	fence = kzalloc(sizeof(*fence), GFP_KERNEL);

	if (fence == NULL)

		return ERR_PTR(-ENOMEM);

		return NULL;



	dma_fence_init(fence,

		       &dma_fence_stub_ops,
@@ -169,7 +170,7 @@ struct dma_fence *dma_fence_allocate_private_stub(void) 
	set_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT,

		&fence->flags);



	dma_fence_signal(fence);

	dma_fence_signal_timestamp(fence, timestamp);



	return fence;

}

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -1296,6 +1296,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
void amdgpu_device_pci_config_reset(struct amdgpu_device *adev);

int amdgpu_device_pci_reset(struct amdgpu_device *adev);

bool amdgpu_device_need_post(struct amdgpu_device *adev);

bool amdgpu_device_pcie_dynamic_switching_supported(void);

bool amdgpu_device_should_use_aspm(struct amdgpu_device *adev);

bool amdgpu_device_aspm_support_quirk(void);