diff options
author | Dave Airlie <airlied@redhat.com> | 2012-04-12 16:01:57 +0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-04-12 20:41:10 +0400 |
commit | 19e5c4e72c7287491f0da64e26b6b7175942f502 (patch) | |
tree | e6dd9e513b68ec8febd77e7779fb831190a6a9be /drivers/zorro | |
parent | 46783150a6552f9513f08e62cfcc07125d6e502b (diff) | |
parent | 15a13bbdffb0d6288a5dd04aee9736267da1335f (diff) | |
download | linux-19e5c4e72c7287491f0da64e26b6b7175942f502.tar.xz |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-intel-fixes
Daniel Vetter writes:
3 regression fixes:
- disable gmbus again, too broken for 3.4, we'll try again for 3.5
- dp bandwidth computation fix, we've lost the 6bpc dithering flag
sometimes, this is a 3.3 regression (maybe even earlier for some
configurations).
- fix resume regression caused by the gen2/3 fencing fix merged into -rc2.
And a few other fixes:
- gpu hang fix for i845 (Chris)
- sprite fix (Armin Reese)
- crtc disable vs. scanlinewait race fix (Chris)
- rc6 module option read-only, it confused testers (Jesse)
- fbc related blitter death hw workaround, note that we disable fbc on snb
by default anyway.
With these fixes we have one 3.4 regression outstanding: One of the
cleanup patches for the interlaced support managed to confuse the lvds
panel fitter when upscaling. The root-cause is still unclear, but test
patches are awaiting feedback from the reporter.
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: clear fencing tracking state when retiring requests
drm/i915: make rc6 module parameter read-only
drm/i915: implement ColorBlt w/a
drm/i915/ringbuffer: Exclude last 2 cachlines of ring on 845g
Revert "drm/i915: reenable gmbus on gen3+ again"
drm/i915: properly compute dp dithering for user-created modes
drm/i915: Finish any pending operations on the framebuffer before disabling
drm/i915: Removed IVB forced enable of sprite dest key.
Diffstat (limited to 'drivers/zorro')
0 files changed, 0 insertions, 0 deletions