Commit 9d383916 authored by Matt Roper's avatar Matt Roper
Browse files

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



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: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240910234719.3335472-49-matthew.d.roper@intel.com
parent d4aff99a

drivers/gpu/drm/xe/xe_assert.h

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


#include <drm/drm_print.h>



#include "xe_device_types.h"

#include "xe_gt_types.h"

#include "xe_step.h"



/**

drivers/gpu/drm/xe/xe_device.h

+1 −0
Original line number Diff line number Diff line
@@ -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)

{

drivers/gpu/drm/xe/xe_device_types.h

+6 −1
Original line number Diff line number Diff line
@@ -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;

};



/**

drivers/gpu/drm/xe/xe_gt_freq.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/xe/xe_gt_printk.h

+1 −1
Original line number Diff line number Diff line
@@ -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__)