Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Browse source

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

...

This commit is contained in:

Linus Torvalds 2014-03-28 10:58:10 -07:00

parent 350bb4bebf 8ee661b505

commit 1fac1fa965

4 changed files with 31 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/gpu/drm/i915/i915_gem_gtt.c

View file

14

drivers/gpu/drm/nouveau/nouveau_drm.c

View file

17

drivers/gpu/drm/radeon/radeon_drv.c

View file

11

drivers/gpu/drm/udl/udl_gem.c

View file