tree c12e30ac9094addc09f2a636720ba9ab85f820a3
parent e91abf80a0998f326107874c88d549f94839f13c
parent 3f577573cd5482a32f85bd131e52f7cb4b9ac518
author Dave Airlie <airlied@redhat.com> 1376003377 +1000
committer Dave Airlie <airlied@redhat.com> 1376003377 +1000

Merge tag 'drm-intel-fixes-2013-08-08' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Daniel writes:
A few bugfixes for serious stuff and regressions. Highlight is the
reinstated hack to keep the i915 backlight on when running on an optimus
machine, this prevents black screens especially with some radeon muxed
platforms. And the patch to quiet dmesg on Linus' old mac mini ;-)

* tag 'drm-intel-fixes-2013-08-08' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: do not disable backlight on vgaswitcheroo switch off
  drm/i915: Don't call encoder's get_config unless encoder is active
  drm/i915: avoid brightness overflow when doing scale
  drm/i915: update last_vblank when disabling the power well
  drm/i915: fix gen4 digital port hotplug definitions