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

drm/i915/gt: Initialize unused MOCS entries with device specific values

Historically we've initialized all undefined/reserved entries in
a platform's MOCS table to the contents of table entry #1 (i.e.,
I915_MOCS_PTE).
Going forward, we can't assume that table entry #1 will always
contain suitable values to use for undefined/reserved table
indices. We'll allow a platform-specific table index to be
selected at table initialization time in these cases.

This new mechanism to select L3 WB entry will be applicable for
all the Gen12+ platforms except TGL and RKL.

Since TGL and RLK are already in production so their mocs settings
are intact to avoid ABI break.
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-5-ayaz.siddiqui@intel.com
parent c6b24848
...@@ -23,6 +23,7 @@ struct drm_i915_mocs_table { ...@@ -23,6 +23,7 @@ struct drm_i915_mocs_table {
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; u8 uc_index;
u8 unused_entries_index;
}; };
/* Defines for the tables (XXX_MOCS_0 - XXX_MOCS_63) */ /* Defines for the tables (XXX_MOCS_0 - XXX_MOCS_63) */
...@@ -89,18 +90,25 @@ struct drm_i915_mocs_table { ...@@ -89,18 +90,25 @@ struct drm_i915_mocs_table {
* *
* Entries not part of the following tables are undefined as far as * Entries not part of the following tables are undefined as far as
* userspace is concerned and shouldn't be relied upon. For Gen < 12 * userspace is concerned and shouldn't be relied upon. For Gen < 12
* they will be initialized to PTE. Gen >= 12 onwards don't have a setting for * they will be initialized to PTE. Gen >= 12 don't have a setting for
* PTE and will be initialized to an invalid value. * PTE and those platforms except TGL/RKL will be initialized L3 WB to
* catch accidental use of reserved and unused mocs indexes.
* *
* The last few entries are reserved by the hardware. For ICL+ they * The last few entries are reserved by the hardware. For ICL+ they
* should be initialized according to bspec and never used, for older * should be initialized according to bspec and never used, for older
* platforms they should never be written to. * platforms they should never be written to.
* *
* NOTE: These tables are part of bspec and defined as part of hardware * NOTE1: These tables are part of bspec and defined as part of hardware
* interface for ICL+. For older platforms, they are part of kernel * interface for ICL+. For older platforms, they are part of kernel
* ABI. It is expected that, for specific hardware platform, existing * ABI. It is expected that, for specific hardware platform, existing
* entries will remain constant and the table will only be updated by * entries will remain constant and the table will only be updated by
* adding new entries, filling unused positions. * adding new entries, filling unused positions.
*
* NOTE2: For GEN >= 12 except TGL and RKL, reserved and unspecified MOCS
* indices have been set to L3 WB. These reserved entries should never
* be used, they may be changed to low performant variants with better
* coherency in the future if more entries are needed.
* For TGL/RKL, all the unspecified MOCS indexes are mapped to L3 UC.
*/ */
#define GEN9_MOCS_ENTRIES \ #define GEN9_MOCS_ENTRIES \
MOCS_ENTRY(I915_MOCS_UNCACHED, \ MOCS_ENTRY(I915_MOCS_UNCACHED, \
...@@ -283,17 +291,9 @@ static const struct drm_i915_mocs_entry icl_mocs_table[] = { ...@@ -283,17 +291,9 @@ static const struct drm_i915_mocs_entry icl_mocs_table[] = {
}; };
static const struct drm_i915_mocs_entry dg1_mocs_table[] = { static const struct drm_i915_mocs_entry dg1_mocs_table[] = {
/* Error */
MOCS_ENTRY(0, 0, L3_0_DIRECT),
/* UC */ /* UC */
MOCS_ENTRY(1, 0, L3_1_UC), MOCS_ENTRY(1, 0, L3_1_UC),
/* Reserved */
MOCS_ENTRY(2, 0, L3_0_DIRECT),
MOCS_ENTRY(3, 0, L3_0_DIRECT),
MOCS_ENTRY(4, 0, L3_0_DIRECT),
/* WB - L3 */ /* WB - L3 */
MOCS_ENTRY(5, 0, L3_3_WB), MOCS_ENTRY(5, 0, L3_3_WB),
/* WB - L3 50% */ /* WB - L3 50% */
...@@ -343,16 +343,22 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915, ...@@ -343,16 +343,22 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915,
memset(table, 0, sizeof(struct drm_i915_mocs_table)); memset(table, 0, sizeof(struct drm_i915_mocs_table));
table->unused_entries_index = I915_MOCS_PTE;
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->uc_index = 1;
table->n_entries = GEN9_NUM_MOCS_ENTRIES; table->n_entries = GEN9_NUM_MOCS_ENTRIES;
table->uc_index = 1;
table->unused_entries_index = 5;
} 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; table->uc_index = 3;
/* For TGL/RKL, Can't be changed now for ABI reasons */
if (!IS_TIGERLAKE(i915) && !IS_ROCKETLAKE(i915))
table->unused_entries_index = 2;
} 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;
...@@ -398,16 +404,16 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915, ...@@ -398,16 +404,16 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915,
} }
/* /*
* Get control_value from MOCS entry taking into account when it's not used: * Get control_value from MOCS entry taking into account when it's not used
* I915_MOCS_PTE's value is returned in this case. * then if unused_entries_index is non-zero then its value will be returned
* otherwise I915_MOCS_PTE's value is returned in this case.
*/ */
static u32 get_entry_control(const struct drm_i915_mocs_table *table, static u32 get_entry_control(const struct drm_i915_mocs_table *table,
unsigned int index) unsigned int index)
{ {
if (index < table->size && table->table[index].used) if (index < table->size && table->table[index].used)
return table->table[index].control_value; return table->table[index].control_value;
return table->table[table->unused_entries_index].control_value;
return table->table[I915_MOCS_PTE].control_value;
} }
#define for_each_mocs(mocs, t, i) \ #define for_each_mocs(mocs, t, i) \
...@@ -422,6 +428,8 @@ static void __init_mocs_table(struct intel_uncore *uncore, ...@@ -422,6 +428,8 @@ static void __init_mocs_table(struct intel_uncore *uncore,
unsigned int i; unsigned int i;
u32 mocs; u32 mocs;
drm_WARN_ONCE(&uncore->i915->drm, !table->unused_entries_index,
"Unused entries index should have been defined\n");
for_each_mocs(mocs, table, i) for_each_mocs(mocs, table, i)
intel_uncore_write_fw(uncore, _MMIO(addr + i * 4), mocs); intel_uncore_write_fw(uncore, _MMIO(addr + i * 4), mocs);
} }
...@@ -448,16 +456,16 @@ static void init_mocs_table(struct intel_engine_cs *engine, ...@@ -448,16 +456,16 @@ static void init_mocs_table(struct intel_engine_cs *engine,
} }
/* /*
* Get l3cc_value from MOCS entry taking into account when it's not used: * Get l3cc_value from MOCS entry taking into account when it's not used
* I915_MOCS_PTE's value is returned in this case. * then if unused_entries_index is not zero then its value will be returned
* otherwise I915_MOCS_PTE's value is returned in this case.
*/ */
static u16 get_entry_l3cc(const struct drm_i915_mocs_table *table, static u16 get_entry_l3cc(const struct drm_i915_mocs_table *table,
unsigned int index) unsigned int index)
{ {
if (index < table->size && table->table[index].used) if (index < table->size && table->table[index].used)
return table->table[index].l3cc_value; return table->table[index].l3cc_value;
return table->table[table->unused_entries_index].l3cc_value;
return table->table[I915_MOCS_PTE].l3cc_value;
} }
static u32 l3cc_combine(u16 low, u16 high) static u32 l3cc_combine(u16 low, u16 high)
......
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