Skip to content

Commit 0dc8538

Browse files
committed
Merge tag 'drm-xe-next-2025-01-10' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next
Driver Changes: - SRIOV VF: Avoid reading inaccessible registers (Jakub, Marcin) - Introduce RPa frequency information (Rodrigo) - Remove unnecessary force wakes on SLPC code (Vinay) - Fix all typos in xe (Nitin) - Adding steering info support for GuC register lists (Jesus) - Remove unused xe_pciids.h harder, add missing PCI ID (Jani) Signed-off-by: Dave Airlie <airlied@redhat.com> From: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/Z4E0tlTAA6MZ7PF2@intel.com
2 parents 255e094 + 6a04bb5 commit 0dc8538

40 files changed

+162
-302
lines changed

drivers/gpu/drm/xe/Kconfig.debug

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ config DRM_XE_DEBUG_MEM
6666
bool "Enable passing SYS/VRAM addresses to user space"
6767
default n
6868
help
69-
Pass object location trough uapi. Intended for extended
69+
Pass object location through uapi. Intended for extended
7070
testing and development only.
7171

7272
Recommended for driver developers only.
@@ -104,5 +104,5 @@ config DRM_XE_USERPTR_INVAL_INJECT
104104
Choose this option when debugging error paths that
105105
are hit during checks for userptr invalidations.
106106

107-
Recomended for driver developers only.
107+
Recommended for driver developers only.
108108
If in doubt, say "N".

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ enum guc_state_capture_type {
2525

2626
#define GUC_STATE_CAPTURE_TYPE_MAX (GUC_STATE_CAPTURE_TYPE_ENGINE_INSTANCE + 1)
2727

28-
/* Class indecies for capture_class and capture_instance arrays */
28+
/* Class indices for capture_class and capture_instance arrays */
2929
enum guc_capture_list_class_type {
3030
GUC_CAPTURE_LIST_CLASS_RENDER_COMPUTE = 0,
3131
GUC_CAPTURE_LIST_CLASS_VIDEO = 1,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ enum {
132132
* _`GUC_KLV_VGT_POLICY_SCHED_IF_IDLE` : 0x8001
133133
* This config sets whether strict scheduling is enabled whereby any VF
134134
* that doesn’t have work to submit is still allocated a fixed execution
135-
* time-slice to ensure active VFs execution is always consitent even
135+
* time-slice to ensure active VFs execution is always consistent even
136136
* during other VF reprovisiong / rebooting events. Changing this KLV
137137
* impacts all VFs and takes effect on the next VF-Switch event.
138138
*
@@ -207,7 +207,7 @@ enum {
207207
* of and this will never be perfectly-exact (accumulated nano-second
208208
* granularity) since the GPUs clock time runs off a different crystal
209209
* from the CPUs clock. Changing this KLV on a VF that is currently
210-
* running a context wont take effect until a new context is scheduled in.
210+
* running a context won't take effect until a new context is scheduled in.
211211
* That said, when the PF is changing this value from 0x0 to
212212
* a non-zero value, it might never take effect if the VF is running an
213213
* infinitely long compute or shader kernel. In such a scenario, the
@@ -227,7 +227,7 @@ enum {
227227
* HW is capable and this will never be perfectly-exact (accumulated
228228
* nano-second granularity) since the GPUs clock time runs off a
229229
* different crystal from the CPUs clock. Changing this KLV on a VF
230-
* that is currently running a context wont take effect until a new
230+
* that is currently running a context won't take effect until a new
231231
* context is scheduled in.
232232
* That said, when the PF is changing this value from 0x0 to
233233
* a non-zero value, it might never take effect if the VF is running an

drivers/gpu/drm/xe/regs/xe_reg_defs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/**
1414
* struct xe_reg - Register definition
1515
*
16-
* Register defintion to be used by the individual register. Although the same
16+
* Register definition to be used by the individual register. Although the same
1717
* definition is used for xe_reg and xe_reg_mcr, they use different internal
1818
* APIs for accesses.
1919
*/

drivers/gpu/drm/xe/regs/xe_regs.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,16 @@
4444

4545
#define MTL_RP_STATE_CAP XE_REG(0x138000)
4646

47+
#define MTL_GT_RPA_FREQUENCY XE_REG(0x138008)
4748
#define MTL_GT_RPE_FREQUENCY XE_REG(0x13800c)
4849

4950
#define MTL_MEDIAP_STATE_CAP XE_REG(0x138020)
5051
#define MTL_RPN_CAP_MASK REG_GENMASK(24, 16)
5152
#define MTL_RP0_CAP_MASK REG_GENMASK(8, 0)
5253

54+
#define MTL_MPA_FREQUENCY XE_REG(0x138028)
55+
#define MTL_RPA_MASK REG_GENMASK(8, 0)
56+
5357
#define MTL_MPE_FREQUENCY XE_REG(0x13802c)
5458
#define MTL_RPE_MASK REG_GENMASK(8, 0)
5559

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static void read_l3cc_table(struct xe_gt *gt,
5858

5959
mocs_dbg(gt, "reg_val=0x%x\n", reg_val);
6060
} else {
61-
/* Just re-use value read on previous iteration */
61+
/* Just reuse value read on previous iteration */
6262
reg_val >>= 16;
6363
}
6464

drivers/gpu/drm/xe/xe_bb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct xe_bb *xe_bb_new(struct xe_gt *gt, u32 dwords, bool usm)
4141
/*
4242
* We need to allocate space for the requested number of dwords,
4343
* one additional MI_BATCH_BUFFER_END dword, and additional buffer
44-
* space to accomodate the platform-specific hardware prefetch
44+
* space to accommodate the platform-specific hardware prefetch
4545
* requirements.
4646
*/
4747
bb->bo = xe_sa_bo_new(!usm ? tile->mem.kernel_bb_pool : gt->usm.bb_pool,

drivers/gpu/drm/xe/xe_bo.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict,
786786
* / resume, some of the pinned memory is required for the
787787
* device to resume / use the GPU to move other evicted memory
788788
* (user memory) around. This likely could be optimized a bit
789-
* futher where we find the minimum set of pinned memory
789+
* further where we find the minimum set of pinned memory
790790
* required for resume but for simplity doing a memcpy for all
791791
* pinned memory.
792792
*/
@@ -875,7 +875,7 @@ static int xe_bo_move(struct ttm_buffer_object *ttm_bo, bool evict,
875875
* xe_bo_evict_pinned() - Evict a pinned VRAM object to system memory
876876
* @bo: The buffer object to move.
877877
*
878-
* On successful completion, the object memory will be moved to sytem memory.
878+
* On successful completion, the object memory will be moved to system memory.
879879
*
880880
* This is needed to for special handling of pinned VRAM object during
881881
* suspend-resume.
@@ -1370,7 +1370,7 @@ static const struct drm_gem_object_funcs xe_gem_object_funcs = {
13701370
/**
13711371
* xe_bo_alloc - Allocate storage for a struct xe_bo
13721372
*
1373-
* This funcition is intended to allocate storage to be used for input
1373+
* This function is intended to allocate storage to be used for input
13741374
* to __xe_bo_create_locked(), in the case a pointer to the bo to be
13751375
* created is needed before the call to __xe_bo_create_locked().
13761376
* If __xe_bo_create_locked ends up never to be called, then the
@@ -2412,7 +2412,7 @@ int xe_bo_migrate(struct xe_bo *bo, u32 mem_type)
24122412
* @force_alloc: Set force_alloc in ttm_operation_ctx
24132413
*
24142414
* On successful completion, the object memory will be moved to evict
2415-
* placement. Ths function blocks until the object has been fully moved.
2415+
* placement. This function blocks until the object has been fully moved.
24162416
*
24172417
* Return: 0 on success. Negative error code on failure.
24182418
*/

drivers/gpu/drm/xe/xe_bo_doc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* created the BO can be mmap'd (via DRM_IOCTL_XE_GEM_MMAP_OFFSET) for user
4242
* access and it can be bound for GPU access (via DRM_IOCTL_XE_VM_BIND). All
4343
* user BOs are evictable and user BOs are never pinned by XE. The allocation of
44-
* the backing store can be defered from creation time until first use which is
44+
* the backing store can be deferred from creation time until first use which is
4545
* either mmap, bind, or pagefault.
4646
*
4747
* Private BOs

drivers/gpu/drm/xe/xe_devcoredump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
*
4949
* **Coredump release**:
5050
* After a coredump is generated, it stays in kernel memory until released by
51-
* userpace by writing anything to it, or after an internal timer expires. The
51+
* userspace by writing anything to it, or after an internal timer expires. The
5252
* exact timeout may vary and should not be relied upon. Example to release
5353
* a coredump:
5454
*

0 commit comments

Comments
 (0)