Commit 14128d64 authored by Matt Roper's avatar Matt Roper

drm/i915: Replace several IS_METEORLAKE with proper IP version checks

Many of the IS_METEORLAKE conditions throughout the driver are supposed
to be checks for Xe_LPG and/or Xe_LPM+ IP, not for the MTL platform
specifically.  Update those checks to ensure that the code will still
operate properly if/when these IP versions show up on future platforms.

v2:
 - Update two more conditions (one for pg_enable, one for MTL HuC
   compatibility).
v3:
 - Don't change GuC/HuC compatibility check, which sounds like it truly
   is specific to the MTL platform.  (Gustavo)
 - Drop a non-lineage workaround number for the OA timestamp frequency
   workaround.  (Gustavo)

Cc: Gustavo Sousa <gustavo.sousa@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230821180619.650007-20-matthew.d.roper@intel.com
parent 2e3c369f
...@@ -405,8 +405,8 @@ static int ext_set_pat(struct i915_user_extension __user *base, void *data) ...@@ -405,8 +405,8 @@ static int ext_set_pat(struct i915_user_extension __user *base, void *data)
BUILD_BUG_ON(sizeof(struct drm_i915_gem_create_ext_set_pat) != BUILD_BUG_ON(sizeof(struct drm_i915_gem_create_ext_set_pat) !=
offsetofend(struct drm_i915_gem_create_ext_set_pat, rsvd)); offsetofend(struct drm_i915_gem_create_ext_set_pat, rsvd));
/* Limiting the extension only to Meteor Lake */ /* Limiting the extension only to Xe_LPG and beyond */
if (!IS_METEORLAKE(i915)) if (GRAPHICS_VER_FULL(i915) < IP_VER(12, 70))
return -ENODEV; return -ENODEV;
if (copy_from_user(&ext, base, sizeof(ext))) if (copy_from_user(&ext, base, sizeof(ext)))
......
...@@ -21,7 +21,7 @@ static void intel_gsc_idle_msg_enable(struct intel_engine_cs *engine) ...@@ -21,7 +21,7 @@ static void intel_gsc_idle_msg_enable(struct intel_engine_cs *engine)
{ {
struct drm_i915_private *i915 = engine->i915; struct drm_i915_private *i915 = engine->i915;
if (IS_METEORLAKE(i915) && engine->id == GSC0) { if (MEDIA_VER(i915) >= 13 && engine->id == GSC0) {
intel_uncore_write(engine->gt->uncore, intel_uncore_write(engine->gt->uncore,
RC_PSMI_CTRL_GSCCS, RC_PSMI_CTRL_GSCCS,
_MASKED_BIT_DISABLE(IDLE_MSG_DISABLE)); _MASKED_BIT_DISABLE(IDLE_MSG_DISABLE));
......
...@@ -495,7 +495,7 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915, ...@@ -495,7 +495,7 @@ 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; table->unused_entries_index = I915_MOCS_PTE;
if (IS_METEORLAKE(i915)) { if (IS_GFX_GT_IP_RANGE(&i915->gt0, IP_VER(12, 70), IP_VER(12, 71))) {
table->size = ARRAY_SIZE(mtl_mocs_table); table->size = ARRAY_SIZE(mtl_mocs_table);
table->table = mtl_mocs_table; table->table = mtl_mocs_table;
table->n_entries = MTL_NUM_MOCS_ENTRIES; table->n_entries = MTL_NUM_MOCS_ENTRIES;
......
...@@ -123,7 +123,7 @@ static void gen11_rc6_enable(struct intel_rc6 *rc6) ...@@ -123,7 +123,7 @@ static void gen11_rc6_enable(struct intel_rc6 *rc6)
* temporary wa and should be removed after fixing real cause * temporary wa and should be removed after fixing real cause
* of forcewake timeouts. * of forcewake timeouts.
*/ */
if (IS_METEORLAKE(gt->i915)) if (IS_GFX_GT_IP_RANGE(gt, IP_VER(12, 70), IP_VER(12, 71)))
pg_enable = pg_enable =
GEN9_MEDIA_PG_ENABLE | GEN9_MEDIA_PG_ENABLE |
GEN11_MEDIA_SAMPLER_PG_ENABLE; GEN11_MEDIA_SAMPLER_PG_ENABLE;
......
...@@ -705,7 +705,7 @@ static int __reset_guc(struct intel_gt *gt) ...@@ -705,7 +705,7 @@ static int __reset_guc(struct intel_gt *gt)
static bool needs_wa_14015076503(struct intel_gt *gt, intel_engine_mask_t engine_mask) static bool needs_wa_14015076503(struct intel_gt *gt, intel_engine_mask_t engine_mask)
{ {
if (!IS_METEORLAKE(gt->i915) || !HAS_ENGINE(gt, GSC0)) if (MEDIA_VER_FULL(gt->i915) != IP_VER(13, 0) || !HAS_ENGINE(gt, GSC0))
return false; return false;
if (!__HAS_ENGINE(engine_mask, GSC0)) if (!__HAS_ENGINE(engine_mask, GSC0))
......
...@@ -1161,7 +1161,7 @@ void gen6_rps_get_freq_caps(struct intel_rps *rps, struct intel_rps_freq_caps *c ...@@ -1161,7 +1161,7 @@ void gen6_rps_get_freq_caps(struct intel_rps *rps, struct intel_rps_freq_caps *c
{ {
struct drm_i915_private *i915 = rps_to_i915(rps); struct drm_i915_private *i915 = rps_to_i915(rps);
if (IS_METEORLAKE(i915)) if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 70))
return mtl_get_freq_caps(rps, caps); return mtl_get_freq_caps(rps, caps);
else else
return __gen6_rps_get_freq_caps(rps, caps); return __gen6_rps_get_freq_caps(rps, caps);
......
...@@ -144,7 +144,7 @@ static const char *i915_cache_level_str(struct drm_i915_gem_object *obj) ...@@ -144,7 +144,7 @@ static const char *i915_cache_level_str(struct drm_i915_gem_object *obj)
{ {
struct drm_i915_private *i915 = obj_to_i915(obj); struct drm_i915_private *i915 = obj_to_i915(obj);
if (IS_METEORLAKE(i915)) { if (IS_GFX_GT_IP_RANGE(to_gt(i915), IP_VER(12, 70), IP_VER(12, 71))) {
switch (obj->pat_index) { switch (obj->pat_index) {
case 0: return " WB"; case 0: return " WB";
case 1: return " WT"; case 1: return " WT";
......
...@@ -3220,11 +3220,10 @@ get_sseu_config(struct intel_sseu *out_sseu, ...@@ -3220,11 +3220,10 @@ get_sseu_config(struct intel_sseu *out_sseu,
*/ */
u32 i915_perf_oa_timestamp_frequency(struct drm_i915_private *i915) u32 i915_perf_oa_timestamp_frequency(struct drm_i915_private *i915)
{ {
/* struct intel_gt *gt = to_gt(i915);
* Wa_18013179988:dg2
* Wa_14015846243:mtl /* Wa_18013179988 */
*/ if (IS_DG2(i915) || IS_GFX_GT_IP_RANGE(gt, IP_VER(12, 70), IP_VER(12, 71))) {
if (IS_DG2(i915) || IS_METEORLAKE(i915)) {
intel_wakeref_t wakeref; intel_wakeref_t wakeref;
u32 reg, shift; u32 reg, shift;
...@@ -4507,7 +4506,7 @@ static bool xehp_is_valid_b_counter_addr(struct i915_perf *perf, u32 addr) ...@@ -4507,7 +4506,7 @@ static bool xehp_is_valid_b_counter_addr(struct i915_perf *perf, u32 addr)
static bool gen12_is_valid_mux_addr(struct i915_perf *perf, u32 addr) static bool gen12_is_valid_mux_addr(struct i915_perf *perf, u32 addr)
{ {
if (IS_METEORLAKE(perf->i915)) if (GRAPHICS_VER_FULL(perf->i915) >= IP_VER(12, 70))
return reg_in_range_table(addr, mtl_oa_mux_regs); return reg_in_range_table(addr, mtl_oa_mux_regs);
else else
return reg_in_range_table(addr, gen12_oa_mux_regs); return reg_in_range_table(addr, gen12_oa_mux_regs);
......
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