diff mbox

drm/i915:gen9: implement WaMtpRenderPowerGatingBug

Message ID 1466092304-12107-1-git-send-email-tim.gore@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

tim.gore@intel.com June 16, 2016, 3:51 p.m. UTC 
From: Tim Gore <tim.gore@intel.com>

This patch applies WaMtpRenderPowerGatingBug which
overcomes a hang during mid thread pre-emption when
running OCL test: test_allocations64.exe single 5 all.

Signed-off-by: Tim Gore <tim.gore@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h  |  5 ++++
 drivers/gpu/drm/i915/intel_lrc.c | 52 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

Comments

kernel test robot June 16, 2016, 4:36 p.m. UTC | #1 
Hi,

[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20160616]
[cannot apply to v4.7-rc3]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/tim-gore-intel-com/drm-i915-gen9-implement-WaMtpRenderPowerGatingBug/20160616-235703
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: x86_64-rhel (attached as .config)
compiler: gcc-4.9 (Debian 4.9.3-14) 4.9.3
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

   drivers/gpu/drm/i915/intel_lrc.c: In function 'do_WaMtpRenderPowerGatingBug':
>> drivers/gpu/drm/i915/intel_lrc.c:1247:39: error: 'struct drm_i915_private' has no member named 'dev_priv'
     uint32_t SliceCountMax = engine->i915->dev_priv->info.slice_total;
                                          ^

vim +1247 drivers/gpu/drm/i915/intel_lrc.c

  1241	{
  1242		uint32_t num_lri = 0;
  1243		uint32_t GwWriteValue = 0;
  1244		i915_reg_t GwDestMmio = {0};
  1245		uint32_t i = 0;
  1246		uint32_t GwCount = 0;
> 1247		uint32_t SliceCountMax = engine->i915->dev_priv->info.slice_total;
  1248		uint32_t SliceCount = 0;
  1249	
  1250		/* Slice count should be non-zero */

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index d229a83..c219043 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -223,6 +223,11 @@  static inline bool i915_mmio_reg_valid(i915_reg_t reg)
 #define GEN8_CONFIG0			_MMIO(0xD00)
 #define  GEN9_DEFAULT_FIXES		(1 << 3 | 1 << 2 | 1 << 1)
 
+/* Slice GateWay mmio offset and related info*/
+#define GEN9_GW_DEST			_MMIO(0xE220)
+#define   GEN9_GW_DATA_PAIRS		32
+#define   GEN9_GW_PER_SLICE		3
+
 #define GAC_ECO_BITS			_MMIO(0x14090)
 #define   ECOBITS_SNB_BIT		(1<<13)
 #define   ECOBITS_PPGTT_CACHE64B	(3<<8)
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 4fad830..ae6420d 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1236,6 +1236,52 @@  static int gen8_init_perctx_bb(struct intel_engine_cs *engine,
 	return wa_ctx_end(wa_ctx, *offset = index, 1);
 }
 
+static int do_WaMtpRenderPowerGatingBug(struct intel_engine_cs *engine,
+					uint32_t *const batch, uint32_t index)
+{
+	uint32_t num_lri = 0;
+	uint32_t GwWriteValue = 0;
+	i915_reg_t GwDestMmio = {0};
+	uint32_t i = 0;
+	uint32_t GwCount = 0;
+	uint32_t SliceCountMax = engine->i915->dev_priv->info.slice_total;
+	uint32_t SliceCount = 0;
+
+	/* Slice count should be non-zero */
+	WARN_ON(SliceCountMax == 0);
+
+	/* Mmios for GW are nice and sequential across slices, so we can
+	 * just do this single slice logic 3 times and the 'DestMmio will
+	 * be calculated properly'
+	 */
+	for (SliceCount = 0; SliceCount < SliceCountMax; SliceCount++) {
+		/* write the load reg immediate header */
+		num_lri = (GEN9_GW_PER_SLICE * GEN9_GW_DATA_PAIRS) + 1;
+		wa_ctx_emit(batch, index,
+			MI_LOAD_REGISTER_IMM(num_lri) | MI_LRI_FORCE_POSTED);
+
+		for (GwCount = 0; GwCount < GEN9_GW_PER_SLICE; GwCount++) {
+			GwDestMmio.reg = GEN9_GW_DEST.reg + (0x10 * GwCount)
+					+ (0x40 * SliceCount);
+
+			for (i = 0; i < GEN9_GW_DATA_PAIRS; i++) {
+				// Read bits [31:24] from the Context Offset to [7:0] of LRI
+				// Read bit [13] from Context Offset to [31] of LRI
+				// Put i into bits [28:24] of LRI
+				GwWriteValue = 0x1;
+				GwWriteValue |= i << 24;
+				wa_ctx_emit_reg(batch, index, GwDestMmio);
+				wa_ctx_emit(batch, index, GwWriteValue);
+			}
+		}
+		// Add one more 'dummy' data pair because the last MMIO in an LRI isn't actually 'posted'
+		wa_ctx_emit_reg(batch, index, GwDestMmio);
+		wa_ctx_emit(batch, index, GwWriteValue);
+	}
+	return index;
+}
+
+
 static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine,
 				    struct i915_wa_ctx_bb *wa_ctx,
 				    uint32_t *const batch,
@@ -1271,6 +1317,12 @@  static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine,
 		wa_ctx_emit(batch, index, 0);
 		wa_ctx_emit(batch, index, 0);
 	}
+
+	ret = do_WaMtpRenderPowerGatingBug(engine, batch, index);
+	if (ret < 0)
+		return ret;
+	index = ret;
+
 	/* Pad to end of cacheline */
 	while (index % CACHELINE_DWORDS)
 		wa_ctx_emit(batch, index, MI_NOOP);