Commit ddabf721 authored by John Harrison's avatar John Harrison Committed by Matt Roper
Browse files

drm/i915/xehp: Extra media engines - Part 3 (reset) 



Xe_HP can have a lot of extra media engines. This patch adds the reset
support for them.

Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarMatt Atwood <matthew.s.atwood@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210723174239.1551352-5-matthew.d.roper@intel.com
parent 1b16b6b6

drivers/gpu/drm/i915/gt/intel_reset.c

+6 −0
Original line number Diff line number Diff line
@@ -515,8 +515,14 @@ static int gen11_reset_engines(struct intel_gt *gt, 
		[VCS1]  = GEN11_GRDOM_MEDIA2,

		[VCS2]  = GEN11_GRDOM_MEDIA3,

		[VCS3]  = GEN11_GRDOM_MEDIA4,

		[VCS4]  = GEN11_GRDOM_MEDIA5,

		[VCS5]  = GEN11_GRDOM_MEDIA6,

		[VCS6]  = GEN11_GRDOM_MEDIA7,

		[VCS7]  = GEN11_GRDOM_MEDIA8,

		[VECS0] = GEN11_GRDOM_VECS,

		[VECS1] = GEN11_GRDOM_VECS2,

		[VECS2] = GEN11_GRDOM_VECS3,

		[VECS3] = GEN11_GRDOM_VECS4,

	};

	struct intel_engine_cs *engine;

	intel_engine_mask_t tmp;

drivers/gpu/drm/i915/i915_reg.h

+8 −0
Original line number Diff line number Diff line
@@ -395,10 +395,18 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) 
#define  GEN11_GRDOM_MEDIA2		(1 << 6)

#define  GEN11_GRDOM_MEDIA3		(1 << 7)

#define  GEN11_GRDOM_MEDIA4		(1 << 8)

#define  GEN11_GRDOM_MEDIA5		(1 << 9)

#define  GEN11_GRDOM_MEDIA6		(1 << 10)

#define  GEN11_GRDOM_MEDIA7		(1 << 11)

#define  GEN11_GRDOM_MEDIA8		(1 << 12)

#define  GEN11_GRDOM_VECS		(1 << 13)

#define  GEN11_GRDOM_VECS2		(1 << 14)

#define  GEN11_GRDOM_VECS3		(1 << 15)

#define  GEN11_GRDOM_VECS4		(1 << 16)

#define  GEN11_GRDOM_SFC0		(1 << 17)

#define  GEN11_GRDOM_SFC1		(1 << 18)

#define  GEN11_GRDOM_SFC2		(1 << 19)

#define  GEN11_GRDOM_SFC3		(1 << 20)



#define  GEN11_VCS_SFC_RESET_BIT(instance)	(GEN11_GRDOM_SFC0 << ((instance) >> 1))

#define  GEN11_VECS_SFC_RESET_BIT(instance)	(GEN11_GRDOM_SFC0 << (instance))