Commit 2f5db9b4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-next-fixes-2026-02-05' of... 

Merge tag 'drm-xe-next-fixes-2026-02-05' of https://gitlab.freedesktop.org/drm/xe/kernel

 into drm-next

- Fix CFI violation in debugfs access (Daniele)
- Kernel-doc fixes (Chaitanya, Shuicheng)
- Disable D3Cold for BMG only on specific platforms (Karthik)

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/aYStaLZVJWwKCDZt@intel.com
parents 3c5ab240 666c654a

drivers/gpu/drm/xe/abi/guc_scheduler_abi.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include <linux/types.h>



/**

/*

 * Generic defines required for registration with and submissions to the GuC

 * scheduler. Includes engine class/instance defines and context attributes

 * (id, priority, etc)

drivers/gpu/drm/xe/xe_guc.c

+4 −2
Original line number Diff line number Diff line
@@ -1661,7 +1661,7 @@ void xe_guc_runtime_resume(struct xe_guc *guc) 
	xe_guc_submit_unpause(guc);

}



void xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p)

int xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p)

{

	struct xe_gt *gt = guc_to_gt(guc);

	u32 status;
@@ -1672,7 +1672,7 @@ void xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p) 
	if (!IS_SRIOV_VF(gt_to_xe(gt))) {

		CLASS(xe_force_wake, fw_ref)(gt_to_fw(gt), XE_FW_GT);

		if (!fw_ref.domains)

			return;

			return -EIO;



		status = xe_mmio_read32(&gt->mmio, GUC_STATUS);
@@ -1698,6 +1698,8 @@ void xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p) 


	drm_puts(p, "\n");

	xe_guc_submit_print(guc, p);



	return 0;

}



/**

drivers/gpu/drm/xe/xe_guc.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ int xe_guc_self_cfg32(struct xe_guc *guc, u16 key, u32 val); 
int xe_guc_self_cfg64(struct xe_guc *guc, u16 key, u64 val);

void xe_guc_irq_handler(struct xe_guc *guc, const u16 iir);

void xe_guc_sanitize(struct xe_guc *guc);

void xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p);

int xe_guc_print_info(struct xe_guc *guc, struct drm_printer *p);

int xe_guc_reset_prepare(struct xe_guc *guc);

void xe_guc_reset_wait(struct xe_guc *guc);

void xe_guc_stop_prepare(struct xe_guc *guc);

drivers/gpu/drm/xe/xe_migrate.c

+1 −1
Original line number Diff line number Diff line
@@ -1254,7 +1254,7 @@ void xe_migrate_ccs_rw_copy_clear(struct xe_bo *src_bo, 
}



/**

 * xe_get_migrate_exec_queue() - Get the execution queue from migrate context.

 * xe_migrate_exec_queue() - Get the execution queue from migrate context.

 * @migrate: Migrate context.

 *

 * Return: Pointer to execution queue on success, error on failure

drivers/gpu/drm/xe/xe_pm.c

+10 −3
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/fault-inject.h>

#include <linux/pm_runtime.h>

#include <linux/suspend.h>

#include <linux/dmi.h>



#include <drm/drm_managed.h>

#include <drm/ttm/ttm_placement.h>
@@ -366,9 +367,15 @@ ALLOW_ERROR_INJECTION(xe_pm_init_early, ERRNO); /* See xe_pci_probe() */ 


static u32 vram_threshold_value(struct xe_device *xe)

{

	/* FIXME: D3Cold temporarily disabled by default on BMG */

	if (xe->info.platform == XE_BATTLEMAGE)

	if (xe->info.platform == XE_BATTLEMAGE) {

		const char *product_name;



		product_name = dmi_get_system_info(DMI_PRODUCT_NAME);

		if (product_name && strstr(product_name, "NUC13RNG")) {

			drm_warn(&xe->drm, "BMG + D3Cold not supported on this platform\n");

			return 0;

		}

	}



	return DEFAULT_VRAM_THRESHOLD;

}