Hi Dave, Fixes for 3.20. I did stick the gen3/4 reset work from Ville in because we have an awful lot of gen4 mesa hangs, and with this reset should also work on vintage i965g/gm (we already have reset for g4x/gen4.5). So should help to appease users suffering from these hangs. Otherwise all over. This is the last 3.20 pull from me, from here on Jani will take over. Cheers, Daniel The following changes since commit 4fcd01d0f34645710ac92d5523e26019428b0806: drm: rcar-du: Fix NULL encoder pointer dereference (2014-12-03 08:28:48 +1000) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/drm-intel-next-fixes-2014-12-04 for you to fetch changes up to 00f0b3781028605910cb4662a0f8a4849b445fc2: drm/i915: Reject modeset when the same digital port is used more than once (2014-12-03 09:31:53 +0100) ---------------------------------------------------------------- Akash Goel (1): drm/i915/skl: Update in Gen9 multi-engine forcewake range Chris Wilson (1): drm/i915: Only warn the first time we attempt to mmio whilst suspended Clint Taylor (1): drm/i915/chv: Enable AVI, SPD and HDMI infoframes for CHV. Daniel Vetter (4): drm/i915: Disallow pin ioctl completely for kms drivers drm/i915: Stop gathering error states for CS error interrupts drm/i915: Handle runtime pm in the CRC setup code drm/i915: Tune down spurious CRC interrupt warning Egbert Eich (1): drm/i915/eDP: When enabling panel VDD cancel pending disable worker Imre Deak (1): drm/i915: mask RPS IRQs properly when disabling RPS Thomas Daniel (1): drm/i915: Fix context object leak for legacy contexts Ville Syrjälä (8): drm/i915: Don't clobber crtc->new_config when nothing changes drm/i915: Fix gen4 GPU reset drm/i915: Restore the display config after a GPU reset on gen4 drm/i915: Implement GPU reset for 915/945 drm/i915: Implement GPU reset for g33 drm/i915: Grab modeset locks for GPU rest on pre-ctg drm/i915: Disable crtcs gracefully before GPU reset on gen3/4 drm/i915: Reject modeset when the same digital port is used more than once drivers/gpu/drm/i915/i915_debugfs.c | 5 ++ drivers/gpu/drm/i915/i915_gem.c | 15 ++-- drivers/gpu/drm/i915/i915_irq.c | 59 +++++++------- drivers/gpu/drm/i915/i915_reg.h | 3 +- drivers/gpu/drm/i915/intel_display.c | 151 ++++++++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_hdmi.c | 7 ++ drivers/gpu/drm/i915/intel_uncore.c | 79 +++++++++--------- 9 files changed, 230 insertions(+), 93 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx