Commit 10e656f8 authored by Jani Nikula's avatar Jani Nikula
Browse files

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 5eb6bf0b
("drm/i915/dg2: Don't read DRAM info").

v2: Rebase

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/7bfed06d431354f3918ea73d43a2ec8ed9426a76.1755511595.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 6c9f41d8

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

+4 −1
Original line number Diff line number Diff line
@@ -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);