diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-03 13:51:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-03 13:51:50 -0800 |
| commit | 46d967ae74ba4412b39f4df9b4fcbe0a766989f4 (patch) | |
| tree | 9b22d258f8c5055e894544b557221a9339002c48 /Documentation/frv | |
| parent | 9044f940ea7479cbda4cf015ec5727fbdb048080 (diff) | |
| parent | 00d6a9b6be5885ad38234cd171f6fb18a87faa7c (diff) | |
| download | linux-46d967ae74ba4412b39f4df9b4fcbe0a766989f4.tar.bz2 | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Radeon and Nouveau fixes:
So nouveau had a few regression introduced, Ben and Maarten finally
tracked down the one that was causing problems on my MacBookPro, also
nvidia gave some info on the an engine we were using incorrectly, so
disable our use of it, and one regresion with pci hotplug affecting
optimus users.
Radeon has an oops fixs, sync fix, and one workaround to avoid broken
functionality on 32-bit x86, this needs better root causing and a
better fix, but the bandaid is a lot safer at this point"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: kernel panic in drm_calc_vbltimestamp_from_scanoutpos with 3.18.0-rc6
drm/radeon: Ignore RADEON_GEM_GTT_WC on 32-bit x86
drm/radeon: sync all BOs involved in a CS v2
nouveau: move the hotplug ignore to correct place.
drm/nouveau/gf116: remove copy1 engine
drm/nouveau: prevent stale fence->channel pointers, and protect with rcu
drm/nouveau/fifo/g84-: ack non-stall interrupt before handling it
Diffstat (limited to 'Documentation/frv')
0 files changed, 0 insertions, 0 deletions