Commit cc8ed4d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2024-06-01' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "This is the weekly fixes. Lots of small fixes across the board, one
  BUG_ON fix in shmem seems most important, otherwise amdgpu, i915, xe
  mostly with small fixes to all the other drivers.

  shmem:
   - fix BUG_ON in COW handling
   - warn when trying to pin imported objects

  buddy:
   - fix page size handling

  dma-buf:
   - sw-sync: Don't interfere with IRQ handling
   - fix kthreads-handling error path

  i915:
   - fix a race in audio component by registering it later
   - make DPT object unshrinkable to avoid shrinking when framebuffer
     has not shrunk
   - fix CCS id calculation to fix a perf regression
   - fix selftest caching mode
   - fix FIELD_PREP compiler warnings
   - fix indefinite wait for GT wakeref release
   - revert overeager multi-gt pm reference removal

  xe:
   - pcode polling timeout change
   - fix for deadlocks for faulting VMs
   - error-path lock imbalance fix

  amdgpu:
   - RAS fix
   - fix colorspace property for MST connectors
   - fix for PCIe DPM
   - silence UBSAN warning
   - GPUVM robustness fix
   - partition fix
   - drop deprecated I2C_CLASS_SPD

  amdkfd:
   - revert unused changes for certain 11.0.3 devices
   - simplify APU VRAM handling

  lima:
   - fix dma_resv-related deadlock in object pin

  msm:
   - remove build-time dependency on Python 3.9

  nouveau:
   - nvif: Fix possible integer overflow

  panel:
   - lg-sw43408: Select DP helpers; Declare backlight ops as static
   - sitronix-st7789v: Various fixes for jt240mhqs_hwt_ek_e3 panel

  panfrost:
   - fix dma_resv-related deadlock in object pin"

* tag 'drm-fixes-2024-06-01' of https://gitlab.freedesktop.org/drm/kernel: (35 commits)
  drm/msm: remove python 3.9 dependency for compiling msm
  drm/panel: sitronix-st7789v: fix display size for jt240mhqs_hwt_ek_e3 panel
  drm/panel: sitronix-st7789v: tweak timing for jt240mhqs_hwt_ek_e3 panel
  drm/panel: sitronix-st7789v: fix timing for jt240mhqs_hwt_ek_e3 panel
  drm/amd/pm: remove deprecated I2C_CLASS_SPD support from newly added SMU_14_0_2
  drm/amdgpu: Make CPX mode auto default in NPS4
  drm/amdkfd: simplify APU VRAM handling
  Revert "drm/amdkfd: fix gfx_target_version for certain 11.0.3 devices"
  drm/amdgpu: fix dereference null return value for the function amdgpu_vm_pt_parent
  drm/amdgpu: silence UBSAN warning
  drm/amdgpu: Adjust logic in amdgpu_device_partner_bandwidth()
  drm/i915: Fix audio component initialization
  drm/i915/dpt: Make DPT object unshrinkable
  drm/i915/gt: Fix CCS id's calculation for CCS mode setting
  drm/panel/lg-sw43408: mark sw43408_backlight_ops as static
  drm/i915/selftests: Set always_coherent to false when reading from CPU
  drm/panel/lg-sw43408: select CONFIG_DRM_DISPLAY_DP_HELPER
  drm/i915/guc: avoid FIELD_PREP warning
  drm/i915/gt: Disarm breadcrumbs if engines are already idle
  Revert "drm/i915: Remove extra multi-gt pm-references"
  ...
parents 1b907b83 a2ce3f77

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

+6 −0
Original line number Diff line number Diff line
@@ -540,6 +540,12 @@ static int race_signal_callback(void *arg) 
			t[i].before = pass;

			t[i].task = kthread_run(thread_signal_callback, &t[i],

						"dma-fence:%d", i);

			if (IS_ERR(t[i].task)) {

				ret = PTR_ERR(t[i].task);

				while (--i >= 0)

					kthread_stop_put(t[i].task);

				return ret;

			}

			get_task_struct(t[i].task);

		}

drivers/dma-buf/sync_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -110,12 +110,12 @@ static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj) 


	seq_printf(s, "%s: %d\n", obj->name, obj->value);



	spin_lock_irq(&obj->lock);

	spin_lock(&obj->lock); /* Caller already disabled IRQ. */

	list_for_each(pos, &obj->pt_list) {

		struct sync_pt *pt = container_of(pos, struct sync_pt, link);

		sync_print_fence(s, &pt->base, false);

	}

	spin_unlock_irq(&obj->lock);

	spin_unlock(&obj->lock);

}



static void sync_print_sync_file(struct seq_file *s,

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

+8 −8
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ int amdgpu_amdkfd_reserve_mem_limit(struct amdgpu_device *adev, 
			return -EINVAL;



		vram_size = KFD_XCP_MEMORY_SIZE(adev, xcp_id);

		if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) {

		if (adev->flags & AMD_IS_APU) {

			system_mem_needed = size;

			ttm_mem_needed = size;

		}
@@ -233,7 +233,7 @@ int amdgpu_amdkfd_reserve_mem_limit(struct amdgpu_device *adev, 
	if (adev && xcp_id >= 0) {

		adev->kfd.vram_used[xcp_id] += vram_needed;

		adev->kfd.vram_used_aligned[xcp_id] +=

				(adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) ?

				(adev->flags & AMD_IS_APU) ?

				vram_needed :

				ALIGN(vram_needed, VRAM_AVAILABLITY_ALIGN);

	}
@@ -261,7 +261,7 @@ void amdgpu_amdkfd_unreserve_mem_limit(struct amdgpu_device *adev, 


		if (adev) {

			adev->kfd.vram_used[xcp_id] -= size;

			if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) {

			if (adev->flags & AMD_IS_APU) {

				adev->kfd.vram_used_aligned[xcp_id] -= size;

				kfd_mem_limit.system_mem_used -= size;

				kfd_mem_limit.ttm_mem_used -= size;
@@ -890,7 +890,7 @@ static int kfd_mem_attach(struct amdgpu_device *adev, struct kgd_mem *mem, 
	 * if peer device has large BAR. In contrast, access over xGMI is

	 * allowed for both small and large BAR configurations of peer device

	 */

	if ((adev != bo_adev && !(adev->gmc.is_app_apu || adev->flags & AMD_IS_APU)) &&

	if ((adev != bo_adev && !(adev->flags & AMD_IS_APU)) &&

	    ((mem->domain == AMDGPU_GEM_DOMAIN_VRAM) ||

	     (mem->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL) ||

	     (mem->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_MMIO_REMAP))) {
@@ -1658,7 +1658,7 @@ size_t amdgpu_amdkfd_get_available_memory(struct amdgpu_device *adev, 
		- atomic64_read(&adev->vram_pin_size)

		- reserved_for_pt;



	if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) {

	if (adev->flags & AMD_IS_APU) {

		system_mem_available = no_system_mem_limit ?

					kfd_mem_limit.max_system_mem_limit :

					kfd_mem_limit.max_system_mem_limit -
@@ -1706,7 +1706,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
	if (flags & KFD_IOC_ALLOC_MEM_FLAGS_VRAM) {

		domain = alloc_domain = AMDGPU_GEM_DOMAIN_VRAM;



		if (adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) {

		if (adev->flags & AMD_IS_APU) {

			domain = AMDGPU_GEM_DOMAIN_GTT;

			alloc_domain = AMDGPU_GEM_DOMAIN_GTT;

			alloc_flags = 0;
@@ -1953,7 +1953,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( 
	if (size) {

		if (!is_imported &&

		   (mem->bo->preferred_domains == AMDGPU_GEM_DOMAIN_VRAM ||

		   ((adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) &&

		   ((adev->flags & AMD_IS_APU) &&

		    mem->bo->preferred_domains == AMDGPU_GEM_DOMAIN_GTT)))

			*size = bo_size;

		else
@@ -2376,7 +2376,7 @@ static int import_obj_create(struct amdgpu_device *adev, 
	(*mem)->bo = bo;

	(*mem)->va = va;

	(*mem)->domain = (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) &&

			 !(adev->gmc.is_app_apu || adev->flags & AMD_IS_APU) ?

			 !(adev->flags & AMD_IS_APU) ?

			 AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT;



	(*mem)->mapped_to_gpu_memory = 0;

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

+12 −7
Original line number Diff line number Diff line
@@ -5944,6 +5944,7 @@ static void amdgpu_device_partner_bandwidth(struct amdgpu_device *adev, 
	*speed = PCI_SPEED_UNKNOWN;

	*width = PCIE_LNK_WIDTH_UNKNOWN;



	if (amdgpu_device_pcie_dynamic_switching_supported(adev)) {

		while ((parent = pci_upstream_bridge(parent))) {

			/* skip upstream/downstream switches internal to dGPU*/

			if (parent->vendor == PCI_VENDOR_ID_ATI)
@@ -5952,6 +5953,10 @@ static void amdgpu_device_partner_bandwidth(struct amdgpu_device *adev, 
			*width = pcie_get_width_cap(parent);

			break;

		}

	} else {

		/* use the current speeds rather than max if switching is not supported */

		pcie_bandwidth_available(adev->pdev, NULL, speed, width);

	}

}



/**

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct amdgpu_iv_entry; 
#define AMDGPU_RAS_GPU_ERR_HBM_BIST_TEST(x)		AMDGPU_GET_REG_FIELD(x, 7, 7)

#define AMDGPU_RAS_GPU_ERR_SOCKET_ID(x)			AMDGPU_GET_REG_FIELD(x, 10, 8)

#define AMDGPU_RAS_GPU_ERR_AID_ID(x)			AMDGPU_GET_REG_FIELD(x, 12, 11)

#define AMDGPU_RAS_GPU_ERR_HBM_ID(x)			AMDGPU_GET_REG_FIELD(x, 13, 13)

#define AMDGPU_RAS_GPU_ERR_HBM_ID(x)			AMDGPU_GET_REG_FIELD(x, 14, 13)

#define AMDGPU_RAS_GPU_ERR_BOOT_STATUS(x)		AMDGPU_GET_REG_FIELD(x, 31, 31)



#define AMDGPU_RAS_BOOT_STATUS_POLLING_LIMIT	1000