[git pull] drm fixes

Dave Airlie
2015-05-15T05:38:10Z

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1637 bytes --]

Hi Linus,

radeon, one oops fix, one bug fix, one pci id addition patch
i915, one suspend/resume regression fix.

all seems quiet enough.

Dave.

The following changes since commit 030bbdbf4c833bc69f502eae58498bc5572db736:

Linux 4.1-rc3 (2015-05-10 15:12:29 -0700)

are available in the git repository at:

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

for you to fetch changes up to 472313245645661c3bc710f874e660c493d313e1:

Merge tag 'drm-intel-fixes-2015-05-13' of git://anongit.freedesktop.org/drm-intel into drm-fixes (2015-05-15 15:21:18 +1000)

----------------------------------------------------------------
Alex Deucher (1):
drm/radeon: add new bonaire pci id

Christian König (1):
drm/radeon: fix VM_CONTEXT*_PAGE_TABLE_END_ADDR handling

Dave Airlie (3):
drm/radeon: don't do mst probing if MST isn't enabled.
Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge tag 'drm-intel-fixes-2015-05-13' of git://anongit.freedesktop.org/drm-intel into drm-fixes

Peter Antoine (1):
drm/i915: Avoid GPU hang when coming out of s3 or s4

drivers/gpu/drm/i915/i915_drv.c | 13 ++++++++++---
drivers/gpu/drm/radeon/cik.c | 4 ++--
drivers/gpu/drm/radeon/evergreen.c | 2 +-
drivers/gpu/drm/radeon/ni.c | 5 +++--
drivers/gpu/drm/radeon/r600.c | 2 +-
drivers/gpu/drm/radeon/radeon_dp_mst.c | 3 +++
drivers/gpu/drm/radeon/rv770.c | 2 +-
drivers/gpu/drm/radeon/si.c | 4 ++--
include/drm/drm_pciids.h | 1 +
9 files changed, 24 insertions(+), 12 deletions(-)