Commit 67322d35 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-next-2025-05-08' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next 



UAPI Changes:
- Expose PCIe link downgrade attributes (Raag)

Cross-subsystem Changes:

Core Changes:
- gpusvm has_dma_mapping fix (Dafna)

Driver Changes:
- Forcewake hold fix (Tejas)
- Fix guc_info debugfs for VFs (Daniele)
- Fix devcoredump chunk alignment calculation (Arnd)
- Don't print timedout job message on killed exec queues (Matt Brost)
- Don't flush the GSC worker from the reset path (Daniele)
- Use copy_from_user() instead of __copy_from_user() (Harish)
- Only flush SVM garbage collector if CONFIG_DRM_XE_GPUSVM (Shuicheng)
- Fix forcewake vs runtime pm ref release ordering (Shuicheng)
- Move xe_device_sysfs_init() to xe_device_probe() (Raag)
- Append PCIe Gen5 limitations to xe_firmware document (Raag)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://lore.kernel.org/r/aBzUwbzCzz7Qo7fA@fedora
parents 8d782ad6 252c4711

Documentation/gpu/xe/xe_firmware.rst

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ GuC Power Conservation (PC) 
.. kernel-doc:: drivers/gpu/drm/xe/xe_guc_pc.c

   :doc: GuC Power Conservation (PC)



PCIe Gen5 Limitations

=====================



.. kernel-doc:: drivers/gpu/drm/xe/xe_device_sysfs.c

   :doc: PCIe Gen5 Limitations



Internal API

============

drivers/gpu/drm/xe/tests/xe_mocs.c

+5 −2
Original line number Diff line number Diff line
@@ -46,8 +46,11 @@ static void read_l3cc_table(struct xe_gt *gt, 
	unsigned int fw_ref, i;

	u32 reg_val;



	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);

	KUNIT_ASSERT_NE_MSG(test, fw_ref, 0, "Forcewake Failed.\n");

	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);

	if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL)) {

		xe_force_wake_put(gt_to_fw(gt), fw_ref);

		KUNIT_ASSERT_TRUE_MSG(test, true, "Forcewake Failed.\n");

	}



	for (i = 0; i < info->num_mocs_regs; i++) {

		if (!(i & 1)) {

drivers/gpu/drm/xe/xe_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -2569,7 +2569,7 @@ static int gem_create_user_ext_set_property(struct xe_device *xe, 
	int err;

	u32 idx;



	err = __copy_from_user(&ext, address, sizeof(ext));

	err = copy_from_user(&ext, address, sizeof(ext));

	if (XE_IOCTL_DBG(xe, err))

		return -EFAULT;
@@ -2606,7 +2606,7 @@ static int gem_create_user_extensions(struct xe_device *xe, struct xe_bo *bo, 
	if (XE_IOCTL_DBG(xe, ext_number >= MAX_USER_EXTENSIONS))

		return -E2BIG;



	err = __copy_from_user(&ext, address, sizeof(ext));

	err = copy_from_user(&ext, address, sizeof(ext));

	if (XE_IOCTL_DBG(xe, err))

		return -EFAULT;

drivers/gpu/drm/xe/xe_devcoredump.c

+9 −4
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ static ssize_t xe_devcoredump_read(char *buffer, loff_t offset, 
	struct xe_devcoredump *coredump = data;

	struct xe_devcoredump_snapshot *ss;

	ssize_t byte_copied;

	u32 chunk_offset;

	ssize_t new_chunk_position;



	if (!coredump)

		return -ENODEV;
@@ -201,10 +203,14 @@ static ssize_t xe_devcoredump_read(char *buffer, loff_t offset, 
		return 0;

	}



	new_chunk_position = div_u64_rem(offset,

					 XE_DEVCOREDUMP_CHUNK_MAX,

					 &chunk_offset);



	if (offset >= ss->read.chunk_position + XE_DEVCOREDUMP_CHUNK_MAX ||

	    offset < ss->read.chunk_position) {

		ss->read.chunk_position =

			ALIGN_DOWN(offset, XE_DEVCOREDUMP_CHUNK_MAX);

		ss->read.chunk_position = new_chunk_position *

			XE_DEVCOREDUMP_CHUNK_MAX;



		__xe_devcoredump_read(ss->read.buffer,

				      XE_DEVCOREDUMP_CHUNK_MAX,
@@ -213,8 +219,7 @@ static ssize_t xe_devcoredump_read(char *buffer, loff_t offset, 


	byte_copied = count < ss->read.size - offset ? count :

		ss->read.size - offset;

	memcpy(buffer, ss->read.buffer +

	       (offset % XE_DEVCOREDUMP_CHUNK_MAX), byte_copied);

	memcpy(buffer, ss->read.buffer + chunk_offset, byte_copied);



	mutex_unlock(&coredump->lock);

drivers/gpu/drm/xe/xe_device.c

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "xe_bo_evict.h"

#include "xe_debugfs.h"

#include "xe_devcoredump.h"

#include "xe_device_sysfs.h"

#include "xe_dma_buf.h"

#include "xe_drm_client.h"

#include "xe_drv.h"
@@ -915,6 +916,10 @@ int xe_device_probe(struct xe_device *xe) 
	if (err)

		goto err_unregister_display;



	err = xe_device_sysfs_init(xe);

	if (err)

		goto err_unregister_display;



	xe_debugfs_register(xe);



	err = xe_hwmon_register(xe);