diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-01-21 13:25:30 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-01-21 13:25:30 +1000 |
| commit | ffb5fd53ef27df22a6850019ecb5488686a573f1 (patch) | |
| tree | 10c32d0646febe9f52ffe92759069f37d21a5e8c /drivers/net/ethernet/dlink/de620.c | |
| parent | a3f5aed42f64878ad98006e27492255381bba061 (diff) | |
| parent | b514407547890686572606c9dfa4b7f832db9958 (diff) | |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
More important fixes for 3.9:
- error_state improvements to help debug the new scanline wait code added
for gen6+ - bug reports started popping up :( patch from Chris Wilson.
- fix a panel power sequence confusion between the eDP and lvds detection
code resulting in black screens - regression introduce in 3.8 (Jani
Nikula)
- Chris fixed the root-cause of the ilk relocation vs. evict bug.
- Another piece of cargo-culted rc6 lore from Jani, fixes up a regression
where a system refused to go into rc6 after suspend sometimes.
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: fix FORCEWAKE posting reads
drm/i915: Invalidate the relocation presumed_offsets along the slow path
drm/i915/eDP: do not write power sequence registers for ghost eDP
drm/i915: Record DERRMR, FORCEWAKE and RING_CTL in error-state
Diffstat (limited to 'drivers/net/ethernet/dlink/de620.c')
0 files changed, 0 insertions, 0 deletions