diff options
| author | Linus Torvalds | 2014-03-28 10:58:10 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2014-03-28 10:58:10 -0700 |
| commit | 1fac1fa965a9fbdb38d8a4b945db3521f801c946 (patch) | |
| tree | 26a1152acc6faaca6427471a3934255812bbcf38 /kernel/res_counter.c | |
| parent | 350bb4bebf5d80937eb41b39509779888bc8aa75 (diff) | |
| parent | 8ee661b505613ef2747b350ca2871a31b3781bee (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"I didn't want these to wait for stable cycle.
The nouveau and radeon ones are the same problem, where the runtime pm
stuff broke non-runtime pm managed secondary GPUs.
The udl fix is for an oops on unplug, and the i915 fix is for a
regression on Sandybridge even though it may break haswell (regression
wins)"
Daniel Vetter comments:
"My apologies for the i915 regression fumble, that thing somehow fell
through the cracks here for almost half a year :( Imo that's more than
enough flailing to just go ahead with the revert, and the re-broken
hsw should get peoples attention ..."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: Undo gtt scratch pte unmapping again
drm/radeon: fix runtime suspend breaking secondary GPUs
drm/nouveau: fail runtime pm properly.
drm/udl: take reference to device struct for dma-bufs
Diffstat (limited to 'kernel/res_counter.c')
0 files changed, 0 insertions, 0 deletions