Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/xe: Keep all defaults in single header
We already have most of Xe defaults defined in xe_module.c,
where we use them for the modparam initializations, but some
were defined elsewhere, which breaks the consistency.
Introduce xe_defaults.h file, that will act as a placeholder
for all our default values, and can be used from other places.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Piotr Piórkowski <piotr.piorkowski@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/20260121214218.2817-2-michal.wajdeczko@intel.com
+41
-32
+25
drivers/gpu/drm/xe/xe_defaults.h
+25
drivers/gpu/drm/xe/xe_defaults.h
···
1
+
/* SPDX-License-Identifier: MIT */
2
+
/*
3
+
* Copyright © 2026 Intel Corporation
4
+
*/
5
+
#ifndef _XE_DEFAULTS_H_
6
+
#define _XE_DEFAULTS_H_
7
+
8
+
#include "xe_device_types.h"
9
+
10
+
#if IS_ENABLED(CONFIG_DRM_XE_DEBUG)
11
+
#define XE_DEFAULT_GUC_LOG_LEVEL 3
12
+
#else
13
+
#define XE_DEFAULT_GUC_LOG_LEVEL 1
14
+
#endif
15
+
16
+
#define XE_DEFAULT_PROBE_DISPLAY true
17
+
#define XE_DEFAULT_VRAM_BAR_SIZE 0
18
+
#define XE_DEFAULT_FORCE_PROBE CONFIG_DRM_XE_FORCE_PROBE
19
+
#define XE_DEFAULT_MAX_VFS ~0
20
+
#define XE_DEFAULT_MAX_VFS_STR "unlimited"
21
+
#define XE_DEFAULT_WEDGED_MODE XE_WEDGED_MODE_UPON_CRITICAL_ERROR
22
+
#define XE_DEFAULT_WEDGED_MODE_STR "upon-critical-error"
23
+
#define XE_DEFAULT_SVM_NOTIFIER_SIZE 512
24
+
25
+
#endif
+2
-1
drivers/gpu/drm/xe/xe_device.c
+2
-1
drivers/gpu/drm/xe/xe_device.c
···
26
26
#include "xe_bo.h"
27
27
#include "xe_bo_evict.h"
28
28
#include "xe_debugfs.h"
29
+
#include "xe_defaults.h"
29
30
#include "xe_devcoredump.h"
30
31
#include "xe_device_sysfs.h"
31
32
#include "xe_dma_buf.h"
···
744
743
assert_lmem_ready(xe);
745
744
746
745
xe->wedged.mode = xe_device_validate_wedged_mode(xe, xe_modparam.wedged_mode) ?
747
-
XE_WEDGED_MODE_DEFAULT : xe_modparam.wedged_mode;
746
+
XE_DEFAULT_WEDGED_MODE : xe_modparam.wedged_mode;
748
747
drm_dbg(&xe->drm, "wedged_mode: setting mode (%u) %s\n",
749
748
xe->wedged.mode, xe_wedged_mode_to_string(xe->wedged.mode));
750
749
-3
drivers/gpu/drm/xe/xe_device_types.h
-3
drivers/gpu/drm/xe/xe_device_types.h
···
62
62
XE_WEDGED_MODE_UPON_ANY_HANG_NO_RESET = 2,
63
63
};
64
64
65
-
#define XE_WEDGED_MODE_DEFAULT XE_WEDGED_MODE_UPON_CRITICAL_ERROR
66
-
#define XE_WEDGED_MODE_DEFAULT_STR "upon-critical-error"
67
-
68
65
#define XE_BO_INVALID_OFFSET LONG_MAX
69
66
70
67
#define GRAPHICS_VER(xe) ((xe)->info.graphics_verx100 / 100)
+14
-28
drivers/gpu/drm/xe/xe_module.c
+14
-28
drivers/gpu/drm/xe/xe_module.c
···
10
10
11
11
#include <drm/drm_module.h>
12
12
13
+
#include "xe_defaults.h"
13
14
#include "xe_device_types.h"
14
15
#include "xe_drv.h"
15
16
#include "xe_configfs.h"
···
20
19
#include "xe_observation.h"
21
20
#include "xe_sched_job.h"
22
21
23
-
#if IS_ENABLED(CONFIG_DRM_XE_DEBUG)
24
-
#define DEFAULT_GUC_LOG_LEVEL 3
25
-
#else
26
-
#define DEFAULT_GUC_LOG_LEVEL 1
27
-
#endif
28
-
29
-
#define DEFAULT_PROBE_DISPLAY true
30
-
#define DEFAULT_VRAM_BAR_SIZE 0
31
-
#define DEFAULT_FORCE_PROBE CONFIG_DRM_XE_FORCE_PROBE
32
-
#define DEFAULT_MAX_VFS ~0
33
-
#define DEFAULT_MAX_VFS_STR "unlimited"
34
-
#define DEFAULT_WEDGED_MODE XE_WEDGED_MODE_DEFAULT
35
-
#define DEFAULT_WEDGED_MODE_STR XE_WEDGED_MODE_DEFAULT_STR
36
-
#define DEFAULT_SVM_NOTIFIER_SIZE 512
37
-
38
22
struct xe_modparam xe_modparam = {
39
-
.probe_display = DEFAULT_PROBE_DISPLAY,
40
-
.guc_log_level = DEFAULT_GUC_LOG_LEVEL,
41
-
.force_probe = DEFAULT_FORCE_PROBE,
23
+
.probe_display = XE_DEFAULT_PROBE_DISPLAY,
24
+
.guc_log_level = XE_DEFAULT_GUC_LOG_LEVEL,
25
+
.force_probe = XE_DEFAULT_FORCE_PROBE,
42
26
#ifdef CONFIG_PCI_IOV
43
-
.max_vfs = DEFAULT_MAX_VFS,
27
+
.max_vfs = XE_DEFAULT_MAX_VFS,
44
28
#endif
45
-
.wedged_mode = DEFAULT_WEDGED_MODE,
46
-
.svm_notifier_size = DEFAULT_SVM_NOTIFIER_SIZE,
29
+
.wedged_mode = XE_DEFAULT_WEDGED_MODE,
30
+
.svm_notifier_size = XE_DEFAULT_SVM_NOTIFIER_SIZE,
47
31
/* the rest are 0 by default */
48
32
};
49
33
50
34
module_param_named(svm_notifier_size, xe_modparam.svm_notifier_size, uint, 0600);
51
35
MODULE_PARM_DESC(svm_notifier_size, "Set the svm notifier size in MiB, must be power of 2 "
52
-
"[default=" __stringify(DEFAULT_SVM_NOTIFIER_SIZE) "]");
36
+
"[default=" __stringify(XE_DEFAULT_SVM_NOTIFIER_SIZE) "]");
53
37
54
38
module_param_named_unsafe(force_execlist, xe_modparam.force_execlist, bool, 0444);
55
39
MODULE_PARM_DESC(force_execlist, "Force Execlist submission");
56
40
57
41
module_param_named(probe_display, xe_modparam.probe_display, bool, 0444);
58
42
MODULE_PARM_DESC(probe_display, "Probe display HW, otherwise it's left untouched "
59
-
"[default=" __stringify(DEFAULT_PROBE_DISPLAY) "])");
43
+
"[default=" __stringify(XE_DEFAULT_PROBE_DISPLAY) "])");
60
44
61
45
module_param_named(vram_bar_size, xe_modparam.force_vram_bar_size, int, 0600);
62
46
MODULE_PARM_DESC(vram_bar_size, "Set the vram bar size in MiB (<0=disable-resize, 0=max-needed-size, >0=force-size "
63
-
"[default=" __stringify(DEFAULT_VRAM_BAR_SIZE) "])");
47
+
"[default=" __stringify(XE_DEFAULT_VRAM_BAR_SIZE) "])");
64
48
65
49
module_param_named(guc_log_level, xe_modparam.guc_log_level, int, 0600);
66
50
MODULE_PARM_DESC(guc_log_level, "GuC firmware logging level (0=disable, 1=normal, 2..5=verbose-levels "
67
-
"[default=" __stringify(DEFAULT_GUC_LOG_LEVEL) "])");
51
+
"[default=" __stringify(XE_DEFAULT_GUC_LOG_LEVEL) "])");
68
52
69
53
module_param_named_unsafe(guc_firmware_path, xe_modparam.guc_firmware_path, charp, 0400);
70
54
MODULE_PARM_DESC(guc_firmware_path,
···
66
80
module_param_named_unsafe(force_probe, xe_modparam.force_probe, charp, 0400);
67
81
MODULE_PARM_DESC(force_probe,
68
82
"Force probe options for specified devices. See CONFIG_DRM_XE_FORCE_PROBE for details "
69
-
"[default=" DEFAULT_FORCE_PROBE "])");
83
+
"[default=" XE_DEFAULT_FORCE_PROBE "])");
70
84
71
85
#ifdef CONFIG_PCI_IOV
72
86
module_param_named(max_vfs, xe_modparam.max_vfs, uint, 0400);
73
87
MODULE_PARM_DESC(max_vfs,
74
88
"Limit number of Virtual Functions (VFs) that could be managed. "
75
89
"(0=no VFs; N=allow up to N VFs "
76
-
"[default=" DEFAULT_MAX_VFS_STR "])");
90
+
"[default=" XE_DEFAULT_MAX_VFS_STR "])");
77
91
#endif
78
92
79
93
module_param_named_unsafe(wedged_mode, xe_modparam.wedged_mode, uint, 0600);
80
94
MODULE_PARM_DESC(wedged_mode,
81
95
"Module's default policy for the wedged mode (0=never, 1=upon-critical-error, 2=upon-any-hang-no-reset "
82
-
"[default=" DEFAULT_WEDGED_MODE_STR "])");
96
+
"[default=" XE_DEFAULT_WEDGED_MODE_STR "])");
83
97
84
98
static int xe_check_nomodeset(void)
85
99
{