Commit f8a0c7a9 authored by Chris Wilson's avatar Chris Wilson

drm/i915/gt: Refactor mocs loops into single control macro

We repeatedly (and more so in future) use the same looping construct
over the mocs definition table to setup the register state. Refactor the
loop construct into a reusable macro.

add/remove: 2/1 grow/shrink: 1/2 up/down: 113/-330 (-217)
Function                                     old     new   delta
intel_mocs_init_engine.cold                    -      71     +71
offset                                         -      28     +28
__func__                                   17273   17287     +14
intel_mocs_init                              143     113     -30
mocs_register.isra                            91       -     -91
intel_mocs_init_engine                       503     294    -209
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191112223600.30993-3-chris@chris-wilson.co.uk
parent f616de0e
...@@ -321,27 +321,6 @@ static bool get_mocs_settings(const struct drm_i915_private *i915, ...@@ -321,27 +321,6 @@ static bool get_mocs_settings(const struct drm_i915_private *i915,
return true; return true;
} }
static i915_reg_t mocs_register(const struct intel_engine_cs *engine, int index)
{
switch (engine->id) {
case RCS0:
return GEN9_GFX_MOCS(index);
case VCS0:
return GEN9_MFX0_MOCS(index);
case BCS0:
return GEN9_BLT_MOCS(index);
case VECS0:
return GEN9_VEBOX_MOCS(index);
case VCS1:
return GEN9_MFX1_MOCS(index);
case VCS2:
return GEN11_MFX2_MOCS(index);
default:
MISSING_CASE(engine->id);
return INVALID_MMIO_REG;
}
}
/* /*
* 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. * I915_MOCS_PTE's value is returned in this case.
...@@ -349,29 +328,47 @@ static i915_reg_t mocs_register(const struct intel_engine_cs *engine, int index) ...@@ -349,29 +328,47 @@ static i915_reg_t mocs_register(const struct intel_engine_cs *engine, int index)
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 (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[I915_MOCS_PTE].control_value; return table->table[I915_MOCS_PTE].control_value;
} }
static void init_mocs_table(struct intel_engine_cs *engine, #define for_each_mocs(mocs, t, i) \
const struct drm_i915_mocs_table *table) for (i = 0; \
i < (t)->n_entries ? (mocs = get_entry_control((t), i)), 1 : 0;\
i++)
static void __init_mocs_table(struct intel_uncore *uncore,
const struct drm_i915_mocs_table *table,
u32 addr)
{ {
struct intel_uncore *uncore = engine->uncore;
u32 unused_value = table->table[I915_MOCS_PTE].control_value;
unsigned int i; unsigned int i;
u32 mocs;
for (i = 0; i < table->size; i++) for_each_mocs(mocs, table, i)
intel_uncore_write_fw(uncore, intel_uncore_write_fw(uncore, _MMIO(addr + i * 4), mocs);
mocs_register(engine, i), }
get_entry_control(table, i));
static u32 mocs_offset(const struct intel_engine_cs *engine)
/* All remaining entries are unused */ {
for (; i < table->n_entries; i++) static const u32 offset[] = {
intel_uncore_write_fw(uncore, [RCS0] = __GEN9_RCS0_MOCS0,
mocs_register(engine, i), [VCS0] = __GEN9_VCS0_MOCS0,
unused_value); [VCS1] = __GEN9_VCS1_MOCS0,
[VECS0] = __GEN9_VECS0_MOCS0,
[BCS0] = __GEN9_BCS0_MOCS0,
[VCS2] = __GEN11_VCS2_MOCS0,
};
GEM_BUG_ON(engine->id >= ARRAY_SIZE(offset));
return offset[engine->id];
}
static void init_mocs_table(struct intel_engine_cs *engine,
const struct drm_i915_mocs_table *table)
{
__init_mocs_table(engine->uncore, table, mocs_offset(engine));
} }
/* /*
...@@ -381,7 +378,7 @@ static void init_mocs_table(struct intel_engine_cs *engine, ...@@ -381,7 +378,7 @@ static void init_mocs_table(struct intel_engine_cs *engine,
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 (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[I915_MOCS_PTE].l3cc_value; return table->table[I915_MOCS_PTE].l3cc_value;
...@@ -392,37 +389,23 @@ static inline u32 l3cc_combine(u16 low, u16 high) ...@@ -392,37 +389,23 @@ static inline u32 l3cc_combine(u16 low, u16 high)
return low | (u32)high << 16; return low | (u32)high << 16;
} }
#define for_each_l3cc(l3cc, t, i) \
for (i = 0; \
i < ((t)->n_entries + 1) / 2 ? \
(l3cc = l3cc_combine(get_entry_l3cc((t), 2 * i), \
get_entry_l3cc((t), 2 * i + 1))), 1 : \
0; \
i++)
static void init_l3cc_table(struct intel_engine_cs *engine, static void init_l3cc_table(struct intel_engine_cs *engine,
const struct drm_i915_mocs_table *table) const struct drm_i915_mocs_table *table)
{ {
struct intel_uncore *uncore = engine->uncore; struct intel_uncore *uncore = engine->uncore;
u16 unused_value = table->table[I915_MOCS_PTE].l3cc_value;
unsigned int i; unsigned int i;
u32 l3cc;
for (i = 0; i < table->size / 2; i++) { for_each_l3cc(l3cc, table, i)
u16 low = get_entry_l3cc(table, 2 * i); intel_uncore_write_fw(uncore, GEN9_LNCFCMOCS(i), l3cc);
u16 high = get_entry_l3cc(table, 2 * i + 1);
intel_uncore_write(uncore,
GEN9_LNCFCMOCS(i),
l3cc_combine(low, high));
}
/* Odd table size - 1 left over */
if (table->size & 1) {
u16 low = get_entry_l3cc(table, 2 * i);
intel_uncore_write(uncore,
GEN9_LNCFCMOCS(i),
l3cc_combine(low, unused_value));
i++;
}
/* All remaining entries are also unused */
for (; i < table->n_entries / 2; i++)
intel_uncore_write(uncore,
GEN9_LNCFCMOCS(i),
l3cc_combine(unused_value, unused_value));
} }
void intel_mocs_init_engine(struct intel_engine_cs *engine) void intel_mocs_init_engine(struct intel_engine_cs *engine)
...@@ -443,11 +426,14 @@ void intel_mocs_init_engine(struct intel_engine_cs *engine) ...@@ -443,11 +426,14 @@ void intel_mocs_init_engine(struct intel_engine_cs *engine)
init_l3cc_table(engine, &table); init_l3cc_table(engine, &table);
} }
static void intel_mocs_init_global(struct intel_gt *gt) static u32 global_mocs_offset(void)
{
return i915_mmio_reg_offset(GEN12_GLOBAL_MOCS(0));
}
static void init_global_mocs(struct intel_gt *gt)
{ {
struct intel_uncore *uncore = gt->uncore;
struct drm_i915_mocs_table table; struct drm_i915_mocs_table table;
unsigned int index;
/* /*
* LLC and eDRAM control values are not applicable to dgfx * LLC and eDRAM control values are not applicable to dgfx
...@@ -455,29 +441,14 @@ static void intel_mocs_init_global(struct intel_gt *gt) ...@@ -455,29 +441,14 @@ static void intel_mocs_init_global(struct intel_gt *gt)
if (IS_DGFX(gt->i915)) if (IS_DGFX(gt->i915))
return; return;
GEM_BUG_ON(!HAS_GLOBAL_MOCS_REGISTERS(gt->i915));
if (!get_mocs_settings(gt->i915, &table)) if (!get_mocs_settings(gt->i915, &table))
return; return;
for (index = 0; index < table.size; index++) __init_mocs_table(gt->uncore, &table, global_mocs_offset());
intel_uncore_write(uncore,
GEN12_GLOBAL_MOCS(index),
table.table[index].control_value);
/*
* Ok, now set the unused entries to the invalid entry (index 0). These
* entries are officially undefined and no contract for the contents and
* settings is given for these entries.
*/
for (; index < table.n_entries; index++)
intel_uncore_write(uncore,
GEN12_GLOBAL_MOCS(index),
table.table[I915_MOCS_PTE].control_value);
} }
void intel_mocs_init(struct intel_gt *gt) void intel_mocs_init(struct intel_gt *gt)
{ {
if (HAS_GLOBAL_MOCS_REGISTERS(gt->i915)) if (HAS_GLOBAL_MOCS_REGISTERS(gt->i915))
intel_mocs_init_global(gt); init_global_mocs(gt);
} }
...@@ -11689,13 +11689,18 @@ enum skl_power_gate { ...@@ -11689,13 +11689,18 @@ enum skl_power_gate {
/* MOCS (Memory Object Control State) registers */ /* MOCS (Memory Object Control State) registers */
#define GEN9_LNCFCMOCS(i) _MMIO(0xb020 + (i) * 4) /* L3 Cache Control */ #define GEN9_LNCFCMOCS(i) _MMIO(0xb020 + (i) * 4) /* L3 Cache Control */
#define GEN9_GFX_MOCS(i) _MMIO(0xc800 + (i) * 4) /* Graphics MOCS registers */ #define __GEN9_RCS0_MOCS0 0xc800
#define GEN9_MFX0_MOCS(i) _MMIO(0xc900 + (i) * 4) /* Media 0 MOCS registers */ #define GEN9_GFX_MOCS(i) _MMIO(__GEN9_RCS0_MOCS0 + (i) * 4)
#define GEN9_MFX1_MOCS(i) _MMIO(0xca00 + (i) * 4) /* Media 1 MOCS registers */ #define __GEN9_VCS0_MOCS0 0xc900
#define GEN9_VEBOX_MOCS(i) _MMIO(0xcb00 + (i) * 4) /* Video MOCS registers */ #define GEN9_MFX0_MOCS(i) _MMIO(__GEN9_VCS0_MOCS0 + (i) * 4)
#define GEN9_BLT_MOCS(i) _MMIO(0xcc00 + (i) * 4) /* Blitter MOCS registers */ #define __GEN9_VCS1_MOCS0 0xca00
/* Media decoder 2 MOCS registers */ #define GEN9_MFX1_MOCS(i) _MMIO(__GEN9_VCS1_MOCS0 + (i) * 4)
#define GEN11_MFX2_MOCS(i) _MMIO(0x10000 + (i) * 4) #define __GEN9_VECS0_MOCS0 0xcb00
#define GEN9_VEBOX_MOCS(i) _MMIO(__GEN9_VECS0_MOCS0 + (i) * 4)
#define __GEN9_BCS0_MOCS0 0xcc00
#define GEN9_BLT_MOCS(i) _MMIO(__GEN9_BCS0_MOCS0 + (i) * 4)
#define __GEN11_VCS2_MOCS0 0x10000
#define GEN11_MFX2_MOCS(i) _MMIO(__GEN11_VCS2_MOCS0 + (i) * 4)
#define GEN10_SCRATCH_LNCF2 _MMIO(0xb0a0) #define GEN10_SCRATCH_LNCF2 _MMIO(0xb0a0)
#define PMFLUSHDONE_LNICRSDROP (1 << 20) #define PMFLUSHDONE_LNICRSDROP (1 << 20)
......
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