Commit 54b4f68f authored by Chris Wilson's avatar Chris Wilson
Browse files

Revert "drm/i915: Enable RC6 immediately" 



This reverts commit b12e0ee2 ("drm/i915: Enable RC6 immediately"),
as it was never meant to be sent anywhere other than the bug report for
experimentation.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1469132179-4052-1-git-send-email-chris@chris-wilson.co.uk


Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 843759a5

drivers/gpu/drm/i915/i915_drv.c

+2 −3
Original line number Diff line number Diff line
@@ -1630,6 +1630,7 @@ static int i915_drm_resume(struct drm_device *dev) 


	intel_opregion_notify_adapter(dev_priv, PCI_D0);



	intel_autoenable_gt_powersave(dev_priv);

	drm_kms_helper_poll_enable(dev);



	enable_rpm_wakeref_asserts(dev_priv);
@@ -1811,8 +1812,7 @@ int i915_reset(struct drm_i915_private *dev_priv) 
	 * previous concerns that it doesn't respond well to some forms

	 * of re-init after reset.

	 */

	if (INTEL_GEN(dev_priv) > 5)

		intel_enable_gt_powersave(dev_priv);

	intel_autoenable_gt_powersave(dev_priv);



	return 0;
@@ -2440,7 +2440,6 @@ static int intel_runtime_resume(struct device *device) 
	i915_gem_init_swizzling(dev);



	intel_runtime_pm_enable_interrupts(dev_priv);

	intel_enable_gt_powersave(dev_priv);



	/*

	 * On VLV/CHV display interrupts are part of the display

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -1192,6 +1192,7 @@ struct intel_gen6_power_mgmt { 
	bool client_boost;



	bool enabled;

	struct delayed_work autoenable_work;

	unsigned boosts;



	/* manual wa residency calculations */

drivers/gpu/drm/i915/i915_gem.c

+2 −0
Original line number Diff line number Diff line
@@ -4355,6 +4355,8 @@ i915_gem_suspend(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = to_i915(dev);

	int ret = 0;



	intel_suspend_gt_powersave(dev_priv);



	mutex_lock(&dev->struct_mutex);



	/* We have to flush all the executing contexts to main memory so

drivers/gpu/drm/i915/i915_gem_request.c

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ static void i915_gem_mark_busy(const struct intel_engine_cs *engine) 
	intel_runtime_pm_get_noresume(dev_priv);

	dev_priv->gt.awake = true;



	intel_enable_gt_powersave(dev_priv);

	i915_update_gfx_val(dev_priv);

	if (INTEL_GEN(dev_priv) >= 6)

		gen6_rps_busy(dev_priv);

drivers/gpu/drm/i915/intel_display.c

+0 −1
Original line number Diff line number Diff line
@@ -15502,7 +15502,6 @@ void intel_modeset_init_hw(struct drm_device *dev) 
	dev_priv->atomic_cdclk_freq = dev_priv->cdclk_freq;



	intel_init_clock_gating(dev);

	intel_enable_gt_powersave(dev_priv);

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE