[git pull] drm fixes
From: Dave Airlie
Date: Thu Sep 24 2015 - 17:04:59 EST
Hi Linus,
Most of the GPU drivers people were at XDC last week, so I didn't get much
to send, so I let it rollover until this week.
Also Alex was away for 3 weeks so amdgpu/radeon got a bit more stuff than
usual in one go.
I've been trying to figure out some 4.2 issues with i915 still (that are
fixed in 4.3, but bisecting ends up in a merge commit). Hopefully next
week I or i915 people can work that out.
Dave.
The following changes since commit 1f93e4a96c9109378204c147b3eec0d0e8100fde:
Linux 4.3-rc2 (2015-09-20 14:32:34 -0700)
are available in the git repository at:
git://people.freedesktop.org/~airlied/linux drm-fixes
for you to fetch changes up to fd03420b5624617a708fb9b13634b41b37c22cfa:
Merge tag 'drm-intel-fixes-2015-09-24' of git://anongit.freedesktop.org/drm-intel into drm-fixes (2015-09-25 06:52:37 +1000)
----------------------------------------------------------------
Alex Deucher (2):
drm/amdgpu: Fix max_vblank_count value for current display engines
drm/amdgpu: Sprinkle drm_modeset_lock_all to appease locking checks
Anatoli Antonovitch (1):
drm/amdgpu: execution barrier after fence v2
Andrzej Hajda (2):
drm/amdgpu: use kmemdup rather than duplicating its implementation
drm/layerscape: fix handling fsl_dcu_drm_plane_index result
Archit Taneja (2):
drm/mgag200: Fix error handling paths in fbdev driver
drm/mgag200: Fix driver_load error handling
Christian Engelmayer (2):
drm/vmwgfx: Fix uninitialized return in vmw_cotable_unbind()
drm/vmwgfx: Fix uninitialized return in vmw_kms_helper_dirty()
Christian König (13):
drm/amdgpu: add option to disable semaphores
drm/amdgpu: use write confirm for vm_flush()
drm/amdgpu: signal scheduler fence when hw submission fails v3
drm/amdgpu: move scheduler fence callback into fence v2
drm/amdgpu: remove process_job callback from the scheduler
drm/amdgpu: fix overflow on 32bit systems
drm/amdgpu: export reservation_object from dmabuf to ttm (v2)
drm/amdgpu: validate duplicates in the CS as well
drm/amdgpu: use only one reservation object for each VM v2
drm/amdgpu: cleanup entity init
drm/amdgpu: rename fence->scheduler to sched v2
drm/amdgpu: cleanup fence queue init v2
drm/amdgpu: more scheduler cleanups v2
Chunming Zhou (1):
drm/amdgpu: add tracepoint for scheduler (v2)
Dan Carpenter (4):
drm/amdgpu: unwind properly in amdgpu_cs_parser_init()
drm/amdgpu: integer overflow in amdgpu_info_ioctl()
drm/amdgpu: info leak in amdgpu_gem_metadata_ioctl()
drm/amdgpu: integer overflow in amdgpu_mode_dumb_create()
Daniel Vetter (1):
drm/radeon: Sprinkle drm_modeset_lock_all to appease locking checks
Dave Airlie (4):
drm/qxl: only report first monitor as connected if we have no state
Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge tag 'vmwgfx-fixes-4.3-150924' of git://people.freedesktop.org/~thomash/linux into drm-fixes
Merge tag 'drm-intel-fixes-2015-09-24' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Geliang Tang (1):
drm/i915: fix kernel-doc warnings in intel_audio.c
Jani Nikula (1):
drm/i915/bios: handle MIPI Sequence Block v3+ gracefully
Jesse Barnes (1):
drm/i915: workaround bad DSL readout v3
Junwei Zhang (2):
drm/amdgpu: refine the job naming for amdgpu_job and amdgpu_sched_job
drm/amdgpu: refine the scheduler job type conversion
Leo Liu (4):
drm/amdgpu: Disable UVD PG
drm/amdgpu: make UVD handle checking more strict
drm/amdgpu: fix the UVD suspend sequence order
drm/amdgpu: fix UVD suspend and resume for VI APU
Maarten Lankhorst (1):
drm/i915: Add primary plane to mask if it's visible
Maxim Sheviakov (1):
drm/radeon: add quirk for MSI R7 370
Thomas Hellstrom (5):
drm/vmwgfx: Fix up user_dmabuf refcounting
drm/vmwgfx: Map the fifo as cached
drm/ttm: Fix memory space allocation v2
drm/vmwgfx: Only build on X86
drm: Allow also control clients to check the drm version
monk.liu (1):
drm/amdgpu: sync ce and me with SWITCH_BUFFER(2)
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 137 ++++++++++++---------
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 10 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 25 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 16 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 19 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 47 ++++---
drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 65 ++++------
drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 27 ++++-
drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 80 +++++++-----
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 8 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 45 ++-----
drivers/gpu/drm/amd/amdgpu/cz_smc.c | 6 +-
drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 4 +-
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 74 ++++-------
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 79 +++++-------
drivers/gpu/drm/amd/amdgpu/iceland_smc.c | 2 +-
drivers/gpu/drm/amd/amdgpu/tonga_smc.c | 4 +-
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 4 +-
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 4 +-
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 20 +--
drivers/gpu/drm/amd/amdgpu/vi.c | 3 +-
drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 41 +++++++
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 155 ++++++++++++------------
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 41 +++----
drivers/gpu/drm/amd/scheduler/sched_fence.c | 4 +-
drivers/gpu/drm/drm_ioctl.c | 3 +-
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 3 +-
drivers/gpu/drm/i915/i915_irq.c | 26 ++++
drivers/gpu/drm/i915/intel_audio.c | 2 +-
drivers/gpu/drm/i915/intel_bios.c | 12 +-
drivers/gpu/drm/i915/intel_display.c | 7 +-
drivers/gpu/drm/mgag200/mgag200_fb.c | 31 +++--
drivers/gpu/drm/mgag200/mgag200_main.c | 36 +++---
drivers/gpu/drm/qxl/qxl_display.c | 12 +-
drivers/gpu/drm/radeon/radeon_device.c | 4 +
drivers/gpu/drm/radeon/si_dpm.c | 1 +
drivers/gpu/drm/ttm/ttm_bo.c | 28 +++--
drivers/gpu/drm/vmwgfx/Kconfig | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 3 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 10 +-
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 7 +-
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 6 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 3 +-
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 29 +++--
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 11 +-
63 files changed, 691 insertions(+), 544 deletions(-)
create mode 100644 drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h