Commit 6de6674c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2025-05-03' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "Weekly drm fixes, amdgpu and xe as usual, the new adp driver has a
  bunch of vblank fixes, then a bunch of small fixes across the board.

  Seems about the right level for this time in the release cycle.

  ttm:
   - docs warning fix

  kunit
   - fix leak in shmem tests

  fdinfo:
   - driver unbind race fix

  amdgpu:
   - Fix possible UAF in HDCP
   - XGMI dma-buf fix
   - NBIO 7.11 fix
   - VCN 5.0.1 fix

  xe:
   - EU stall locking fix and disabling on VF
   - Documentation fix kernel version supporting hwmon entries
   - SVM fixes on error handling

  i915:
   - Fix build for CONFIG_DRM_I915_PXP=n

  nouveau:
   - fix race condition in fence handling

  ivpu:
   - interrupt handling fix
   - D0i2 test mode fix

  adp:
   - vblank fixes

  mipi-dbi:
   - timing fix"

* tag 'drm-fixes-2025-05-03' of https://gitlab.freedesktop.org/drm/kernel: (23 commits)
  drm/gpusvm: set has_dma_mapping inside mapping loop
  drm/xe/hwmon: Fix kernel version documentation for temperature
  drm/xe/eustall: Do not support EU stall on SRIOV VF
  drm/xe/eustall: Resolve a possible circular locking dependency
  drm/amdgpu: Add DPG pause for VCN v5.0.1
  drm/amdgpu: Fix offset for HDP remap in nbio v7.11
  drm/amdgpu: Fail DMABUF map of XGMI-accessible memory
  drm/amd/display: Fix slab-use-after-free in hdcp
  drm/mipi-dbi: Fix blanking for non-16 bit formats
  drm/tests: shmem: Fix memleak
  drm/xe/guc: Fix capture of steering registers
  drm/xe/svm: fix dereferencing error pointer in drm_gpusvm_range_alloc()
  drm: Select DRM_KMS_HELPER from DRM_DEBUG_DP_MST_TOPOLOGY_REFS
  drm: adp: Remove pointless irq_lock spin lock
  drm: adp: Enable vblank interrupts in crtc's .atomic_enable
  drm: adp: Handle drm_crtc_vblank_get() errors
  drm: adp: Use spin_lock_irqsave for drm device event_lock
  drm/fdinfo: Protect against driver unbind
  drm/ttm: fix the warning for hit_low and evict_low
  accel/ivpu: Fix the D0i2 disable test mode
  ...
parents 00b827f0 4e6de6b8

Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ Description: RO. Package current voltage in millivolt. 


What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/temp2_input

Date:		March 2025

KernelVersion:	6.14

KernelVersion:	6.15

Contact:	intel-xe@lists.freedesktop.org

Description:	RO. Package temperature in millidegree Celsius.
@@ -119,7 +119,7 @@ Description: RO. Package temperature in millidegree Celsius. 


What:		/sys/bus/pci/drivers/xe/.../hwmon/hwmon<i>/temp3_input

Date:		March 2025

KernelVersion:	6.14

KernelVersion:	6.15

Contact:	intel-xe@lists.freedesktop.org

Description:	RO. VRAM temperature in millidegree Celsius.

drivers/accel/ivpu/ivpu_fw.c

+2 −2
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ static void ivpu_fw_boot_params_print(struct ivpu_device *vdev, struct vpu_boot_ 
		 boot_params->d0i3_entry_vpu_ts);

	ivpu_dbg(vdev, FW_BOOT, "boot_params.system_time_us = %llu\n",

		 boot_params->system_time_us);

	ivpu_dbg(vdev, FW_BOOT, "boot_params.power_profile = %u\n",

	ivpu_dbg(vdev, FW_BOOT, "boot_params.power_profile = 0x%x\n",

		 boot_params->power_profile);

}
@@ -646,7 +646,7 @@ void ivpu_fw_boot_params_setup(struct ivpu_device *vdev, struct vpu_boot_params 
	boot_params->d0i3_residency_time_us = 0;

	boot_params->d0i3_entry_vpu_ts = 0;

	if (IVPU_WA(disable_d0i2))

		boot_params->power_profile = 1;

		boot_params->power_profile |= BIT(1);



	boot_params->system_time_us = ktime_to_us(ktime_get_real());

	wmb(); /* Flush WC buffers after writing bootparams */

drivers/accel/ivpu/ivpu_hw_btrs.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#define PLL_PROFILING_FREQ_DEFAULT   38400000

#define PLL_PROFILING_FREQ_HIGH      400000000



#define DCT_DEFAULT_ACTIVE_PERCENT 15u

#define DCT_DEFAULT_ACTIVE_PERCENT 30u

#define DCT_PERIOD_US		   35300u



int ivpu_hw_btrs_info_init(struct ivpu_device *vdev);

drivers/accel/ivpu/ivpu_pm.c

+10 −8
Original line number Diff line number Diff line
@@ -428,16 +428,17 @@ int ivpu_pm_dct_enable(struct ivpu_device *vdev, u8 active_percent) 
	active_us = (DCT_PERIOD_US * active_percent) / 100;

	inactive_us = DCT_PERIOD_US - active_us;



	vdev->pm->dct_active_percent = active_percent;



	ivpu_dbg(vdev, PM, "DCT requested %u%% (D0: %uus, D0i2: %uus)\n",

		 active_percent, active_us, inactive_us);



	ret = ivpu_jsm_dct_enable(vdev, active_us, inactive_us);

	if (ret) {

		ivpu_err_ratelimited(vdev, "Failed to enable DCT: %d\n", ret);

		return ret;

	}



	vdev->pm->dct_active_percent = active_percent;



	ivpu_dbg(vdev, PM, "DCT set to %u%% (D0: %uus, D0i2: %uus)\n",

		 active_percent, active_us, inactive_us);

	return 0;

}
@@ -445,15 +446,16 @@ int ivpu_pm_dct_disable(struct ivpu_device *vdev) 
{

	int ret;



	vdev->pm->dct_active_percent = 0;



	ivpu_dbg(vdev, PM, "DCT requested to be disabled\n");



	ret = ivpu_jsm_dct_disable(vdev);

	if (ret) {

		ivpu_err_ratelimited(vdev, "Failed to disable DCT: %d\n", ret);

		return ret;

	}



	vdev->pm->dct_active_percent = 0;



	ivpu_dbg(vdev, PM, "DCT disabled\n");

	return 0;

}
@@ -466,7 +468,7 @@ void ivpu_pm_irq_dct_work_fn(struct work_struct *work) 
	if (ivpu_hw_btrs_dct_get_request(vdev, &enable))

		return;



	if (vdev->pm->dct_active_percent)

	if (enable)

		ret = ivpu_pm_dct_enable(vdev, DCT_DEFAULT_ACTIVE_PERCENT);

	else

		ret = ivpu_pm_dct_disable(vdev);

drivers/gpu/drm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ config DRM_DEBUG_DP_MST_TOPOLOGY_REFS 
        bool "Enable refcount backtrace history in the DP MST helpers"

	depends on STACKTRACE_SUPPORT

        select STACKDEPOT

        depends on DRM_KMS_HELPER

        select DRM_KMS_HELPER

        depends on DEBUG_KERNEL

        depends on EXPERT

        help