Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751791AbbLEVPN (ORCPT ); Sat, 5 Dec 2015 16:15:13 -0500 Received: from gir.skynet.ie ([193.1.99.77]:39822 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751148AbbLEVPL (ORCPT ); Sat, 5 Dec 2015 16:15:11 -0500 Date: Sat, 5 Dec 2015 21:15:07 +0000 (GMT) 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-1562769477-1449350107=:5270" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 8400 Lines: 194 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-1562769477-1449350107=:5270 Content-Type: TEXT/PLAIN; charset=ISO-8859-15 Content-Transfer-Encoding: 8BIT Hi Linus, A bunch of change across the board, the main things are some vblank fallout in radeon and nouveau required some work, but I think this should fix it all. There is also one drm fix for an oops in vmwgfx with how we pass the drm master around. The rest is just some amdgpu, i915, imx and rockchip fixes. probably more than I'd like at this point, but hopefully things settle down now. Dave. The following changes since commit 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8: Linux 4.4-rc3 (2015-11-29 18:58:26 -0800) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to df4d4aa96d1db1657e14b848a341fc614c8d61eb: Merge branch 'drm-fixes-4.4' of git://people.freedesktop.org/~agd5f/linux into drm-next (2015-12-05 16:15:38 +1000) ---------------------------------------------------------------- Alex Deucher (1): drm/amdgpu: Fixup hw vblank counter/ts for new drm_update_vblank_count() (v3) Chris Wilson (2): drm/i915: Mark uneven memory banks on gen4 desktop as unknown swizzling drm/i915: Check the timeout passed to i915_wait_request Christian K?nig (6): drm/amdgpu: fix userptr flags check drm/amdgpu: fix VM page table reference counting drm/amdgpu: set snooped flags only on system addresses v2 drm/amdgpu: take a BO reference in the display code drm/amdgpu: take a BO reference for the user fence drm/amdgpu: partially revert "drm/amdgpu: fix VM_CONTEXT*_PAGE_TABLE_END_ADDR" v2 Chunming Zhou (1): drm/amdgpu: add err check for pin userptr Daniel Stone (1): drm/rockchip: Use CRTC vblank event interface Daniel Vetter (1): drm/nouveau: Fix pre-nv50 pageflip events (v4) Dave Airlie (5): Merge tag 'drm-intel-fixes-2015-11-30' of git://anongit.freedesktop.org/drm-intel into drm-fixes Merge branch 'drm-fixes-rockchip-2015-12-02' of https://github.com/markyzq/kernel-drm-rockchip into drm-fixes Merge tag 'drm-intel-fixes-2015-12-03' of git://anongit.freedesktop.org/drm-intel into drm-fixes Merge tag 'imx-drm-fixes-2015-12-01' of git://git.pengutronix.de/git/pza/linux into drm-fixes Merge branch 'drm-fixes-4.4' of git://people.freedesktop.org/~agd5f/linux into drm-next Dominik Behr (1): drm/rockchip: vop: fix window origin calculation Heiko Stuebner (1): drm/rockchip: unset pgoff when mmap'ing gems Imre Deak (3): drm/i915/ddi: fix intel_display_port_aux_power_domain() after HDMI detect drm/i915: add MISSING_CASE to a few port/aux power domain helpers drm/i915: take a power domain reference while checking the HDMI live status Liu Ying (1): drm/imx: ipuv3-crtc: Return error if ipu_plane_init() fails for primary plane Luis de Bethencourt (2): drm: imx: imx-tve: Fix module autoload for OF platform driver drm/rockchip: Fix module autoload for OF platform driver Lyude (1): drm/radeon: Retry DDC probing on DVI on failure if we got an HPD interrupt Marc-Andr? Lureau (1): virtio-gpu: use no-merge for fill-modes Mario Kleiner (1): drm/radeon: Fixup hw vblank counter/ts for new drm_update_vblank_count() (v2) Markus Elfring (1): GPU-DRM-IMX: Delete an unnecessary check before drm_fbdev_cma_restore_mode() Nicolai H?hnle (1): drm/amdgpu: fix race condition in amd_sched_entity_push_job Pavel Machek (1): add blacklist for thinkpad T40p Philipp Zabel (6): drm/imx: switch to universal planes drm/imx: parallel-display: allow to determine bus format from the connected panel gpu: ipu-v3: drop unused dmfc field from client platform data gpu: ipu-v3: Remove reg_offset field gpu: ipu-v3: Assign of_node of child platform devices to corresponding ports drm/imx: Remove of_node assignment from ipuv3-crtc driver probe Russell King (1): drm: imx: convert to drm_crtc_send_vblank_event() Sjoerd Simons (1): drm/rockchip: vop: Correct enabled clocks during setup Takashi Iwai (2): drm/i915: Don't compare has_drrs strictly in pipe config drm/i915: Don't override output type for DDI HDMI Thomas Hellstrom (1): drm: Fix an unwanted master inheritance v2 Ville Syrj?l? (2): drm/i915: Clean up AUX power domain handling drm/i915: Introduce a gmbus power domain jimqu (1): drm/amdgpu: add spin lock to protect freed list in vm (v2) drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 108 +++++++++++++++++++------- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 48 +++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 5 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 17 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 21 ++++- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 5 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 5 +- drivers/gpu/drm/drm_drv.c | 5 ++ drivers/gpu/drm/drm_fops.c | 84 +++++++++++++------- drivers/gpu/drm/drm_irq.c | 54 ++++++++++++- drivers/gpu/drm/i915/i915_debugfs.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 12 ++- drivers/gpu/drm/i915/i915_gem_fence.c | 36 ++++++--- drivers/gpu/drm/i915/intel_display.c | 53 ++++++++++++- drivers/gpu/drm/i915/intel_dp.c | 51 ++++-------- drivers/gpu/drm/i915/intel_drv.h | 4 +- drivers/gpu/drm/i915/intel_hdmi.c | 12 +-- drivers/gpu/drm/i915/intel_i2c.c | 6 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 34 +------- drivers/gpu/drm/imx/imx-drm-core.c | 7 +- drivers/gpu/drm/imx/imx-drm.h | 3 +- drivers/gpu/drm/imx/imx-tve.c | 1 + drivers/gpu/drm/imx/ipuv3-crtc.c | 63 ++++----------- drivers/gpu/drm/imx/ipuv3-plane.c | 9 +-- drivers/gpu/drm/imx/ipuv3-plane.h | 2 +- drivers/gpu/drm/imx/parallel-display.c | 4 + drivers/gpu/drm/nouveau/nouveau_display.c | 19 +++-- drivers/gpu/drm/radeon/cik.c | 5 +- drivers/gpu/drm/radeon/evergreen.c | 5 +- drivers/gpu/drm/radeon/r100.c | 12 ++- drivers/gpu/drm/radeon/r600.c | 2 +- drivers/gpu/drm/radeon/radeon.h | 2 +- drivers/gpu/drm/radeon/radeon_agp.c | 3 + drivers/gpu/drm/radeon/radeon_connectors.c | 21 ++++- drivers/gpu/drm/radeon/radeon_display.c | 106 ++++++++++++++++++------- drivers/gpu/drm/radeon/radeon_irq_kms.c | 8 +- drivers/gpu/drm/radeon/radeon_kms.c | 50 +++++++++++- drivers/gpu/drm/radeon/radeon_mode.h | 5 ++ drivers/gpu/drm/radeon/radeon_pm.c | 4 +- drivers/gpu/drm/radeon/rs600.c | 2 +- drivers/gpu/drm/radeon/rs690.c | 10 +++ drivers/gpu/drm/radeon/si.c | 5 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 43 +++++----- drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- drivers/gpu/ipu-v3/ipu-common.c | 69 ++++++++-------- include/drm/drmP.h | 10 +++ include/video/imx-ipu-v3.h | 1 - 57 files changed, 735 insertions(+), 331 deletions(-) --29444707-1562769477-1449350107=:5270-- -- 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/