Commit 1639fae5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2023-06-17' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "A bunch of misc fixes across the board.

  amdgpu is the usual bulk with a revert and other fixes, nouveau has a
  race fix that was causing a UAF that was hard hanging systems,
  otherwise some qaic, bridge and radeon.

  amdgpu:
   - GFX9 preemption fixes
   - Add missing radeon secondary PCI ID
   - vblflash fixes
   - SMU 13 fix
   - VCN 4.0 fix
   - Re-enable TOPDOWN flag for large BAR systems to fix regression
   - eDP fix
   - PSR hang fix
   - DPIA fix

  radeon:
   - fbdev client warning fix

  qaic:
   - leak fix
   - null ptr deref fix

  nouveau:
   - use-after-free caused by fence race fix
   - runtime pm fix
   - NULL ptr checks

  bridge:
   - ti-sn65dsi86: Avoid possible buffer overflow"

* tag 'drm-fixes-2023-06-17' of git://anongit.freedesktop.org/drm/drm: (21 commits)
  nouveau: fix client work fence deletion race
  drm/amd/display: limit DPIA link rate to HBR3
  drm/amd/display: fix the system hang while disable PSR
  drm/amd/display: edp do not add non-edid timings
  Revert "drm/amdgpu: remove TOPDOWN flags when allocating VRAM in large bar system"
  drm/amdgpu: vcn_4_0 set instance 0 init sched score to 1
  drm/radeon: Disable outputs when releasing fbdev client
  drm/amd/pm: workaround for compute workload type on some skus
  drm/amd: Tighten permissions on VBIOS flashing attributes
  drm/amd: Make sure image is written to trigger VBIOS image update flow
  drm/amdgpu: add missing radeon secondary PCI ID
  drm/amdgpu: Implement gfx9 patch functions for resubmission
  drm/amdgpu: Modify indirect buffer packages for resubmission
  drm/amdgpu: Program gds backup address as zero if no gds allocated
  drm/nouveau: add nv_encoder pointer check for NULL
  drm/amdgpu: Reset CP_VMID_PREEMPT after trailing fence signaled
  drm/nouveau/dp: check for NULL nv_connector->native_mode
  drm/bridge: ti-sn65dsi86: Avoid possible buffer overflow
  drm/nouveau: don't detect DSM for non-NVIDIA device
  accel/qaic: Fix NULL pointer deref in qaic_destroy_drm_device()
  ...
parents ba00b190 9930f518

drivers/accel/qaic/qaic_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ static int qaic_open(struct drm_device *dev, struct drm_file *file) 


cleanup_usr:

	cleanup_srcu_struct(&usr->qddev_lock);

	ida_free(&qaic_usrs, usr->handle);

free_usr:

	kfree(usr);

dev_unlock:
@@ -224,6 +225,9 @@ static void qaic_destroy_drm_device(struct qaic_device *qdev, s32 partition_id) 
	struct qaic_user *usr;



	qddev = qdev->qddev;

	qdev->qddev = NULL;

	if (!qddev)

		return;



	/*

	 * Existing users get unresolvable errors till they close FDs.

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

+1 −0
Original line number Diff line number Diff line
@@ -1615,6 +1615,7 @@ static const u16 amdgpu_unsupported_pciidlist[] = { 
	0x5874,

	0x5940,

	0x5941,

	0x5b70,

	0x5b72,

	0x5b73,

	0x5b74,

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

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ void amdgpu_bo_placement_from_domain(struct amdgpu_bo *abo, u32 domain) 


		if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED)

			places[c].lpfn = visible_pfn;

		else if (adev->gmc.real_vram_size != adev->gmc.visible_vram_size)

		else

			places[c].flags |= TTM_PL_FLAG_TOPDOWN;



		if (flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)

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

+5 −2
Original line number Diff line number Diff line
@@ -3548,6 +3548,9 @@ static ssize_t amdgpu_psp_vbflash_read(struct file *filp, struct kobject *kobj, 
	void *fw_pri_cpu_addr;

	int ret;



	if (adev->psp.vbflash_image_size == 0)

		return -EINVAL;



	dev_info(adev->dev, "VBIOS flash to PSP started");



	ret = amdgpu_bo_create_kernel(adev, adev->psp.vbflash_image_size,
@@ -3599,13 +3602,13 @@ static ssize_t amdgpu_psp_vbflash_status(struct device *dev, 
}



static const struct bin_attribute psp_vbflash_bin_attr = {

	.attr = {.name = "psp_vbflash", .mode = 0664},

	.attr = {.name = "psp_vbflash", .mode = 0660},

	.size = 0,

	.write = amdgpu_psp_vbflash_write,

	.read = amdgpu_psp_vbflash_read,

};



static DEVICE_ATTR(psp_vbflash_status, 0444, amdgpu_psp_vbflash_status, NULL);

static DEVICE_ATTR(psp_vbflash_status, 0440, amdgpu_psp_vbflash_status, NULL);



int amdgpu_psp_sysfs_init(struct amdgpu_device *adev)

{

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

+18 −0
Original line number Diff line number Diff line
@@ -581,3 +581,21 @@ void amdgpu_ring_ib_end(struct amdgpu_ring *ring) 
	if (ring->is_sw_ring)

		amdgpu_sw_ring_ib_end(ring);

}



void amdgpu_ring_ib_on_emit_cntl(struct amdgpu_ring *ring)

{

	if (ring->is_sw_ring)

		amdgpu_sw_ring_ib_mark_offset(ring, AMDGPU_MUX_OFFSET_TYPE_CONTROL);

}



void amdgpu_ring_ib_on_emit_ce(struct amdgpu_ring *ring)

{

	if (ring->is_sw_ring)

		amdgpu_sw_ring_ib_mark_offset(ring, AMDGPU_MUX_OFFSET_TYPE_CE);

}



void amdgpu_ring_ib_on_emit_de(struct amdgpu_ring *ring)

{

	if (ring->is_sw_ring)

		amdgpu_sw_ring_ib_mark_offset(ring, AMDGPU_MUX_OFFSET_TYPE_DE);

}