Hi Linus, Bit more spread out fixes this time, fixes for 7 drivers + a couple of core fixes. i915 and vmwgfx are the main ones. The vmwgfx ones fix a bunch of regressions in their atomic rework, and a few fixes destined for stable. i915 has some 4.12 regressions and older things that need to be fixed in stable as well. nouveau also has some runtime pm fixes and a timer list handling fix, otherwise a couple of core and small driver regression fixes. Thanks, Dave, The following changes since commit 3c2993b8c6143d8a5793746a54eba8f86f95240f: Linux 4.12-rc4 (2017-06-04 16:47:43 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.12-rc5 for you to fetch changes up to 6e88007e224ce51969ccf9afeec645146c638816: Merge branch 'vmwgfx-fixes-4.12' of git://people.freedesktop.org/~thomash/linux into drm-fixes (2017-06-09 13:12:02 +1000) ---------------------------------------------------------------- intel, nouveau, rockchip, vmwgfx, imx, meson, mediatek and core fixes ---------------------------------------------------------------- Ben Skeggs (3): drm/nouveau: replace multiple open-coded runpm support checks with function drm/nouveau: enable autosuspend only when it'll actually be used drm/nouveau/tmr: fully separate alarm execution/pending lists Chris Wilson (4): drm/i915: Short-circuit i915_gem_wait_for_idle() if already idle drm/i915: Hold a wakeref for probing the ring registers drm/i915: Guard against i915_ggtt_disable_guc() being invoked unconditionally drm/i915: Fix logical inversion for gen4 quirking Colin Ian King (1): drm/vmwgfx: fix spelling mistake "exeeds" -> "exceeds" Dan Carpenter (2): drm/mediatek: fix a timeout loop drm/vmwgfx: Handle vmalloc() failure in vmw_local_fifo_reserve() Daniel Vetter (1): drm: Fix locking in drm_atomic_helper_resume Dave Airlie (7): Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-fixes Merge tag 'drm-misc-fixes-2017-06-02' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes Merge tag 'imx-drm-fixes-2017-06-08' of git://git.pengutronix.de/git/pza/linux into drm-fixes Merge branch 'mediatek-drm-fixes-4.12-rc1' of https://github.com/ckhu-mediatek/linux.git-tags into drm-fixes Merge tag 'drm-misc-fixes-2017-06-07' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes Merge tag 'drm-intel-fixes-2017-06-08' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes Merge branch 'vmwgfx-fixes-4.12' of git://people.freedesktop.org/~thomash/linux into drm-fixes Gustavo A. R. Silva (1): drm/nouveau/kms/nv50: add null check before pointer dereference Hans de Goede (1): drm: Fix oops + Xserver hang when unplugging USB drm devices Imre Deak (1): drm/i915: Prevent the system suspend complete optimization Jani Nikula (1): drm/i915: fix warning for unused variable John Stultz (1): drm: kirin: Fix drm_of_find_panel_or_bridge conversion Jon Bloomfield (1): drm/i915: Serialize GTT/Aperture accesses on BXT Kai Chen (1): drm/i915: Disable decoupled MMIO Leonard Crestez (1): drm/imx: imx-ldb: Accept drm_of_find_panel_or_bridge failure Lucas Stach (1): gpu: ipu-v3: pre: only use internal clock gating Maarten Lankhorst (1): drm/i915: Always recompute watermarks when distrust_bios_wm is set, v2. Marek Vasut (1): gpu: ipu-v3: Fix CSI selection for VDIC Mark yao (1): drm/rockchip: Correct vop out_mode configure Michal Wajdeczko (1): drm/i915/guc: Remove stale comment for q_fail Nagaraju, Vathsala (1): drm/i915/psr: disable psr2 for resolution greater than 32X20 Neil Armstrong (1): drm/meson: Fix driver bind when only CVBS is available Sinclair Yeh (5): drm/vmwgfx: Don't create proxy surface for cursor drm/vmwgfx: Make sure backup_handle is always valid drm/vmwgfx: Make sure to update STDU when FB is updated drm/vmwgfx: Fix large topology crash drm/vmwgfx: Remove unused legacy cursor functions Thomas Hellstrom (1): drm/vmwgfx: Bump driver minor and date Ville Syrjälä (3): drm/i915: Workaround VLV/CHV DSI scanline counter hardware fail drm/i915: Restore has_fbc=1 for ILK-M drm/i915: Fix 90/270 rotated coordinates for FBC Vladis Dronov (1): drm/vmwgfx: limit the number of mip levels in vmw_gb_surface_define_ioctl() YYS (1): drm/mediatek: fix mtk_hdmi_setup_vendor_specific_infoframe mistake drivers/gpu/drm/drm_atomic_helper.c | 11 ++ drivers/gpu/drm/drm_drv.c | 7 +- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 2 +- drivers/gpu/drm/i915/i915_drv.c | 9 ++ drivers/gpu/drm/i915/i915_drv.h | 10 ++ drivers/gpu/drm/i915/i915_gem.c | 4 + drivers/gpu/drm/i915/i915_gem_gtt.c | 106 ++++++++++++++++++- drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- drivers/gpu/drm/i915/i915_pci.c | 3 +- drivers/gpu/drm/i915/intel_display.c | 9 ++ drivers/gpu/drm/i915/intel_engine_cs.c | 20 +++- drivers/gpu/drm/i915/intel_fbc.c | 19 ++-- drivers/gpu/drm/i915/intel_pm.c | 9 ++ drivers/gpu/drm/i915/intel_psr.c | 5 +- drivers/gpu/drm/i915/intel_sprite.c | 21 ++++ drivers/gpu/drm/i915/intel_uc.h | 2 - drivers/gpu/drm/imx/imx-ldb.c | 2 +- drivers/gpu/drm/mediatek/mtk_dsi.c | 15 ++- drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- drivers/gpu/drm/meson/meson_drv.c | 20 +++- .../gpu/drm/nouveau/include/nvkm/subdev/timer.h | 1 + drivers/gpu/drm/nouveau/nouveau_drm.c | 38 +++---- drivers/gpu/drm/nouveau/nouveau_drv.h | 3 +- drivers/gpu/drm/nouveau/nouveau_vga.c | 13 +-- drivers/gpu/drm/nouveau/nv50_display.c | 3 +- drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c | 7 +- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 12 --- drivers/gpu/drm/rockchip/cdn-dp-core.c | 9 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 ++ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 3 + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 115 +-------------------- drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 15 --- drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 27 ++++- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 23 +++-- drivers/gpu/ipu-v3/ipu-common.c | 15 +-- drivers/gpu/ipu-v3/ipu-pre.c | 13 +-- 39 files changed, 334 insertions(+), 257 deletions(-) _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel