Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04115a9d authored by Eric Anholt's avatar Eric Anholt Committed by Keith Packard
Browse files

drm/i915: Re-enable gen7 RC6 and GPU turbo after resume. 



Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarKeith Packard <keithp@keithp.com>
Reviewed-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: default avatarKenneth Graunke <kenneth@whitecape.org>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent fff24e21

drivers/gpu/drm/i915/i915_suspend.c

+2 −2
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ int i915_save_state(struct drm_device *dev) 


	if (IS_IRONLAKE_M(dev))

		ironlake_disable_drps(dev);

	if (IS_GEN6(dev))

	if (INTEL_INFO(dev)->gen >= 6)

		gen6_disable_rps(dev);



	/* Cache mode state */
@@ -886,7 +886,7 @@ int i915_restore_state(struct drm_device *dev) 
		intel_init_emon(dev);

	}



	if (IS_GEN6(dev)) {

	if (INTEL_INFO(dev)->gen >= 6) {

		gen6_enable_rps(dev_priv);

		gen6_update_ring_freq(dev_priv);

	}