[Intel-gfx] [PATCH 2/2] drm/i915/gt: Defer mocs setup until after the initial context is loaded

[Chris Wilson]

On my kbl gt4e, there is a distinction between the power context and the
normal contexts. We must delay the mocs setup until after we have primed
the kernel context to record the mocs register settings within the
context image.

Fixes: eca0b7208969 ("drm/i915: Do initial mocs configuration directly")
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Prathap Kumar Valsan <prathap.kumar.valsan at intel.com>
Cc: Mika Kuoppala <mika.kuoppala at linux.intel.com>
---
 drivers/gpu/drm/i915/gt/intel_gt_pm.c | 6 +++++-
 drivers/gpu/drm/i915/gt/intel_lrc.c   | 3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index 06e73d56cfcf..0f9be5722c24 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -12,6 +12,7 @@
 #include "intel_gt.h"
 #include "intel_gt_pm.h"
 #include "intel_gt_requests.h"
+#include "intel_mocs.h"
 #include "intel_pm.h"
 #include "intel_rc6.h"
 #include "intel_wakeref.h"
@@ -182,13 +183,16 @@ int intel_gt_resume(struct intel_gt *gt)
 		engine->serial++; /* kernel context lost */
 		err = engine->resume(engine);
 
-		intel_engine_pm_put(engine);
+		intel_engine_pm_put(engine); /* primes kernel context */
 		if (err) {
 			dev_err(gt->i915->drm.dev,
 				"Failed to restart %s (%d)\n",
 				engine->name, err);
 			break;
 		}
+		intel_engine_flush_submission(engine);
+
+		intel_mocs_init_engine(engine);
 	}
 
 	intel_rc6_enable(&gt->rc6);
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index f9f3e985bb79..53ee389453d5 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -143,7 +143,6 @@
 #include "intel_gt.h"
 #include "intel_gt_pm.h"
 #include "intel_lrc_reg.h"
-#include "intel_mocs.h"
 #include "intel_reset.h"
 #include "intel_workarounds.h"
 
@@ -2639,8 +2638,6 @@ static int execlists_resume(struct intel_engine_cs *engine)
 	intel_engine_apply_workarounds(engine);
 	intel_engine_apply_whitelist(engine);
 
-	intel_mocs_init_engine(engine);
-
 	intel_engine_reset_breadcrumbs(engine);
 
 	if (GEM_SHOW_DEBUG() && unexpected_starting_state(engine)) {
-- 
2.24.0.rc0