Hi Dave, We're already at -rc3, so imo time to annoy you with a -next pull request. Highlights: - seqno wrap fixes and debug infrastructure from Mika Kuoppala and Chris Wilson - some leftover kill-agp on gen6+ patches from Ben - hotplug improvements from Damien - clear fb when allocated from stolen, avoids dirt on the fbcon (Chris) - Stolen mem support from Chris Wilson, one of the many steps to get to real fastboot support. - Some DDI code cleanups from Paulo. - Some refactorings around lvds and dp code. - some random little bits&pieces Note that this -next pull has a bunch of conflicts with -fixes already in 3.8, but nothing really nefarious. You can peak at the merges in my -nigthly branch for the git rerere solution I have stored. I'll also pester you with a patchbomb for the modeset locking rework soon, after some tiny changes since the last round (drm DocBook updated!) I think that stuff is ready, too. Cheers, Daniel The following changes since commit 2ff4aeac39dbdcac934694413767f09a27965e11: drm/i915: Fix pte updates in ggtt clear range (2012-11-29 11:14:44 +0100) are available in the git repository at: git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2012-12-21 for you to fetch changes up to c0c36b941b6f0be6ac74f340040cbb29d6a0b06c: drm/i915: Return the real error code from intel_set_mode() (2012-12-20 21:09:55 +0100) ---------------------------------------------------------------- Ben Widawsky (6): drm/i915: BUG() if fences are used on unsupported platform drm/i915: Bug on unsupported swizzled platforms drm/i915: Missed conversion to gtt_pte_t drm/i915: Move even more gtt code to i915_gem_gtt drm/i915: Move GSM mapping into dev_priv drm/i915: Make GSM void Chris Wilson (26): drm/i915: Increase the response time for slow SDVO devices drm/i915: Wait upon the last request seqno, rather than a future seqno drm/i915: Preallocate next seqno before touching the ring drm/i915: Simplify flushing activity on the ring drm/i915: Rearrange code to only have a single method for waiting upon the ring drm/i915: Include the last semaphore sync point in the error-state drm/i915/debugfs: Prune a couple of superfluous leading zeros from bo domains drm: Introduce drm_mm_create_block() drm: Introduce an iterator over holes in the drm_mm range manager drm/i915: Fix detection of base of stolen memory drm/i915: Avoid clearing preallocated regions from the GTT drm/i915: Delay allocation of stolen space for FBC drm/i915: Allow objects to be created with no backing pages, but stolen space drm/i915: Support readback of stolen objects upon error drm/i915: Introduce i915_gem_object_create_stolen() drm/i915: Allocate fbcon from stolen memory drm/i915: Allocate ringbuffers from stolen memory drm/i915: Allocate overlay registers from stolen memory drm/i915: Use a slab for object allocation drm/i915: Tighten the checks for invalid relocation domains drm/i915: Remove check for conflicting relocation write-domains drm/i915: Reduce memory pressure during shrinker by preallocating swizzle pages drm/i915: Open-code i915_gpu_idle() for handling seqno wrapping drm/i915: Access to snooped system memory through the GTT is incoherent drm/i915: Clear the stolen fb before enabling drm/i915: Return the real error code from intel_set_mode() Damien Lespiau (7): drm/i915: Fix dieing -> dying typo drm/i915: Cleanup SHOTPLUG_CTL status bits definitions drm/i915/hdmi: Read the HPD status before trying to read the EDID drm/i915/dp: Read the HPD status before trying to read the DPCD drm/i915/dp: Log the DPCD only if we have successfully retrieved one drm/i915: Implement ibx_digital_port_connected() for IBX drm/i915: Remove stale comment about intel_dp_detect() Daniel Vetter (35): drm/i915: force restore on lid open drm/i915: remove duplicate register #defines drm/i915: add encoder->pre_pll_enable callback drm/i915: replace ad-hoc dual-link lvds checks drm/i915: move is_dual_link_lvds to intel_lvds.c drm/i915: track is_dual_link in intel_lvds drm/i915: add intel_lvds->reg drm/i915: move intel_update_lvds to intel_lvds->pre_pll_enable drm/i915: enable intel_lvds->pre_pll_enable for ilk+, too drm/i915: simplify shmem pwrite/pread slowpath handling drm/i915: optimize the shmem_pwrite slowpath handling drm/i915: optimize ilk/snb irq handler drm/i915: fixup sparse warnings drm/i915: haswell has the same irq handlers as ivb drm/i915: don't handle PIPE_LEGACY_BLC_EVENT_STATUS on vlv drm/i915: setup the hangcheck timer early drm/i915: reorder setup sequence to have irqs for output setup drm/i915: extract gmbus_wait_hw_status drm/i915: wire up gmbus irq handler drm/i915: use the gmbus irq for waits drm/i915: use gmbus irq to wait for gmbus idle drm/i915: wire up do aux channel done interrupt drm/i915: irq-drive the dp aux communication drm/i915: use _NOTRACE for gmbus/dp aux wait loops drm/i915: rip out pre-DDI stuff from haswell_crtc_mode_set drm/i915: move set_pll_edp to intel_dp.c drm/i915: rip out pre-production ilk cpu edp w/a drm/i915: use wait_for_vblank instead of msleep(17) drm/i915: WARN on !crtc in intel_dp_link_down drm/i915: drop unnecessary clearing of pch dp transcoder timings drm/i915: extract common link_m_n helpers drm/i915: Fixup hpd irq register setup ordering drm/i915: rework locking for intel_dpio|sbi_read|write drm/i915: clean up PIPECONF bpc #defines drm/i915: fixup overlay stolen memory leak Dexuan Cui (1): drm/i915: Remove duplicate and unused register #defines in i915_reg.h Luis R. Rodriguez (1): i915: convert struct spinlock to spinlock_t Mika Kuoppala (13): drm/i915: fix possible NULL dereference of dev_priv drm/i915: Set sync_seqno properly after seqno wrap drm/i915: Add debugfs entry to read/write next_seqno drm/i915: Fix debugfs seqno info print to use uint drm/i915: Split intel_ring_begin drm/i915: Add intel_ring_handle_seqno wrap drm/i915: Don't emit semaphore wait if wrap happened drm/i915: Set initial seqno value close to wrap boundary drm/i915: Introduce ring set_seqno drm/i915: Initialize hardware semaphore state on ring init drm/i915: Always clear semaphore mboxes on seqno wrap drm/i915: Introduce i915_gem_set_seqno() drm/i915: Make next_seqno debugs entry to use i915_gem_set_seqno Paulo Zanoni (11): drm: add drm_mode_cea_vic drm/i915: set the VIC of the mode on the AVI InfoFrame drm/i915: intel_prepare_ddi_buffers should be static drm/i915: remove Haswell code from ironlake_fdi_pll_enable drm/i915: add HAS_DDI check drm/i915: invert the log inside intel_prepare_ddi drm/i915: kill intel_dp_link_clock() drm/i915: be less verbose when handling gmbus/aux irqs drm/i915: check for the PCH when setting pch_transcoder drm/i915: remove leftover display.update_wm assignment drm/i915: add intel_dp_set_signal_levels Sachin Kamat (1): drm/i915: Remove duplicate inclusion of drm/drm_edid.h Tim Gardner (1): i915: intel_set_mode: Reduce stack allocation from 500 bytes to 2 pointers Tomas Janousek (1): drm/i915: don't prevent CPU idle states Ville Syrj?l? (1): drm/i915: Kill i915_gem_execbuffer_wait_for_flips() drivers/char/agp/intel-gtt.c | 1 - drivers/gpu/drm/drm_edid.c | 19 + drivers/gpu/drm/drm_mm.c | 96 ++-- drivers/gpu/drm/i915/i915_debugfs.c | 105 ++++- drivers/gpu/drm/i915/i915_dma.c | 57 ++- drivers/gpu/drm/i915/i915_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 89 +++- drivers/gpu/drm/i915/i915_gem.c | 239 +++++----- drivers/gpu/drm/i915/i915_gem_context.c | 3 +- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 5 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 83 +--- drivers/gpu/drm/i915/i915_gem_gtt.c | 108 ++++- drivers/gpu/drm/i915/i915_gem_stolen.c | 305 +++++++++---- drivers/gpu/drm/i915/i915_gem_tiling.c | 12 + drivers/gpu/drm/i915/i915_irq.c | 164 +++++-- drivers/gpu/drm/i915/i915_reg.h | 58 +-- drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 24 +- drivers/gpu/drm/i915/intel_display.c | 650 ++++++++-------------------- drivers/gpu/drm/i915/intel_dp.c | 295 +++++++------ drivers/gpu/drm/i915/intel_drv.h | 11 +- drivers/gpu/drm/i915/intel_fb.c | 21 +- drivers/gpu/drm/i915/intel_hdmi.c | 22 +- drivers/gpu/drm/i915/intel_i2c.c | 101 +++-- drivers/gpu/drm/i915/intel_lvds.c | 167 ++++++- drivers/gpu/drm/i915/intel_modes.c | 1 - drivers/gpu/drm/i915/intel_overlay.c | 6 +- drivers/gpu/drm/i915/intel_pm.c | 23 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 217 +++++++--- drivers/gpu/drm/i915/intel_ringbuffer.h | 30 +- drivers/gpu/drm/i915/intel_sdvo.c | 38 +- drivers/gpu/drm/i915/intel_tv.c | 3 +- include/drm/drm_crtc.h | 1 + include/drm/drm_mm.h | 40 ++ include/drm/intel-gtt.h | 2 - 35 files changed, 1763 insertions(+), 1239 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch