Commit 0232e927 authored by Eugeni Dodonov's avatar Eugeni Dodonov Committed by Daniel Vetter
Browse files

drm/i915: initialize power wells in modeset_init_hw 



This initializes power wells within the modeset_init_hw routine.
Testing has shown that this works for both driver load time and for
suspend-resume code paths.

Signed-off-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ff928261

drivers/gpu/drm/i915/intel_display.c

+5 −0
Original line number Diff line number Diff line
@@ -7187,6 +7187,11 @@ static void ivb_pch_pwm_override(struct drm_device *dev) 


void intel_modeset_init_hw(struct drm_device *dev)

{

	/* We attempt to init the necessary power wells early in the initialization

	 * time, so the subsystems that expect power to be enabled can work.

	 */

	intel_init_power_wells(dev);



	intel_prepare_ddi(dev);



	intel_init_clock_gating(dev);

drivers/gpu/drm/i915/intel_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -496,6 +496,7 @@ extern void intel_update_fbc(struct drm_device *dev); 
extern void intel_gpu_ips_init(struct drm_i915_private *dev_priv);

extern void intel_gpu_ips_teardown(void);



extern void intel_init_power_wells(struct drm_device *dev);

extern void intel_enable_gt_powersave(struct drm_device *dev);

extern void intel_disable_gt_powersave(struct drm_device *dev);

extern void gen6_gt_check_fifodbg(struct drm_i915_private *dev_priv);

drivers/gpu/drm/i915/intel_pm.c

+0 −5
Original line number Diff line number Diff line
@@ -3932,11 +3932,6 @@ void intel_init_pm(struct drm_device *dev) 
		else

			dev_priv->display.get_fifo_size = i830_get_fifo_size;

	}



	/* We attempt to init the necessary power wells early in the initialization

	 * time, so the subsystems that expect power to be enabled can work.

	 */

	intel_init_power_wells(dev);

}



static void __gen6_gt_wait_for_thread_c0(struct drm_i915_private *dev_priv)

CRA Git | Maintained and supported by SUSTech CRA and CCSE