Commit b7a57386 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2023-07-13' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes 



A couple of nouveau patches addressing improving HDMI support and
firmware handling, a fix for TTM to skip pinned BO when evicting, and a
fix for the fbdev documentation.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/nq3ke75juephbex5acfyi5t6bxv22nhmfcpfhru55haj2nv3us@gehrlmjbqgjk
parents 06c2afb8 835a65f5

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/armada/armada_fbdev.c

+0 −4
Original line number Diff line number Diff line
@@ -209,10 +209,6 @@ void armada_fbdev_setup(struct drm_device *dev) 
		goto err_drm_client_init;

	}



	ret = armada_fbdev_client_hotplug(&fbh->client);

	if (ret)

		drm_dbg_kms(dev, "client hotplug ret=%d\n", ret);



	drm_client_register(&fbh->client);



	return;