diff options
| -rw-r--r-- | drivers/gpu/drm/i915/display/skl_watermark.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/soc/intel_dram.c | 12 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/soc/intel_dram.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c index 33885d619a97..ae3ce0d65cfc 100644 --- a/drivers/gpu/drm/i915/display/skl_watermark.c +++ b/drivers/gpu/drm/i915/display/skl_watermark.c @@ -3214,7 +3214,7 @@ adjust_wm_latency(struct intel_display *display, * any underrun. If not able to get Dimm info assume 16GB dimm * to avoid any underrun. */ - if (!display->platform.dg2 && dram_info->wm_lv_0_adjust_needed) + if (!display->platform.dg2 && dram_info->has_16gb_dimms) wm[0] += 1; } diff --git a/drivers/gpu/drm/i915/soc/intel_dram.c b/drivers/gpu/drm/i915/soc/intel_dram.c index b4f0793f778d..efb72e137748 100644 --- a/drivers/gpu/drm/i915/soc/intel_dram.c +++ b/drivers/gpu/drm/i915/soc/intel_dram.c @@ -428,7 +428,7 @@ skl_dram_get_channels_info(struct drm_i915_private *i915, struct dram_info *dram return -EINVAL; } - dram_info->wm_lv_0_adjust_needed = ch0.is_16gb_dimm || ch1.is_16gb_dimm; + dram_info->has_16gb_dimms = ch0.is_16gb_dimm || ch1.is_16gb_dimm; dram_info->symmetric_memory = intel_is_dram_symmetric(&ch0, &ch1); @@ -673,7 +673,7 @@ static int gen11_get_dram_info(struct drm_i915_private *i915, struct dram_info * static int gen12_get_dram_info(struct drm_i915_private *i915, struct dram_info *dram_info) { - dram_info->wm_lv_0_adjust_needed = false; + dram_info->has_16gb_dimms = false; return icl_pcode_read_mem_global_info(i915, dram_info); } @@ -737,10 +737,10 @@ int intel_dram_detect(struct drm_i915_private *i915) i915->dram_info = dram_info; /* - * Assume level 0 watermark latency adjustment is needed until proven + * Assume 16Gb DIMMs are present until proven * otherwise, this w/a is not needed by bxt/glk. */ - dram_info->wm_lv_0_adjust_needed = !IS_BROXTON(i915) && !IS_GEMINILAKE(i915); + dram_info->has_16gb_dimms = !IS_BROXTON(i915) && !IS_GEMINILAKE(i915); if (DISPLAY_VER(display) >= 14) ret = xelpdp_get_dram_info(i915, dram_info); @@ -766,8 +766,8 @@ int intel_dram_detect(struct drm_i915_private *i915) drm_dbg_kms(&i915->drm, "DRAM channels: %u\n", dram_info->num_channels); - drm_dbg_kms(&i915->drm, "Watermark level 0 adjustment needed: %s\n", - str_yes_no(dram_info->wm_lv_0_adjust_needed)); + drm_dbg_kms(&i915->drm, "16Gb DIMMs: %s\n", + str_yes_no(dram_info->has_16gb_dimms)); return 0; } diff --git a/drivers/gpu/drm/i915/soc/intel_dram.h b/drivers/gpu/drm/i915/soc/intel_dram.h index 6212944d44aa..03a973f1c941 100644 --- a/drivers/gpu/drm/i915/soc/intel_dram.h +++ b/drivers/gpu/drm/i915/soc/intel_dram.h @@ -31,7 +31,7 @@ struct dram_info { u8 num_qgv_points; u8 num_psf_gv_points; bool symmetric_memory; - bool wm_lv_0_adjust_needed; + bool has_16gb_dimms; }; void intel_dram_edram_detect(struct drm_i915_private *i915); |