Commit c864e9ab authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Set rawclk earlier during mmio probe 



Older platforms use rawclk to derive the CS clock. rawclk is being
determined during intel_device_info_init(), and so that needs to be
pushed slightly earlier.

Fixes: f170523a ("drm/i915/gt: Consolidate the CS timestamp clocks")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarAndi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210104115145.24460-2-chris@chris-wilson.co.uk
parent 6895649b

drivers/gpu/drm/i915/i915_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ static int i915_driver_mmio_probe(struct drm_i915_private *dev_priv) 


	/* Try to make sure MCHBAR is enabled before poking at it */

	intel_setup_mchbar(dev_priv);

	intel_device_info_runtime_init(dev_priv);



	ret = intel_gt_init_mmio(&dev_priv->gt);

	if (ret)
@@ -516,8 +517,6 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv) 
	if (i915_inject_probe_failure(dev_priv))

		return -ENODEV;



	intel_device_info_runtime_init(dev_priv);



	if (HAS_PPGTT(dev_priv)) {

		if (intel_vgpu_active(dev_priv) &&

		    !intel_vgpu_has_full_ppgtt(dev_priv)) {