summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2025-08-18 13:07:27 +0300
committerJani Nikula <jani.nikula@intel.com>2025-08-19 11:20:40 +0300
commit10e656f8c4a6b99f905bf024712c4d56882bb6a9 (patch)
treed68d33decd93f1b11e7ab0792576fc13349568bf
parent6c9f41d8fa808f9020fbd64f74cf872080f2cd74 (diff)
drm/i915/dram: bypass fsb/mem freq detection on dg2 and no display
Non-display now calls the intel_fsb_freq() and intel_mem_freq() functions, so we don't have to have the frequencies initialized for dg2 or non-display cases. This is in preparation for unifying the pre-gen9 handling in dram info. DG2 remains a special case as described in commit 5eb6bf0b44e7 ("drm/i915/dg2: Don't read DRAM info"). v2: Rebase Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://lore.kernel.org/r/7bfed06d431354f3918ea73d43a2ec8ed9426a76.1755511595.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-rw-r--r--drivers/gpu/drm/i915/soc/intel_dram.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/soc/intel_dram.c b/drivers/gpu/drm/i915/soc/intel_dram.c
index 02b8fa784525..e087e8d205f7 100644
--- a/drivers/gpu/drm/i915/soc/intel_dram.c
+++ b/drivers/gpu/drm/i915/soc/intel_dram.c
@@ -727,10 +727,13 @@ int intel_dram_detect(struct drm_i915_private *i915)
struct dram_info *dram_info;
int ret;
+ if (IS_DG2(i915) || !HAS_DISPLAY(display))
+ return 0;
+
detect_fsb_freq(i915);
detect_mem_freq(i915);
- if (GRAPHICS_VER(i915) < 9 || IS_DG2(i915) || !HAS_DISPLAY(display))
+ if (GRAPHICS_VER(i915) < 9)
return 0;
dram_info = drmm_kzalloc(&i915->drm, sizeof(*dram_info), GFP_KERNEL);