Commit 93413c84 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2022-05-21' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Few final fixes for 5.18, one amdgpu, core dp mst leak fix, dma-buf
  two fixes, and i915 has a few fixes, one for a regression on older
  GM45 chipsets,

  dma-buf:
   - ioctl userspace use fix
   - fix dma-buf sysfs name generation

  core:
   - dp/mst leak fix

  amdgpu:
   - suspend/resume regression fix

  i915:
   - fix for #5806: GPU hangs and display artifacts on Intel GM45
   - reject DMC with out-of-spec MMIO
   - correctly mark guilty contexts on GuC reset"

* tag 'drm-fixes-2022-05-21' of git://anongit.freedesktop.org/drm/drm:
  drm/i915: Use i915_gem_object_ggtt_pin_ww for reloc_iomap
  drm/amd: Don't reset dGPUs if the system is going to s2idle
  drm/dp/mst: fix a possible memory leak in fetch_monitor_name()
  dma-buf: fix use of DMA_BUF_SET_NAME_{A,B} in userspace
  i915/guc/reset: Make __guc_reset_context aware of guilty engines
  drm/i915/dmc: Add MMIO range restrictions
  dma-buf: ensure unique directory name for dmabuf stats
parents 3ac6487e 64eea680

drivers/dma-buf/dma-buf.c

+8 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ static inline int is_dma_buf_file(struct file *file) 


static struct file *dma_buf_getfile(struct dma_buf *dmabuf, int flags)

{

	static atomic64_t dmabuf_inode = ATOMIC64_INIT(0);

	struct file *file;

	struct inode *inode = alloc_anon_inode(dma_buf_mnt->mnt_sb);
@@ -416,6 +417,13 @@ static struct file *dma_buf_getfile(struct dma_buf *dmabuf, int flags) 
	inode->i_size = dmabuf->size;

	inode_set_bytes(inode, dmabuf->size);



	/*

	 * The ->i_ino acquired from get_next_ino() is not unique thus

	 * not suitable for using it as dentry name by dmabuf stats.

	 * Override ->i_ino with the unique and dmabuffs specific

	 * value.

	 */

	inode->i_ino = atomic64_add_return(1, &dmabuf_inode);

	file = alloc_file_pseudo(inode, dma_buf_mnt, "dmabuf",

				 flags, &dma_buf_fops);

	if (IS_ERR(file))

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

+2 −0
Original line number Diff line number Diff line
@@ -1342,9 +1342,11 @@ static inline int amdgpu_acpi_smart_shift_update(struct drm_device *dev, 


#if defined(CONFIG_ACPI) && defined(CONFIG_SUSPEND)

bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);

bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev);

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);

#else

static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }

static inline bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev) { return false; }

static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }

#endif

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

+14 −0
Original line number Diff line number Diff line
@@ -1045,6 +1045,20 @@ bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) 
		(pm_suspend_target_state == PM_SUSPEND_MEM);

}



/**

 * amdgpu_acpi_should_gpu_reset

 *

 * @adev: amdgpu_device_pointer

 *

 * returns true if should reset GPU, false if not

 */

bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev)

{

	if (adev->flags & AMD_IS_APU)

		return false;

	return pm_suspend_target_state != PM_SUSPEND_TO_IDLE;

}



/**

 * amdgpu_acpi_is_s0ix_active

 *

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

+1 −1
Original line number Diff line number Diff line
@@ -2336,7 +2336,7 @@ static int amdgpu_pmops_suspend_noirq(struct device *dev) 
	struct drm_device *drm_dev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(drm_dev);



	if (!adev->in_s0ix)

	if (amdgpu_acpi_should_gpu_reset(adev))

		return amdgpu_asic_reset(adev);



	return 0;

drivers/gpu/drm/dp/drm_dp_mst_topology.c

+1 −0
Original line number Diff line number Diff line
@@ -4852,6 +4852,7 @@ static void fetch_monitor_name(struct drm_dp_mst_topology_mgr *mgr, 


	mst_edid = drm_dp_mst_get_edid(port->connector, mgr, port);

	drm_edid_get_monitor_name(mst_edid, name, namelen);

	kfree(mst_edid);

}



/**