[git pull] drm radeon + nouveau fixes

Dave Airlie airlied at linux.ie
Tue Dec 2 17:10:30 PST 2014


Hi,

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.

Dave.

The following changes since commit 009d0431c3914de64666bec0d350e54fdd59df6a:

  Linux 3.18-rc7 (2014-11-30 16:42:27 -0800)

are available in the git repository at:

  git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to 00d6a9b6be5885ad38234cd171f6fb18a87faa7c:

  Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2014-12-03 11:03:24 +1000)

----------------------------------------------------------------

Ben Skeggs (1):
      drm/nouveau/fifo/g84-: ack non-stall interrupt before handling it

Christian König (1):
      drm/radeon: sync all BOs involved in a CS v2

Dave Airlie (3):
      Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
      nouveau: move the hotplug ignore to correct place.
      Merge branch 'drm-fixes-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Ilia Mirkin (1):
      drm/nouveau/gf116: remove copy1 engine

Maarten Lankhorst (1):
      drm/nouveau: prevent stale fence->channel pointers, and protect with rcu

Michel Dänzer (1):
      drm/radeon: Ignore RADEON_GEM_GTT_WC on 32-bit x86

Petr Mladek (1):
      drm/radeon: kernel panic in drm_calc_vbltimestamp_from_scanoutpos with 3.18.0-rc6

 drivers/gpu/drm/nouveau/core/engine/device/nvc0.c |  1 -
 drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c   |  2 +-
 drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c   |  4 +-
 drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c   |  2 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c             |  2 +-
 drivers/gpu/drm/nouveau/nouveau_fence.c           | 92 ++++++++++++++++-------
 drivers/gpu/drm/nouveau/nouveau_fence.h           |  4 +-
 drivers/gpu/drm/radeon/radeon_cs.c                | 17 ++---
 drivers/gpu/drm/radeon/radeon_kms.c               |  2 +
 drivers/gpu/drm/radeon/radeon_object.c            |  7 ++
 10 files changed, 88 insertions(+), 45 deletions(-)


More information about the dri-devel mailing list