DRAM information is required to properly program display. Before "drm/i915/gen11+: Only load DRAM information from pcode" we were failing driver load if unable to fetch DRAM information from pcode form GEN11+ but we should also extend it to GEN9 plaforms.
Signed-off-by: José Roberto de Souza <[email protected]> --- drivers/gpu/drm/i915/i915_drv.c | 6 +++++- drivers/gpu/drm/i915/intel_dram.c | 13 +++++++++---- drivers/gpu/drm/i915/intel_dram.h | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 66f763fe7a83..6bfcd3ee6c66 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -615,12 +615,16 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) * Fill the dram structure to get the system dram info. This will be * used for memory latency calculation. */ - intel_dram_detect(dev_priv); + ret = intel_dram_detect(dev_priv); + if (ret) + goto err_dram; intel_bw_init_hw(dev_priv); return 0; +err_dram: + intel_gvt_driver_remove(dev_priv); err_msi: if (pdev->msi_enabled) pci_disable_msi(pdev); diff --git a/drivers/gpu/drm/i915/intel_dram.c b/drivers/gpu/drm/i915/intel_dram.c index 1298823c957c..4871d48589f9 100644 --- a/drivers/gpu/drm/i915/intel_dram.c +++ b/drivers/gpu/drm/i915/intel_dram.c @@ -481,7 +481,7 @@ static int gen11_get_dram_info(struct drm_i915_private *i915) return icl_pcode_read_mem_global_info(i915); } -void intel_dram_detect(struct drm_i915_private *i915) +int intel_dram_detect(struct drm_i915_private *i915) { struct dram_info *dram_info = &i915->dram_info; int ret; @@ -494,7 +494,7 @@ void intel_dram_detect(struct drm_i915_private *i915) dram_info->is_16gb_dimm = !IS_GEN9_LP(i915); if (INTEL_GEN(i915) < 9 || !HAS_DISPLAY(i915)) - return; + return 0; if (INTEL_GEN(i915) >= 11) ret = gen11_get_dram_info(i915); @@ -502,13 +502,18 @@ void intel_dram_detect(struct drm_i915_private *i915) ret = bxt_get_dram_info(i915); else ret = skl_get_dram_info(i915); - if (ret) - return; + + if (ret) { + drm_warn(&i915->drm, "Unable to load dram information\n"); + return ret; + } 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)); + + return 0; } static u32 gen9_edram_size_mb(struct drm_i915_private *i915, u32 cap) diff --git a/drivers/gpu/drm/i915/intel_dram.h b/drivers/gpu/drm/i915/intel_dram.h index 4ba13c13162c..2a0f283b1a1d 100644 --- a/drivers/gpu/drm/i915/intel_dram.h +++ b/drivers/gpu/drm/i915/intel_dram.h @@ -9,6 +9,6 @@ struct drm_i915_private; void intel_dram_edram_detect(struct drm_i915_private *i915); -void intel_dram_detect(struct drm_i915_private *i915); +int intel_dram_detect(struct drm_i915_private *i915); #endif /* __INTEL_DRAM_H__ */ -- 2.30.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
