From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PULL] drm-intel-next Date: Sat, 8 Jun 2013 17:14:44 +0200 Message-ID: <20130608151444.GD22870@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D532E5EA2 for ; Sat, 8 Jun 2013 08:14:50 -0700 (PDT) Received: by mail-ea0-f171.google.com with SMTP id m14so4398197eaj.30 for ; Sat, 08 Jun 2013 08:14:49 -0700 (PDT) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Dave Airlie Cc: Intel Graphics Development , DRI Development List-Id: dri-devel@lists.freedesktop.org Hi Dave, Another round of drm-intel-next for 3.11. Highlights: - Haswell IPS support (Paulo Zanoni) - VECS support on Haswell (Ben Widawsky, Xiang Haihao, ...) - Haswell watermark fixes (Paulo Zanoni) - "Make the gun bigger again" multithread fence fix from Chris. - i915_error_state finnally no longer fails with -ENOMEM! Big thanks to Mika for tackling this. - vlv sideband locking fixes from Jani - Hangcheck prep work for arb_robustness support (Mika&Chris) - edp vs cpu port confusion clean-up from Imre - pile of smaller fixes and cleanups all over. Cheers, Daniel The following changes since commit e1b73cba13a0cc68dd4f746eced15bd6bb24cda4: Merge tag 'v3.10-rc2' into drm-intel-next-queued (2013-05-21 09:52:16 +02= 00) are available in the git repository at: git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2013-0= 6-01 for you to fetch changes up to 92d44621ad2d083bc03920c904ca0a5eb10d9ded: drm/i915: add i915_ips_status debugfs entry (2013-05-31 21:40:20 +0200) ---------------------------------------------------------------- Ben Widawsky (20): drm/i915: Fix error state memory leaks drm/i915: pre-fixes for checkpatch drm/i915: use mappable size for fb kickout drm/i915: use drm_mm_takedown drm/i915: context debug messages drm/i915: Call context fini at cleanup drm/i915: Comments for semaphore clarification drm/i915: Semaphore MBOX update generalization drm/i915: Introduce VECS: the 4th ring drm/i915: Add VECS semaphore bits drm/i915: Rename ring flush functions drm/i915: Vebox ringbuffer init drm/i915: Create a more generic pm handler for hsw+ drm/i915: Create an ivybridge_irq_preinstall drm/i915: Add PM regs to pre/post install drm/i915: make PM interrupt writes non-destructive drm/i915: Convert irq_refounct to struct drm/i915: consolidate interrupt naming scheme drm/i915: vebox interrupt get/put drm/i915: Enable vebox interrupts Chris Wilson (3): drm/i915: Be more informative when reporting "too large for aperture"= error drm/i915: Workaround incoherence with fence updates on Valleyview drm/i915: Avoid promoting a simulated hang to 'wedged' Daniel Vetter (6): drm/i915: fixup i915_pipe_enabled check in i915_irq.c drm/i915: hw state readout&check support for cpu_transcoder drm/i915: add basic pipe config dump support drm/i915: drop a few really redundant WARNs in hsw mode_set drm/i915: fix pch_nop support drm/i915: fix up the edp power well check Imre Deak (5): drm/i915: release scratch page at module unload drm/i915: stop using is_cpu_edp() in intel_disable/post_disable_dp drm/i915: merge VLV eDP and DP AUX clock divider calculation drm/i915: replace is_cpu_edp() with a check for port A drm/i915: remove unused is_cpu_edp() Jani Nikula (6): drm/i915: group sideband register accessors to a new file drm/i915: refactor VLV IOSF sideband accessors to use one helper drm/i915: drop redundant warnings on not holding dpio_lock drm/i915: rename VLV IOSF sideband functions logically drm/i915: change VLV IOSF sideband accessors to not return error code drm/i915: document why dvo/sdvo/crt need a special dpms function Jesse Barnes (1): drm/i915: add encoder get_config function v5 Mika Kuoppala (5): drm/i915: avoid big kmallocs on reading error state drm/i915: pass seqno to i915_hangcheck_ring_idle drm/i915: track ring progression using seqnos drm/i915: introduce i915_hangcheck_ring_hung drm/i915: release cursor when crtc is destroyed Paulo Zanoni (16): drm/i915: ILK, SNB and IVB don't have linetime watermarks drm/i915: remove intel_update_linetime_watermarks drm/i915: use the mode->htotal to calculate linetime watermarks drm/i915: fix haswell linetime watermarks calculation drm/i915: make intel_ddi_get_cdclk_freq return values in KHz drm/i915: set the IPS linetime watermark drm/i915: MCH_SSKPD is a 64 bit register on Haswell drm/i915: set FORCE_ARB_IDLE_PLANES workaround drm/i915: add "enable" argument to intel_update_sprite_watermarks drm/i915: add haswell_update_sprite_wm drm/i915: properly set HSW WM_PIPE registers drm/i915: properly set HSW WM_LP watermarks drm/i915: add support for 5/6 data buffer partitioning on Haswell drm/i915: implement IPS feature drm/i915: add enable_ips module option drm/i915: add i915_ips_status debugfs entry Thomas Meyer (1): drm/i915: Cocci spatch "memdup.spatch" Ville Syrj=E4l=E4 (2): drm/i915: Fix WARN_ON() on UP machines drm: Fix drm_rect documentation Wei Yongjun (1): drm/i915: fix error return code in init_pipe_control() Xiang, Haihao (4): drm/i915: add HAS_VEBOX drm/i915: add VEBOX into debugfs drm/i915: add I915_EXEC_VEBOX to i915_gem_do_execbuffer() drm/i915: add I915_PARAM_HAS_VEBOX to i915_getparam Documentation/DocBook/drm.tmpl | 8 +- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 289 +++++++++--- drivers/gpu/drm/i915/i915_dma.c | 10 +- drivers/gpu/drm/i915/i915_drv.c | 61 ++- drivers/gpu/drm/i915/i915_drv.h | 40 +- drivers/gpu/drm/i915/i915_gem.c | 68 ++- drivers/gpu/drm/i915/i915_gem_context.c | 14 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 + drivers/gpu/drm/i915/i915_irq.c | 248 +++++++--- drivers/gpu/drm/i915/i915_reg.h | 262 ++++++----- drivers/gpu/drm/i915/i915_sysfs.c | 2 +- drivers/gpu/drm/i915/intel_crt.c | 27 +- drivers/gpu/drm/i915/intel_ddi.c | 37 +- drivers/gpu/drm/i915/intel_display.c | 498 +++++++++----------- drivers/gpu/drm/i915/intel_dp.c | 145 +++--- drivers/gpu/drm/i915/intel_drv.h | 26 +- drivers/gpu/drm/i915/intel_dvo.c | 24 + drivers/gpu/drm/i915/intel_hdmi.c | 69 ++- drivers/gpu/drm/i915/intel_lvds.c | 26 ++ drivers/gpu/drm/i915/intel_overlay.c | 13 +- drivers/gpu/drm/i915/intel_panel.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 698 +++++++++++++++++++++++-= ---- drivers/gpu/drm/i915/intel_ringbuffer.c | 201 ++++++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 22 +- drivers/gpu/drm/i915/intel_sdvo.c | 45 ++ drivers/gpu/drm/i915/intel_sideband.c | 177 +++++++ drivers/gpu/drm/i915/intel_sprite.c | 8 +- include/drm/drm_rect.h | 9 +- include/uapi/drm/i915_drm.h | 3 +- 30 files changed, 2146 insertions(+), 896 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_sideband.c -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch