Commit 900241a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2025-04-11-1' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "Weekly fixes, as expected it has a bit more in it than probably usual
  for rc2. amdgpu/xe/i915 lead the way with fixes all over for a bunch
  of other drivers. Nothing major stands out from what I can see.

  tests:
   - Clean up struct drm_display_mode in various places

  i915:
   - Fix scanline offset for LNL+ and BMG+
   - Fix GVT unterminated-string-initialization build warning
   - Fix DP rate limit when sink doesn't support TPS4
   - Handle GDDR + ECC memory type detection
   - Fix VRR parameter change check
   - Fix fence not released on early probe errors
   - Disable render power gating during live selftests

  xe:
   - Add another BMG PCI ID
   - Fix UAFs on migration paths
   - Fix shift-out-of-bounds access on TLB invalidation
   - Ensure ccs_mode is correctly set on gt reset
   - Extend some HW workarounds to Xe3
   - Fix PM runtime get/put on sysfs files
   - Fix u64 division on 32b
   - Fix flickering due to missing L3 invalidations
   - Fix missing error code return

  amdgpu:
   - MES FW version caching fixes
   - Only use GTT as a fallback if we already have a backing store
   - dma_buf fix
   - IP discovery fix
   - Replay and PSR with VRR fix
   - DC FP fixes
   - eDP fixes
   - KIQ TLB invalidate fix
   - Enable dmem groups support
   - Allow pinning VRAM dma bufs if imports can do P2P
   - Workload profile fixes
   - Prevent possible division by 0 in fan handling

  amdkfd:
   - Queue reset fixes

  imagination:
   - Fix overflow
   - Fix use-after-free

  ivpu:
   - Fix suspend/resume

  nouveau:
   - Do not deref dangling pointer

  rockchip:
   - Set DP/HDMI registers correctly

  udmabuf:
   - Fix overflow

  virtgpu:
   - Set reservation lock on dma-buf import
   - Fix error handling in prepare_fb"

* tag 'drm-fixes-2025-04-11-1' of https://gitlab.freedesktop.org/drm/kernel: (58 commits)
  drm/rockchip: dw_hdmi_qp: Fix io init for dw_hdmi_qp_rockchip_resume
  drm/rockchip: vop2: Fix interface enable/mux setting of DP1 on rk3588
  drm/amdgpu/mes12: optimize MES pipe FW version fetching
  drm/amd/pm/smu11: Prevent division by zero
  drm/amdgpu: cancel gfx idle work in device suspend for s0ix
  drm/amd/display: pause the workload setting in dm
  drm/amdgpu/pm/swsmu: implement pause workload profile
  drm/amdgpu/pm: add workload profile pause helper
  drm/i915/huc: Fix fence not released on early probe errors
  drm/i915/vrr: Add vrr.vsync_{start, end} in vrr_params_changed
  drm/tests: probe-helper: Fix drm_display_mode memory leak
  drm/tests: modes: Fix drm_display_mode memory leak
  drm/tests: modes: Fix drm_display_mode memory leak
  drm/tests: cmdline: Fix drm_display_mode memory leak
  drm/tests: modeset: Fix drm_display_mode memory leak
  drm/tests: modeset: Fix drm_display_mode memory leak
  drm/tests: helpers: Create kunit helper to destroy a drm_display_mode
  drm/xe: Restore EIO errno return when GuC PC start fails
  drm/xe: Invalidate L3 read-only cachelines for geometry streams too
  drm/xe: avoid plain 64-bit division
  ...
parents ef778588 485442c6

drivers/accel/ivpu/ivpu_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ ivpu_force_recovery_fn(struct file *file, const char __user *user_buf, size_t si 
		return -EINVAL;



	ret = ivpu_rpm_get(vdev);

	if (ret)

	if (ret < 0)

		return ret;



	ivpu_pm_trigger_recovery(vdev, "debugfs");
@@ -383,7 +383,7 @@ static int dct_active_set(void *data, u64 active_percent) 
		return -EINVAL;



	ret = ivpu_rpm_get(vdev);

	if (ret)

	if (ret < 0)

		return ret;



	if (active_percent)

drivers/accel/ivpu/ivpu_ipc.c

+2 −1
Original line number Diff line number Diff line
@@ -302,7 +302,8 @@ ivpu_ipc_send_receive_internal(struct ivpu_device *vdev, struct vpu_jsm_msg *req 
	struct ivpu_ipc_consumer cons;

	int ret;



	drm_WARN_ON(&vdev->drm, pm_runtime_status_suspended(vdev->drm.dev));

	drm_WARN_ON(&vdev->drm, pm_runtime_status_suspended(vdev->drm.dev) &&

		    pm_runtime_enabled(vdev->drm.dev));



	ivpu_ipc_consumer_add(vdev, &cons, channel, NULL);

drivers/accel/ivpu/ivpu_ms.c

+24 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include <drm/drm_file.h>

#include <linux/pm_runtime.h>



#include "ivpu_drv.h"

#include "ivpu_gem.h"
@@ -44,6 +45,10 @@ int ivpu_ms_start_ioctl(struct drm_device *dev, void *data, struct drm_file *fil 
	    args->sampling_period_ns < MS_MIN_SAMPLE_PERIOD_NS)

		return -EINVAL;



	ret = ivpu_rpm_get(vdev);

	if (ret < 0)

		return ret;



	mutex_lock(&file_priv->ms_lock);



	if (get_instance_by_mask(file_priv, args->metric_group_mask)) {
@@ -96,6 +101,8 @@ int ivpu_ms_start_ioctl(struct drm_device *dev, void *data, struct drm_file *fil 
	kfree(ms);

unlock:

	mutex_unlock(&file_priv->ms_lock);



	ivpu_rpm_put(vdev);

	return ret;

}
@@ -160,6 +167,10 @@ int ivpu_ms_get_data_ioctl(struct drm_device *dev, void *data, struct drm_file * 
	if (!args->metric_group_mask)

		return -EINVAL;



	ret = ivpu_rpm_get(vdev);

	if (ret < 0)

		return ret;



	mutex_lock(&file_priv->ms_lock);



	ms = get_instance_by_mask(file_priv, args->metric_group_mask);
@@ -187,6 +198,7 @@ int ivpu_ms_get_data_ioctl(struct drm_device *dev, void *data, struct drm_file * 
unlock:

	mutex_unlock(&file_priv->ms_lock);



	ivpu_rpm_put(vdev);

	return ret;

}
@@ -204,11 +216,17 @@ int ivpu_ms_stop_ioctl(struct drm_device *dev, void *data, struct drm_file *file 
{

	struct ivpu_file_priv *file_priv = file->driver_priv;

	struct drm_ivpu_metric_streamer_stop *args = data;

	struct ivpu_device *vdev = file_priv->vdev;

	struct ivpu_ms_instance *ms;

	int ret;



	if (!args->metric_group_mask)

		return -EINVAL;



	ret = ivpu_rpm_get(vdev);

	if (ret < 0)

		return ret;



	mutex_lock(&file_priv->ms_lock);



	ms = get_instance_by_mask(file_priv, args->metric_group_mask);
@@ -217,6 +235,7 @@ int ivpu_ms_stop_ioctl(struct drm_device *dev, void *data, struct drm_file *file 


	mutex_unlock(&file_priv->ms_lock);



	ivpu_rpm_put(vdev);

	return ms ? 0 : -EINVAL;

}
@@ -281,6 +300,9 @@ int ivpu_ms_get_info_ioctl(struct drm_device *dev, void *data, struct drm_file * 
void ivpu_ms_cleanup(struct ivpu_file_priv *file_priv)

{

	struct ivpu_ms_instance *ms, *tmp;

	struct ivpu_device *vdev = file_priv->vdev;



	pm_runtime_get_sync(vdev->drm.dev);



	mutex_lock(&file_priv->ms_lock);
@@ -293,6 +315,8 @@ void ivpu_ms_cleanup(struct ivpu_file_priv *file_priv) 
		free_instance(file_priv, ms);



	mutex_unlock(&file_priv->ms_lock);



	pm_runtime_put_autosuspend(vdev->drm.dev);

}



void ivpu_ms_cleanup_all(struct ivpu_device *vdev)

drivers/dma-buf/udmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static long udmabuf_create(struct miscdevice *device, 
	if (!ubuf)

		return -ENOMEM;



	pglimit = (size_limit_mb * 1024 * 1024) >> PAGE_SHIFT;

	pglimit = ((u64)size_limit_mb * 1024 * 1024) >> PAGE_SHIFT;

	for (i = 0; i < head->count; i++) {

		pgoff_t subpgcnt;

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

+0 −1
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ enum amdgpu_kiq_irq { 
	AMDGPU_CP_KIQ_IRQ_DRIVER0 = 0,

	AMDGPU_CP_KIQ_IRQ_LAST

};

#define SRIOV_USEC_TIMEOUT  1200000 /* wait 12 * 100ms for SRIOV */

#define MAX_KIQ_REG_WAIT       5000 /* in usecs, 5ms */

#define MAX_KIQ_REG_BAILOUT_INTERVAL   5 /* in msecs, 5ms */

#define MAX_KIQ_REG_TRY 1000