drm/i915/gt: Initialize L3CC table in mocs init

Initialize the L3CC table as part of mocs initialization to program
LNCFCMOCSx registers so that the mocs settings are available for
selection for subsequent memory transactions in the driver load path.

We need to keep L3CC initialization in intel_mocs_init_engine() also
so that in execlists submission, these registers can be rewritten
during engine reset.

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Sreedhar Telukuntla <sreedhar.telukuntla@intel.com>
Signed-off-by: Ayaz A Siddiqui <ayaz.siddiqui@intel.com>
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210903092153.535736-6-ayaz.siddiqui@intel.com

diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
index 552bfd1c113b1f405a24faf1e1599c8aacedf213..e96afd7beb4991be27795a1c926d6ea97a7988b8 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_mocs.c
+++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
@@ -481,10 +481,9 @@ static u32 l3cc_combine(u16 low, u16 high)
             0; \
             i++)
 
-static void init_l3cc_table(struct intel_engine_cs *engine,
+static void init_l3cc_table(struct intel_uncore *uncore,
                            const struct drm_i915_mocs_table *table)
 {
-       struct intel_uncore *uncore = engine->uncore;
        unsigned int i;
        u32 l3cc;
 
@@ -509,7 +508,7 @@ void intel_mocs_init_engine(struct intel_engine_cs *engine)
                init_mocs_table(engine, &table);
 
        if (flags & HAS_RENDER_L3CC && engine->class == RENDER_CLASS)
-               init_l3cc_table(engine, &table);
+               init_l3cc_table(engine->uncore, &table);
 }
 
 static u32 global_mocs_offset(void)
@@ -536,6 +535,14 @@ void intel_mocs_init(struct intel_gt *gt)
        flags = get_mocs_settings(gt->i915, &table);
        if (flags & HAS_GLOBAL_MOCS)
                __init_mocs_table(gt->uncore, &table, global_mocs_offset());
+
+       /*
+        * Initialize the L3CC table as part of mocs initalization to make
+        * sure the LNCFCMOCSx registers are programmed for the subsequent
+        * memory transactions including guc transactions
+        */
+       if (flags & HAS_RENDER_L3CC)
+               init_l3cc_table(gt->uncore, &table);
 }
 
 #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)