diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-11-15 19:00:43 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-11-15 19:00:43 -0500 |
| commit | 6f755116c93ca35f496ccf1910dcd28cd16713e3 (patch) | |
| tree | b02aa6c62ede6ca80a8ca7bc4292515bf8059c69 /arch/sparc/lib/blockops.S | |
| parent | 3697fd50a561f3b0ddcd1404edb7b81cb696e5e0 (diff) | |
| parent | 2f4f649a69a9eb51f6e98130e19dd90a260a4145 (diff) | |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Daniel writes:
Just a few small things to fix regressions, somehow all patches from Jani:
- Fix dpms confusion about which platforms support intermediate modes on
vga.
- Revert the "ignore vbt for eDP bpc" patch, it breaks machines. This will
annoy mbp retina owners again, but windows machines seem to _really_
depend upon this. We can try to quirk the mbp retinas again in 3.8 and
backport the patch.
- Fix connector leaks when the sdvo setup failed, resulted in an OOPS
later on when trying to probe that connector (with it's encoder kfree'd
already).
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: do not ignore eDP bpc settings from vbt
drm/i915/sdvo: clean up connectors on intel_sdvo_init() failures
drm/i915/crt: fix DPMS standby and suspend mode handling
Diffstat (limited to 'arch/sparc/lib/blockops.S')
0 files changed, 0 insertions, 0 deletions