Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757200AbbGQIWT (ORCPT ); Fri, 17 Jul 2015 04:22:19 -0400 Received: from gir.skynet.ie ([193.1.99.77]:36672 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756530AbbGQIWO (ORCPT ); Fri, 17 Jul 2015 04:22:14 -0400 Date: Fri, 17 Jul 2015 09:22:09 +0100 (IST) From: Dave Airlie X-X-Sender: airlied@skynet.skynet.ie To: torvalds@linux-foundation.org cc: DRI mailing list , linux-kernel@vger.kernel.org Subject: [git pull] drm fixes Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="29444707-1183428961-1437121329=:29859" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7553 Lines: 171 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --29444707-1183428961-1437121329=:29859 Content-Type: TEXT/PLAIN; charset=ISO-8859-15 Content-Transfer-Encoding: 8BIT Hi Linus, fixes all over the place, the rockchip and imx fixes I missed while on holidays, so I've queued them now which makes this a bit bigger. The rest is misc amdgpu, radeon, i915 and armada. I think the most important thing is the ioctl fix, we dropped the avoid compat ball, so we get to add a compat wrapper. There is also an i915 revert to avoid a regression with existing userspace. Dave. The following changes since commit 3aa20508a6fe386c2a893027ef4c4ef78ee4eac2: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (2015-07-15 18:38:24 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to e9308884878942c618a42cab122df80fbf458dc9: drm/ttm: improve uncached page deallocation. (2015-07-17 18:18:04 +1000) ---------------------------------------------------------------- Alex Deucher (8): drm/radeon: add a dpm quirk for Sapphire Radeon R9 270X 2GB GDDR5 drm/amdgpu: disable the IP module if early_init returns -ENOENT (v2) drm/amdgpu: set proper index/data pair for smc regs on CZ (v2) drm/amdgpu: remove bogus check in gfx8 rb setup drm/amdgpu/cz: unforce dpm levels before forcing to low/high drm/amdgpu/cz: store the forced dpm level drm/amdgpu/cz: silence some dpm debug output drm/radeon/ci: silence a harmless PCC warning Chris Wilson (1): drm/i915: Store device pointer in contexts for late tracepoint usafe Christian K?nig (3): drm/radeon: fix user ptr race condition drm/amdgpu: validate the context id in the dependencies drm/amdgpu: stop context leak in the error path Daniel Kurtz (2): drm/rockchip: use drm_gem_mmap helpers drm/rockchip: use drm_gem_mmap helpers Daniel Vetter (3): drm/i915: Fix missing return warning for !CONFIG_DEBUGFS drm/i915: fix oops in primary_check_plane Revert "drm/i915: Declare the swizzling unknown for L-shaped configurations" Dave Airlie (6): Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge tag 'topic/drm-fixes-2015-07-16' of git://anongit.freedesktop.org/drm-intel into drm-fixes Merge tag 'drm-intel-fixes-2015-07-15' of git://anongit.freedesktop.org/drm-intel into drm-fixes Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-fixes Merge tag 'imx-drm-fixes-2015-07-14' of git://git.pengutronix.de/git/pza/linux into drm-fixes Merge branch 'drm-rockchip-2015-07-13' of https://github.com/markyzq/kernel-drm-rockchip into drm-fixes Graham Whaley (1): Documentation: drm: Fix tablulation in KMS properties table Heiko St?bner (1): drm/rockchip: only call drm_fb_helper_hotplug_event if fb_helper present Imre Deak (2): drm/i915: avoid leaking DMA mappings drm/i915: remove unused has_dma_mapping flag J?r?me Glisse (2): drm/ttm: fix uncached page deallocation to properly fill page pool v3. drm/ttm: improve uncached page deallocation. Krzysztof Kozlowski (1): drm/rockchip: Drop owner assignment from platform_driver Maarten Lankhorst (1): drm/i915: Do not call intel_crtc_disable if the crtc is already disabled. Michel D?nzer (2): drm/radeon: Don't flush the GART TLB if rdev->gart.ptr == NULL drm/amdgpu/dce8: Re-set VBLANK interrupt state when enabling a CRTC Philipp Zabel (2): drm/imx: parallel-display: fix drm_panel support drm/imx: tve: fix media bus format for VGA output Russell King (7): GPU: ipu: fix lockup caused by pending chained interrupts drm/armada: fix missing overlay wake-up drm/armada: fix incorrect overlay plane cleanup drm/armada: fix gem object free after failed prime import drm/armada: convert overlay to use drm_plane_helper_check_update() drm/armada: fix overlay when partially off-screen drm/armada: avoid saving the adjusted mode to crtc->mode Tomas Elf (1): drm/i915: Snapshot seqno of most recently submitted request. Tomasz Figa (1): drm/rockchip: Add BGR formats to VOP Tvrtko Ursulin (2): drm/i915: Forward all core DRM ioctls to core compat handling drm: Provide compat ioctl for addfb2.1 Zhao Junwang (1): drm: add a check for x/y in drm_mode_setcrtc yao mark (2): drm/rockchip: vop: switch cursor plane to window 3 drm/rockchip: vop: remove hardware cursor window Documentation/DocBook/drm.tmpl | 2 +- .../devicetree/bindings/drm/imx/fsl-imx-drm.txt | 26 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 19 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +- drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 16 ++- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/vi.c | 35 +++++- drivers/gpu/drm/armada/armada_crtc.c | 2 - drivers/gpu/drm/armada/armada_gem.c | 5 +- drivers/gpu/drm/armada/armada_overlay.c | 121 +++++++++++++-------- drivers/gpu/drm/drm_crtc.c | 7 +- drivers/gpu/drm/drm_ioc32.c | 60 ++++++++++ drivers/gpu/drm/i915/i915_drv.h | 6 +- drivers/gpu/drm/i915/i915_gem.c | 35 +++--- drivers/gpu/drm/i915/i915_gem_context.c | 4 +- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 - drivers/gpu/drm/i915/i915_gem_gtt.c | 9 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 1 - drivers/gpu/drm/i915/i915_gem_tiling.c | 12 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 29 ++++- drivers/gpu/drm/i915/i915_ioc32.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 13 +-- drivers/gpu/drm/i915/i915_trace.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 8 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 7 ++ drivers/gpu/drm/imx/imx-tve.c | 2 +- drivers/gpu/drm/imx/parallel-display.c | 21 +++- drivers/gpu/drm/radeon/ci_dpm.c | 2 +- drivers/gpu/drm/radeon/radeon_gart.c | 12 +- drivers/gpu/drm/radeon/radeon_gem.c | 1 + drivers/gpu/drm/radeon/radeon_object.c | 1 - drivers/gpu/drm/radeon/si_dpm.c | 1 + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 1 - drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 67 ++++++------ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 49 ++++++--- drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 13 +-- drivers/gpu/ipu-v3/ipu-common.c | 3 + 39 files changed, 416 insertions(+), 201 deletions(-) --29444707-1183428961-1437121329=:29859-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/