Skip to content

Commit

Permalink
drm/i915: Rename is_16gb_dimm to wm_lv_0_adjust_needed
Browse files Browse the repository at this point in the history
As it now it is always required for GEN12+ the is_16gb_dimm name
do not make sense for GEN12+.

v2:
- Updated comment on top of "dram_info->wm_lv_0_adjust_needed =
!IS_GEN9_LP(i915);"

Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210128164312.91160-3-jose.souza@intel.com
  • Loading branch information
José Roberto de Souza committed Jan 29, 2021
1 parent 5d0c938 commit 66a2450
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/i915_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ struct drm_i915_private {
} wm;

struct dram_info {
bool is_16gb_dimm;
bool wm_lv_0_adjust_needed;
u8 num_channels;
bool symmetric_memory;
enum intel_dram_type {
Expand Down
15 changes: 7 additions & 8 deletions drivers/gpu/drm/i915/intel_dram.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ skl_dram_get_channels_info(struct drm_i915_private *i915)
return -EINVAL;
}

dram_info->is_16gb_dimm = ch0.is_16gb_dimm || ch1.is_16gb_dimm;
dram_info->wm_lv_0_adjust_needed = ch0.is_16gb_dimm || ch1.is_16gb_dimm;

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

Expand Down Expand Up @@ -479,7 +479,7 @@ static int gen11_get_dram_info(struct drm_i915_private *i915)
static int gen12_get_dram_info(struct drm_i915_private *i915)
{
/* Always needed for GEN12+ */
i915->dram_info.is_16gb_dimm = true;
i915->dram_info.wm_lv_0_adjust_needed = true;

return icl_pcode_read_mem_global_info(i915);
}
Expand All @@ -490,11 +490,10 @@ void intel_dram_detect(struct drm_i915_private *i915)
int ret;

/*
* 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.
* Assume level 0 watermark latency adjustment is needed until proven
* otherwise, this w/a is not needed by bxt/glk.
*/
dram_info->is_16gb_dimm = !IS_GEN9_LP(i915);
dram_info->wm_lv_0_adjust_needed = !IS_GEN9_LP(i915);

if (INTEL_GEN(i915) < 9 || !HAS_DISPLAY(i915))
return;
Expand All @@ -512,8 +511,8 @@ void 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, "DRAM 16Gb DIMMs: %s\n",
yesno(dram_info->is_16gb_dimm));
drm_dbg_kms(&i915->drm, "Watermark level 0 adjustment needed: %s\n",
yesno(dram_info->wm_lv_0_adjust_needed));
}

static u32 gen9_edram_size_mb(struct drm_i915_private *i915, u32 cap)
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -2930,7 +2930,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
* to avoid any underrun.
*/
if (dev_priv->dram_info.is_16gb_dimm)
if (dev_priv->dram_info.wm_lv_0_adjust_needed)
wm[0] += 1;

} else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) {
Expand Down

0 comments on commit 66a2450

Please sign in to comment.