Commit 6c2bf9ca authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2024-02-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



A null pointer dereference fix for v3d, a TTM pool initialization fix,
several fixes for nouveau around register size, DMA buffer leaks and API
consistency, a multiple fixes for ivpu around MMU setup, initialization
and firmware interactions.

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

From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4wsi2i6kgkqdu7nzp4g7hxasbswnrmc5cakgf5zzvnix53u7lr@4rmp7hwblow3
parents d0399da9 5f8408ac

drivers/accel/ivpu/ivpu_drv.c

+2 −3
Original line number Diff line number Diff line
@@ -480,8 +480,7 @@ static int ivpu_pci_init(struct ivpu_device *vdev) 
	/* Clear any pending errors */

	pcie_capability_clear_word(pdev, PCI_EXP_DEVSTA, 0x3f);



	/* VPU 37XX does not require 10m D3hot delay */

	if (ivpu_hw_gen(vdev) == IVPU_HW_37XX)

	/* NPU does not require 10m D3hot delay */

	pdev->d3hot_delay = 0;



	ret = pcim_enable_device(pdev);

drivers/accel/ivpu/ivpu_fw.c

+0 −1
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ ivpu_fw_init_wa(struct ivpu_device *vdev) 
	const struct vpu_firmware_header *fw_hdr = (const void *)vdev->fw->file->data;



	if (IVPU_FW_CHECK_API_VER_LT(vdev, fw_hdr, BOOT, 3, 17) ||

	    (ivpu_hw_gen(vdev) > IVPU_HW_37XX) ||

	    (ivpu_test_mode & IVPU_TEST_MODE_D0I3_MSG_DISABLE))

		vdev->wa.disable_d0i3_msg = true;

drivers/accel/ivpu/ivpu_hw_37xx.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static void ivpu_boot_no_snoop_enable(struct ivpu_device *vdev) 
	u32 val = REGV_RD32(VPU_37XX_HOST_IF_TCU_PTW_OVERRIDES);



	val = REG_SET_FLD(VPU_37XX_HOST_IF_TCU_PTW_OVERRIDES, NOSNOOP_OVERRIDE_EN, val);

	val = REG_SET_FLD(VPU_37XX_HOST_IF_TCU_PTW_OVERRIDES, AW_NOSNOOP_OVERRIDE, val);

	val = REG_CLR_FLD(VPU_37XX_HOST_IF_TCU_PTW_OVERRIDES, AW_NOSNOOP_OVERRIDE, val);

	val = REG_SET_FLD(VPU_37XX_HOST_IF_TCU_PTW_OVERRIDES, AR_NOSNOOP_OVERRIDE, val);



	REGV_WR32(VPU_37XX_HOST_IF_TCU_PTW_OVERRIDES, val);

drivers/accel/ivpu/ivpu_hw_40xx.c

+1 −6
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static void ivpu_boot_no_snoop_enable(struct ivpu_device *vdev) 
	u32 val = REGV_RD32(VPU_40XX_HOST_IF_TCU_PTW_OVERRIDES);



	val = REG_SET_FLD(VPU_40XX_HOST_IF_TCU_PTW_OVERRIDES, SNOOP_OVERRIDE_EN, val);

	val = REG_CLR_FLD(VPU_40XX_HOST_IF_TCU_PTW_OVERRIDES, AW_SNOOP_OVERRIDE, val);

	val = REG_SET_FLD(VPU_40XX_HOST_IF_TCU_PTW_OVERRIDES, AW_SNOOP_OVERRIDE, val);

	val = REG_CLR_FLD(VPU_40XX_HOST_IF_TCU_PTW_OVERRIDES, AR_SNOOP_OVERRIDE, val);



	REGV_WR32(VPU_40XX_HOST_IF_TCU_PTW_OVERRIDES, val);
@@ -704,7 +704,6 @@ static int ivpu_hw_40xx_info_init(struct ivpu_device *vdev) 
{

	struct ivpu_hw_info *hw = vdev->hw;

	u32 tile_disable;

	u32 tile_enable;

	u32 fuse;



	fuse = REGB_RD32(VPU_40XX_BUTTRESS_TILE_FUSE);
@@ -725,10 +724,6 @@ static int ivpu_hw_40xx_info_init(struct ivpu_device *vdev) 
	else

		ivpu_dbg(vdev, MISC, "Fuse: All %d tiles enabled\n", TILE_MAX_NUM);



	tile_enable = (~tile_disable) & TILE_MAX_MASK;



	hw->sku = REG_SET_FLD_NUM(SKU, HW_ID, LNL_HW_ID, hw->sku);

	hw->sku = REG_SET_FLD_NUM(SKU, TILE, tile_enable, hw->sku);

	hw->tile_fuse = tile_disable;

	hw->pll.profiling_freq = PLL_PROFILING_FREQ_DEFAULT;

drivers/accel/ivpu/ivpu_job.c

+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static int ivpu_job_signal_and_destroy(struct ivpu_device *vdev, u32 job_id, u32 
		return -ENOENT;



	if (job->file_priv->has_mmu_faults)

		job_status = VPU_JSM_STATUS_ABORTED;

		job_status = DRM_IVPU_JOB_STATUS_ABORTED;



	job->bos[CMD_BUF_IDX]->job_status = job_status;

	dma_fence_signal(job->done_fence);
@@ -315,7 +315,7 @@ void ivpu_jobs_abort_all(struct ivpu_device *vdev) 
	unsigned long id;



	xa_for_each(&vdev->submitted_jobs_xa, id, job)

		ivpu_job_signal_and_destroy(vdev, id, VPU_JSM_STATUS_ABORTED);

		ivpu_job_signal_and_destroy(vdev, id, DRM_IVPU_JOB_STATUS_ABORTED);

}



static int ivpu_job_submit(struct ivpu_job *job)