Skip to content

Commit 115cebc

Browse files
committed
drm/i915/dram: s/wm_lv0.../has_16gb_dimms/
The DRAM code shouldn't know anything about watermarks. Rename wm_lv_0_adjust_needed to has_16gb_dimms. How this gets used is up to the watermark code. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250902133113.18778-5-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com>
1 parent da548f7 commit 115cebc

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

drivers/gpu/drm/i915/display/skl_watermark.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3214,7 +3214,7 @@ adjust_wm_latency(struct intel_display *display,
32143214
* any underrun. If not able to get Dimm info assume 16GB dimm
32153215
* to avoid any underrun.
32163216
*/
3217-
if (!display->platform.dg2 && dram_info->wm_lv_0_adjust_needed)
3217+
if (!display->platform.dg2 && dram_info->has_16gb_dimms)
32183218
wm[0] += 1;
32193219
}
32203220

drivers/gpu/drm/i915/soc/intel_dram.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ skl_dram_get_channels_info(struct drm_i915_private *i915, struct dram_info *dram
428428
return -EINVAL;
429429
}
430430

431-
dram_info->wm_lv_0_adjust_needed = ch0.is_16gb_dimm || ch1.is_16gb_dimm;
431+
dram_info->has_16gb_dimms = ch0.is_16gb_dimm || ch1.is_16gb_dimm;
432432

433433
dram_info->symmetric_memory = intel_is_dram_symmetric(&ch0, &ch1);
434434

@@ -673,7 +673,7 @@ static int gen11_get_dram_info(struct drm_i915_private *i915, struct dram_info *
673673

674674
static int gen12_get_dram_info(struct drm_i915_private *i915, struct dram_info *dram_info)
675675
{
676-
dram_info->wm_lv_0_adjust_needed = false;
676+
dram_info->has_16gb_dimms = false;
677677

678678
return icl_pcode_read_mem_global_info(i915, dram_info);
679679
}
@@ -737,10 +737,10 @@ int intel_dram_detect(struct drm_i915_private *i915)
737737
i915->dram_info = dram_info;
738738

739739
/*
740-
* Assume level 0 watermark latency adjustment is needed until proven
740+
* Assume 16Gb DIMMs are present until proven
741741
* otherwise, this w/a is not needed by bxt/glk.
742742
*/
743-
dram_info->wm_lv_0_adjust_needed = !IS_BROXTON(i915) && !IS_GEMINILAKE(i915);
743+
dram_info->has_16gb_dimms = !IS_BROXTON(i915) && !IS_GEMINILAKE(i915);
744744

745745
if (DISPLAY_VER(display) >= 14)
746746
ret = xelpdp_get_dram_info(i915, dram_info);
@@ -766,8 +766,8 @@ int intel_dram_detect(struct drm_i915_private *i915)
766766

767767
drm_dbg_kms(&i915->drm, "DRAM channels: %u\n", dram_info->num_channels);
768768

769-
drm_dbg_kms(&i915->drm, "Watermark level 0 adjustment needed: %s\n",
770-
str_yes_no(dram_info->wm_lv_0_adjust_needed));
769+
drm_dbg_kms(&i915->drm, "16Gb DIMMs: %s\n",
770+
str_yes_no(dram_info->has_16gb_dimms));
771771

772772
return 0;
773773
}

drivers/gpu/drm/i915/soc/intel_dram.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct dram_info {
3131
u8 num_qgv_points;
3232
u8 num_psf_gv_points;
3333
bool symmetric_memory;
34-
bool wm_lv_0_adjust_needed;
34+
bool has_16gb_dimms;
3535
};
3636

3737
void intel_dram_edram_detect(struct drm_i915_private *i915);

0 commit comments

Comments
 (0)