Commit b62aa57e authored by Ayaz A Siddiqui's avatar Ayaz A Siddiqui Committed by Ramalingam C

drm/i915/gt: Add support of mocs propagation

Now there are lots of Command and registers that require mocs index
programming.
So propagating mocs_index from mocs to gt so that it can be
used directly without having platform-specific checks.

V2:
Changed 'i915_mocs_index_gt' to anonymous structure.

Cc: CQ Tang<cq.tang@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarAyaz A Siddiqui <ayaz.siddiqui@intel.com>
Signed-off-by: default avatarRamalingam C <ramalingam.c@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210903092153.535736-2-ayaz.siddiqui@intel.com
parent 450cede7
...@@ -682,6 +682,8 @@ int intel_gt_init(struct intel_gt *gt) ...@@ -682,6 +682,8 @@ int intel_gt_init(struct intel_gt *gt)
goto err_pm; goto err_pm;
} }
set_mocs_index(gt);
err = intel_engines_init(gt); err = intel_engines_init(gt);
if (err) if (err)
goto err_engines; goto err_engines;
......
...@@ -192,6 +192,10 @@ struct intel_gt { ...@@ -192,6 +192,10 @@ struct intel_gt {
unsigned long mslice_mask; unsigned long mslice_mask;
} info; } info;
struct {
u8 uc_index;
} mocs;
}; };
enum intel_gt_scratch_field { enum intel_gt_scratch_field {
......
...@@ -22,6 +22,7 @@ struct drm_i915_mocs_table { ...@@ -22,6 +22,7 @@ struct drm_i915_mocs_table {
unsigned int size; unsigned int size;
unsigned int n_entries; unsigned int n_entries;
const struct drm_i915_mocs_entry *table; const struct drm_i915_mocs_entry *table;
u8 uc_index;
}; };
/* Defines for the tables (XXX_MOCS_0 - XXX_MOCS_63) */ /* Defines for the tables (XXX_MOCS_0 - XXX_MOCS_63) */
...@@ -340,14 +341,18 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915, ...@@ -340,14 +341,18 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915,
{ {
unsigned int flags; unsigned int flags;
memset(table, 0, sizeof(struct drm_i915_mocs_table));
if (IS_DG1(i915)) { if (IS_DG1(i915)) {
table->size = ARRAY_SIZE(dg1_mocs_table); table->size = ARRAY_SIZE(dg1_mocs_table);
table->table = dg1_mocs_table; table->table = dg1_mocs_table;
table->uc_index = 1;
table->n_entries = GEN9_NUM_MOCS_ENTRIES; table->n_entries = GEN9_NUM_MOCS_ENTRIES;
} else if (GRAPHICS_VER(i915) >= 12) { } else if (GRAPHICS_VER(i915) >= 12) {
table->size = ARRAY_SIZE(tgl_mocs_table); table->size = ARRAY_SIZE(tgl_mocs_table);
table->table = tgl_mocs_table; table->table = tgl_mocs_table;
table->n_entries = GEN9_NUM_MOCS_ENTRIES; table->n_entries = GEN9_NUM_MOCS_ENTRIES;
table->uc_index = 3;
} else if (GRAPHICS_VER(i915) == 11) { } else if (GRAPHICS_VER(i915) == 11) {
table->size = ARRAY_SIZE(icl_mocs_table); table->size = ARRAY_SIZE(icl_mocs_table);
table->table = icl_mocs_table; table->table = icl_mocs_table;
...@@ -504,6 +509,14 @@ static u32 global_mocs_offset(void) ...@@ -504,6 +509,14 @@ static u32 global_mocs_offset(void)
return i915_mmio_reg_offset(GEN12_GLOBAL_MOCS(0)); return i915_mmio_reg_offset(GEN12_GLOBAL_MOCS(0));
} }
void set_mocs_index(struct intel_gt *gt)
{
struct drm_i915_mocs_table table;
get_mocs_settings(gt->i915, &table);
gt->mocs.uc_index = table.uc_index;
}
void intel_mocs_init(struct intel_gt *gt) void intel_mocs_init(struct intel_gt *gt)
{ {
struct drm_i915_mocs_table table; struct drm_i915_mocs_table table;
......
...@@ -36,5 +36,6 @@ struct intel_gt; ...@@ -36,5 +36,6 @@ struct intel_gt;
void intel_mocs_init(struct intel_gt *gt); void intel_mocs_init(struct intel_gt *gt);
void intel_mocs_init_engine(struct intel_engine_cs *engine); void intel_mocs_init_engine(struct intel_engine_cs *engine);
void set_mocs_index(struct intel_gt *gt);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment