[git pull] drm fixes

Dave Airlie
2015-05-29T10:36:39Z

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

Hi Linus,

This is made up 4 groups of fixes detailed below.

vgem:
Due to some misgivings about possible bad use cases this allow,
backout a chunk of the interface to stop those use cases for now.

radeon:
Fix for an oops regression in the audio code, and a partial revert
for a fix that was cauing problems.

nouveau:
regression fix for Fermi, and display-less Maxwell boot fixes.

drm core:
a fix for i915 cursor vblank waiting in the atomic helpers.

Dave.

The following changes since commit ba155e2d21f6bf05de86a78dbe5bfd8757604a65:

Linux 4.1-rc5 (2015-05-24 18:22:35 -0700)

are available in the git repository at:

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

for you to fetch changes up to 1fe7142063517dfb17bfd3ada394e1dd7ee44ba7:

Merge branch 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes (2015-05-29 11:13:52 +1000)

----------------------------------------------------------------
Alex Deucher (3):
drm/radeon: don't share plls if monitors differ in audio support
Revert "drm/radeon: only mark audio as connected if the monitor supports it (v3)"
drm/radeon/audio: make sure connector is valid in hotplug case

Ben Skeggs (3):
drm/nouveau/devinit/gf100: make the force-post condition more obvious
drm/nouveau/devinit/gm100-: force devinit table execution on boards without PDISP
drm/nouveau/gr/gm204: remove a stray printk

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

Daniel Vetter (1):
drm/plane-helper: Adapt cursor hack to transitional helpers

Dave Airlie (4):
Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge tag 'topic/drm-fixes-2015-05-27' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Merge branch 'drm-fixes-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge branch 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes

Lars Seipel (1):
drm/nouveau/gr/gf100-: fix wrong constant definition

Rob Clark (1):
drm/vgem: drop DRIVER_PRIME (v2)

drivers/gpu/drm/drm_plane_helper.c | 3 +
drivers/gpu/drm/nouveau/include/nvif/class.h | 2 +-
drivers/gpu/drm/nouveau/nvkm/engine/gr/gm204.c | 1 -
.../gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c | 7 +-
.../gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c | 2 +-
.../gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c | 2 +-
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h | 3 +
drivers/gpu/drm/radeon/atombios_crtc.c | 4 +-
drivers/gpu/drm/radeon/cik.c | 2 +-
drivers/gpu/drm/radeon/evergreen.c | 2 +-
drivers/gpu/drm/radeon/evergreen_hdmi.c | 5 +-
drivers/gpu/drm/radeon/ni.c | 2 +-
drivers/gpu/drm/radeon/r600.c | 2 +-
drivers/gpu/drm/radeon/radeon_audio.c | 27 +++----
drivers/gpu/drm/radeon/radeon_connectors.c | 8 +-
drivers/gpu/drm/radeon/rv770.c | 2 +-
drivers/gpu/drm/radeon/si.c | 2 +-
drivers/gpu/drm/vgem/Makefile | 2 +-
drivers/gpu/drm/vgem/vgem_dma_buf.c | 94 ----------------------
drivers/gpu/drm/vgem/vgem_drv.c | 11 +--
drivers/gpu/drm/vgem/vgem_drv.h | 11 ---
21 files changed, 42 insertions(+), 152 deletions(-)
delete mode 100644 drivers/gpu/drm/vgem/vgem_dma_buf.c