2015-07-31 03:30:58

by Dave Airlie

[permalink] [raw]
Subject: [git pull] drm fixes


Hi Linus,

this is the fixes pull for -rc5,

it has a bunch of nouveau fixes, as Ben has been hibernating and has lots
of small fixes for lots of bugs across nouveau.

radeon has one major fix for hdmi/dp audio regression that is larger than
Alex would like, but seems to fix up a fair few bugs, along with some misc
fixes.

and a few msm fixes, one of which is also a bit large.

But nothing in here seems insane or crazy for this stage, just more than
I'd like.

I'll send a follow up email as I'm on holidays for a couple of week
starting after the follow up email.

Dave.

The following changes since commit cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f:

Linux 4.2-rc4 (2015-07-26 12:26:21 -0700)

are available in the git repository at:

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

for you to fetch changes up to bdce3e7c729907e303396690b2b23b972c6717be:

Merge branch 'msm-fixes-4.2' of git://people.freedesktop.org/~robclark/linux into drm-fixes (2015-07-30 12:41:44 +1000)

----------------------------------------------------------------
Alex Deucher (4):
drm/radeon: rework audio detect (v4)
drm/radeon: rework audio modeset to handle non-audio hdmi features
drm/radeon/combios: add some validation of lvds values
drm/amdgpu: clean up init sequence for failures

Alexandre Courbot (6):
drm/nouveau/platform: fix compile error if !CONFIG_IOMMU
drm/nouveau/ibus/gk20a: increase SM wait timeout
drm/nouveau/fifo/gk104: kick channels when deactivating them
drm/nouveau/gr/gf100: wait on bottom half of FE's pipeline
drm/nouveau/gr/gf100: wait for GR idle after GO_IDLE bundle
drm/nouveau/nouveau/ttm: fix tiled system memory with Maxwell

Archit Taneja (1):
drm/msm: mdp4: Fix drm_framebuffer dereference crash

Ben Skeggs (1):
drm/nouveau/kms/nv50-: guard against enabling cursor on disabled heads

Dan Carpenter (1):
drm/amdgpu: information leak in amdgpu_info_ioctl()

Dave Airlie (4):
Merge branch 'linux-4.2' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Merge branch 'linux-4.2' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge branch 'msm-fixes-4.2' of git://people.freedesktop.org/~robclark/linux into drm-fixes

Ilia Mirkin (5):
drm/nouveau/bios: add 0x59 and 0x5a opcodes
drm/nouveau/bios: add proper support for opcode 0x59
drm/nouveau/fbcon/nv11-: correctly account for ring space usage
drm/nouveau/fbcon/gf100-: reduce RING_SPACE allocation
drm/nouveau/fbcon/g80: reduce PUSH_SPACE alloc, fire ring on accel init

Kamil Dudka (2):
drm/nouveau: hold mutex when calling nouveau_abi16_fini()
drm/nouveau/drm/nv04-nv40/instmem: protect access to priv->heap by mutex

Michel D?nzer (2):
drm/radeon: Drop drm/ prefix for including drm.h in radeon_drm.h
drm/amdgpu: Drop drm/ prefix for including drm.h in amdgpu_drm.h

Rob Clark (1):
drm/msm: fix msm_gem_prime_get_sg_table()

Roy Spliet (1):
drm/nouveau/clk/gt215: u32->s32 for difference in req. and set clock

Samuel Pitoiset (2):
drm/nouveau/pm: prevent freeing the wrong engine context
drm/nouveau/pm: fix a potential race condition when creating an engine context

Thierry Reding (2):
drm/nouveau: Do not leak client objects
drm/nouveau/disp: Use NULL for pointers

Wentao Xu (2):
drm/msm: change to uninterruptible wait in atomic commit
drm/msm/mdp5: release SMB (shared memory blocks) in various cases

monk.liu (3):
drm/amdgpu: different emit_ib for gfx and compute
drm/amdgpu: hdp_flush is not needed for inside IB
drm/amdgpu: add new parameter to seperate map and unmap

drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 38 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 16 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +-
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 46 +++--
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 47 +++--
drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 4 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 13 ++
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 2 +
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 33 ++--
drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c | 87 +++++++--
drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h | 1 +
drivers/gpu/drm/msm/msm_atomic.c | 8 +-
drivers/gpu/drm/msm/msm_drv.c | 13 +-
drivers/gpu/drm/msm/msm_drv.h | 4 +-
drivers/gpu/drm/msm/msm_gem.c | 2 +-
drivers/gpu/drm/msm/msm_gem_prime.c | 8 +-
drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +
drivers/gpu/drm/nouveau/nouveau_platform.c | 16 ++
drivers/gpu/drm/nouveau/nouveau_ttm.c | 9 +
drivers/gpu/drm/nouveau/nv04_fbcon.c | 2 +-
drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
drivers/gpu/drm/nouveau/nv50_fbcon.c | 3 +-
drivers/gpu/drm/nouveau/nvc0_fbcon.c | 2 +-
drivers/gpu/drm/nouveau/nvkm/engine/disp/gf110.c | 2 +-
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 29 ++-
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 39 +++-
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 1 +
drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 14 +-
drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 40 ++++
drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c | 3 +-
drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk20a.c | 8 +
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv04.c | 8 +
drivers/gpu/drm/radeon/atombios_encoders.c | 3 +-
drivers/gpu/drm/radeon/dce6_afmt.c | 62 +++----
drivers/gpu/drm/radeon/radeon_audio.c | 204 ++++++++++-----------
drivers/gpu/drm/radeon/radeon_audio.h | 3 +-
drivers/gpu/drm/radeon/radeon_combios.c | 7 +-
drivers/gpu/drm/radeon/radeon_connectors.c | 18 +-
drivers/gpu/drm/radeon/radeon_mode.h | 2 +-
include/uapi/drm/amdgpu_drm.h | 2 +-
include/uapi/drm/radeon_drm.h | 2 +-
43 files changed, 554 insertions(+), 274 deletions(-)