Commit 3c0556e9 authored Feb 25, 2011 by Dave Airlie

Merge branch 'drm-intel-fixes' of...

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
  drm/i915: Fix unintended recursion in ironlake_disable_rc6

parents fbf92bea 99507307

drivers/gpu/drm/i915/intel_display.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -6575,7 +6575,7 @@ static void ironlake_disable_rc6(struct drm_device *dev)
		POSTING_READ(RSTDBYCTL);
		}

		ironlake_disable_rc6(dev);
		ironlake_teardown_rc6(dev);
		}

		static int ironlake_setup_rc6(struct drm_device *dev)