2015-07-10 06:42:12

by Dave Airlie

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


Hi Linus,

back from vacation (another one is coming up in August though), thanks for
taking care of direct pulls while I was out.

a bunch of fixes for radeon, intel, omap and one amdkfd fix.

radeon fixes are all over, but it does fix some cursor corruption across suspend/resume
i915 should fix the second warn you were seeing, so let us know if not.
omap is a bunch of small fixes,

Regards,
Dave.

The following changes since commit c4b5fd3fb2058b650447372472ad24e2a989f9f6:

Merge branch 'hpfs-patches' (patches from Mikulas Patocka) (2015-07-09 13:35:39 -0700)

are available in the git repository at:

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

for you to fetch changes up to 2d28b633c3fa8f53b919a5de86eb1c8e78dde818:

Merge tag 'omapdrm-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-fixes (2015-07-10 15:59:35 +1000)

----------------------------------------------------------------
Alex Deucher (2):
Revert "Revert "drm/radeon: dont switch vt on suspend""
drm/radeon: disable vce init on cayman (v2)

Chris Wilson (1):
drm/i915: Declare the swizzling unknown for L-shaped configurations

Christian K?nig (3):
drm/radeon: allways add the VM clear duplicate
drm/radeon: check if BO_VA is set before adding it to the invalidation list
drm/amdgpu: fix timeout calculation

Dan Carpenter (1):
drm/radeon: fix underflow in r600_cp_dispatch_texture()

Daniel Vetter (2):
drm/i915: Check crtc->active in intel_crtc_disable_planes
drm/i915: Use crtc_state->active in primary check_plane func

Dave Airlie (4):
Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge tag 'drm-amdkfd-fixes-2015-07-09' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes
Merge tag 'drm-intel-fixes-2015-07-09' of git://anongit.freedesktop.org/drm-intel into drm-fixes
Merge tag 'omapdrm-4.2-fixes' of git://git.kernel.org/.../tomba/linux into drm-fixes

Fabian Frederick (1):
drm/omap: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN

Grigori Goronzy (4):
drm/radeon: use RCU query for GEM_BUSY syscall
drm/radeon: fix HDP flushing
drm/radeon: default to 2048 MB GART size on SI+
drm/radeon: unpin cursor BOs on suspend and pin them again on resume (v2)

Imre Deak (1):
drm/i915/chv: fix HW readout of the port PLL fractional divider

Maninder Singh (1):
drm/amdkfd: validate pdd where it acquired first

Mario Kleiner (2):
drm/radeon: Handle irqs only based on irq ring, not irq status regs.
drm/amdgpu: Handle irqs only based on irq ring, not irq status regs.

Michel D?nzer (2):
drm/radeon: Clean up reference counting and pinning of the cursor BOs
drm/radeon: Fold radeon_set_cursor() into radeon_show_cursor()

Tomi Valkeinen (6):
drm/omap: return error if dma_alloc_writecombine fails
drm/omap: check that plane is inside crtc
drm/omap: increase DMM transaction timeout
drm/omap: fix omap_framebuffer_unpin() error handling
drm/omap: fix omap_gem_put_paddr() error handling
drm/omap: fix align_pitch() for 24 bits per pixel

Tvrtko Ursulin (1):
drm/i915: Restore all GGTT VMAs on resume

Ville Syrj?l? (1):
Revert "drm/i915: Allocate context objects from stolen"

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +-
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 22 +-
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 22 +-
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 22 +-
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 9 +-
drivers/gpu/drm/i915/i915_gem_context.c | 4 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 23 +-
drivers/gpu/drm/i915/i915_gem_tiling.c | 12 +-
drivers/gpu/drm/i915/intel_display.c | 12 +-
drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 2 +-
drivers/gpu/drm/omapdrm/omap_drv.h | 6 +-
drivers/gpu/drm/omapdrm/omap_fb.c | 16 +-
drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +-
drivers/gpu/drm/omapdrm/omap_gem.c | 26 +-
drivers/gpu/drm/omapdrm/omap_plane.c | 26 ++
drivers/gpu/drm/radeon/cik.c | 336 ++++++++++++++------------
drivers/gpu/drm/radeon/evergreen.c | 392 +++++++++++++++++--------------
drivers/gpu/drm/radeon/ni.c | 25 +-
drivers/gpu/drm/radeon/r600.c | 155 ++++++------
drivers/gpu/drm/radeon/r600_cp.c | 2 +-
drivers/gpu/drm/radeon/radeon_cursor.c | 109 ++++-----
drivers/gpu/drm/radeon/radeon_device.c | 66 ++++--
drivers/gpu/drm/radeon/radeon_fb.c | 1 +
drivers/gpu/drm/radeon/radeon_gem.c | 12 +-
drivers/gpu/drm/radeon/radeon_mode.h | 1 -
drivers/gpu/drm/radeon/radeon_vm.c | 40 ++--
drivers/gpu/drm/radeon/si.c | 336 ++++++++++++++------------
27 files changed, 964 insertions(+), 717 deletions(-)