Commit 18354b42 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Joonas Lahtinen

drm/i915: Don't apply the 16Gb DIMM wm latency w/a to BXT/GLK

The 16Gb DIMM w/a is not applicable to BXT or GLK. Limit it to
the appropriate platforms.

This was especially harsh on GLK since we don't even try to read
the DIMM information on that platforms, hence valid_dimm was
always false and thus we always tried to apply the w/a.
Furthermore the w/a pushed the level 0 latency above the
level 1 latency, which doesn't really make sense.

v2: Do the check when populating is_16gb_dimm (Mahesh)

Cc: Mahesh Kumar <mahesh1.kumar@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fixes: 86b59287 ("drm/i915: Implement 16GB dimm wa for latency level-0")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181023182102.31549-1-ville.syrjala@linux.intel.comReviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarMahesh Kumar <mahesh1.sh.kumar@gmail.com>
(cherry picked from commit 5d6f36b2)
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 65102238
...@@ -1175,8 +1175,6 @@ skl_dram_get_channels_info(struct drm_i915_private *dev_priv) ...@@ -1175,8 +1175,6 @@ skl_dram_get_channels_info(struct drm_i915_private *dev_priv)
return -EINVAL; return -EINVAL;
} }
dram_info->valid_dimm = true;
/* /*
* If any of the channel is single rank channel, worst case output * If any of the channel is single rank channel, worst case output
* will be same as if single rank memory, so consider single rank * will be same as if single rank memory, so consider single rank
...@@ -1193,8 +1191,7 @@ skl_dram_get_channels_info(struct drm_i915_private *dev_priv) ...@@ -1193,8 +1191,7 @@ skl_dram_get_channels_info(struct drm_i915_private *dev_priv)
return -EINVAL; return -EINVAL;
} }
if (ch0.is_16gb_dimm || ch1.is_16gb_dimm) dram_info->is_16gb_dimm = ch0.is_16gb_dimm || ch1.is_16gb_dimm;
dram_info->is_16gb_dimm = true;
dev_priv->dram_info.symmetric_memory = intel_is_dram_symmetric(val_ch0, dev_priv->dram_info.symmetric_memory = intel_is_dram_symmetric(val_ch0,
val_ch1, val_ch1,
...@@ -1314,7 +1311,6 @@ bxt_get_dram_info(struct drm_i915_private *dev_priv) ...@@ -1314,7 +1311,6 @@ bxt_get_dram_info(struct drm_i915_private *dev_priv)
return -EINVAL; return -EINVAL;
} }
dram_info->valid_dimm = true;
dram_info->valid = true; dram_info->valid = true;
return 0; return 0;
} }
...@@ -1327,12 +1323,17 @@ intel_get_dram_info(struct drm_i915_private *dev_priv) ...@@ -1327,12 +1323,17 @@ intel_get_dram_info(struct drm_i915_private *dev_priv)
int ret; int ret;
dram_info->valid = false; dram_info->valid = false;
dram_info->valid_dimm = false;
dram_info->is_16gb_dimm = false;
dram_info->rank = I915_DRAM_RANK_INVALID; dram_info->rank = I915_DRAM_RANK_INVALID;
dram_info->bandwidth_kbps = 0; dram_info->bandwidth_kbps = 0;
dram_info->num_channels = 0; dram_info->num_channels = 0;
/*
* Assume 16Gb DIMMs are present until proven otherwise.
* This is only used for the level 0 watermark latency
* w/a which does not apply to bxt/glk.
*/
dram_info->is_16gb_dimm = !IS_GEN9_LP(dev_priv);
if (INTEL_GEN(dev_priv) < 9 || IS_GEMINILAKE(dev_priv)) if (INTEL_GEN(dev_priv) < 9 || IS_GEMINILAKE(dev_priv))
return; return;
......
...@@ -1948,7 +1948,6 @@ struct drm_i915_private { ...@@ -1948,7 +1948,6 @@ struct drm_i915_private {
struct dram_info { struct dram_info {
bool valid; bool valid;
bool valid_dimm;
bool is_16gb_dimm; bool is_16gb_dimm;
u8 num_channels; u8 num_channels;
enum dram_rank { enum dram_rank {
......
...@@ -2881,8 +2881,7 @@ static void intel_read_wm_latency(struct drm_i915_private *dev_priv, ...@@ -2881,8 +2881,7 @@ static void intel_read_wm_latency(struct drm_i915_private *dev_priv,
* any underrun. If not able to get Dimm info assume 16GB dimm * any underrun. If not able to get Dimm info assume 16GB dimm
* to avoid any underrun. * to avoid any underrun.
*/ */
if (!dev_priv->dram_info.valid_dimm || if (dev_priv->dram_info.is_16gb_dimm)
dev_priv->dram_info.is_16gb_dimm)
wm[0] += 1; wm[0] += 1;
} else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) {
......
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