github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-22 06:01:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/xe: Move GSI offset adjustment fields into 'struct xe_mmio'

Browse Source 
By moving the GSI adjustment fields into 'struct xe_mmio' we can replace
the GT's MMIO substructure with another instance of xe_mmio.  At the
moment this means MMIO operations wind up pulling information from two
different places (the tile's xe_mmio for the iomap and the GT's xe_mmio
for the adjustment), but we'll address that in future patches.

The type headers change a bit with this change, meaning that various
files should be including xe_device_types.h instead of (or in addition
to) xe_gt_types.h.

v2:
 - Fix pre-existing kerneldoc typo while moving the fields (Lucas)
v3:
 - Add missing '@' in kerneldoc.  (Rodrigo)

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240910234719.3335472-49-matthew.d.roper@intel.com
This commit is contained in:
Matt Roper 2024-09-10 16:47:24 -07:00
parent d4aff99aef
commit 9d383916a5
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/xe/xe_assert.h
View File

@ -10,7 +10,7 @@
#include <drm/drm_print.h>
#include "xe_device_types.h"
#include "xe_gt_types.h"
#include "xe_step.h"
/**

1
drivers/gpu/drm/xe/xe_device.h
View File

@ -9,6 +9,7 @@
#include <drm/drm_util.h>
#include "xe_device_types.h"
#include "xe_gt_types.h"
static inline struct xe_device *to_xe_device(const struct drm_device *dev)
{

7
drivers/gpu/drm/xe/xe_device_types.h
View File

@ -14,7 +14,6 @@
#include "xe_devcoredump_types.h"
#include "xe_heci_gsc.h"
#include "xe_gt_types.h"
#include "xe_lmtt_types.h"
#include "xe_memirq_types.h"
#include "xe_oa.h"
@ -127,6 +126,12 @@ struct xe_mmio {
* non-register regions such as the GGTT PTEs.
*/
size_t regs_size;
/** @adj_limit: adjust MMIO address if address is below this value */
u32 adj_limit;
/** @adj_offset: offset to add to MMIO address when adjusting */
u32 adj_offset;
};
/**

2
drivers/gpu/drm/xe/xe_gt_freq.c
View File

@ -11,9 +11,9 @@
#include <drm/drm_managed.h>
#include <drm/drm_print.h>
#include "xe_device_types.h"
#include "xe_gt_sysfs.h"
#include "xe_gt_throttle.h"
#include "xe_gt_types.h"
#include "xe_guc_pc.h"
#include "xe_pm.h"

2
drivers/gpu/drm/xe/xe_gt_printk.h
View File

@ -8,7 +8,7 @@
#include <drm/drm_print.h>
#include "xe_device_types.h"
#include "xe_gt_types.h"
#define xe_gt_printk(_gt, _level, _fmt, ...) \
drm_##_level(&gt_to_xe(_gt)->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)

11
drivers/gpu/drm/xe/xe_gt_types.h
View File

@ -6,6 +6,7 @@
#ifndef _XE_GT_TYPES_H_
#define _XE_GT_TYPES_H_
#include "xe_device_types.h"
#include "xe_force_wake_types.h"
#include "xe_gt_idle_types.h"
#include "xe_gt_sriov_pf_types.h"
@ -147,15 +148,7 @@ struct xe_gt {
* register space, but have their own copy of GSI registers at a
* specific offset.
*/
struct {
/**
* @mmio.adj_limit: adjust MMIO address if address is below this
* value
*/
u32 adj_limit;
/** @mmio.adj_offset: offect to add to MMIO address when adjusting */
u32 adj_offset;
} mmio;
struct xe_mmio mmio;
/**
* @pm: power management info for GT. The driver uses the GT's