A little later than I had intended, but fortunately I've resisted the
temptation to drop in any last minute patch bombs.
Compared with recent history this has been an uneventful cycle, with a lot
of the recent work being not yet ready for merging. This cycle has mostly
been concerned with bug fixes that looked a little too fragile or invasive
to apply immediately to -fixes but required a little more soak testing.
The biggest of these is Jesse's overhaul of our crtc enabling to include
sanity tests, which should help prevent further regressions in the
bring-up of new chipsets. So hopefully this will prove to be a less
hectic merge than last time. :)
-Chris
The following changes since commit fb62c00a6d8942775abc23d1621db1252e2d93d1:
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (2011-03-05
10:43:22 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git
drm-intel-next
Alexander Lam (1):
drm/i915: allow 945 to control self refresh (CxSR) automatically
Bryan Freed (2):
drm/i915: Honour LVDS sync polarity from EDID
drm/i915/bios: Change default clock source on PineView to use SSC
Chris Wilson (53):
drm/i915: Use ACPI OpRegion to determine lid status
drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU
drm/i915: Trivial sparse fixes
drm/i915: Disable SSC for outputs other than LVDS or DP
drm/i915: Include TLB miss latency in g4x watermark computations
Merge branch 'drm-intel-fixes' into drm-intel-next
drm/i915/ringbuffer: Kill an annoyingly frequent debug message
drm/i915: Remove unused code: i915_enable_interrupt()
Merge branch 'drm-intel-fixes' into drm-intel-next
drm/i915: Silence a few -Wunused-but-set-variable
drm/i915: Refactor self-refresh watermark calculations
drm/i915/sdvo: Use a compact test for determining a multi-function device
drm/i915/sdvo: Add BUILD_BUG_ON to warn if the structs are ever
miscompiled
drm/i915: Check wedged status before throttling
drm/i915: Defer reporting EIO until we try to use the GPU
drm/i915: Record all error ringbuffers
drm/i915: Trivial spelling mistake 'assertiing'
drm/i915: Override SDVO panel type in VBT
drm/i915: Remove unreachable condition
Merge branch 'drm-intel-fixes' into drm-intel-next
drm/i915: Enable GMBUS for post-gen2 chipsets
drm/i915: Include 'i915_error_state' hint for when the GPU catches fire
drm/i915: Use DEBUG_KMS for the self-refresh watermarks
drm/i915: Fix infinite loop regression from 21dd3734
drm/i915: Refine tracepoints
drm/i915: Skip the no-op domain changes when already in CPU|GTT domains
drm/i915: i915_mutex_interruptible() returns -EINTR
drm/i915: Ignore a hung GPU when flushing the framebuffer prior to a
switch
agp/intel: Experiment with a 855GM GWB bit
drm/i915: Move the lvds OpRegion lid detection code to panel and reuse
for eDP
Merge branch 'drm-intel-fixes' into drm-intel-next
Revert "drm/i915: Disable SSC for outputs other than LVDS or DP"
drm/i915: Protect against drm_gem_object not being the first member
drm/i915: Add a module parameter to ignore lid status
drm/i915: First try a normal large kmalloc for the temporary exec buffers
drm/i915: Use a device flag for non-interruptible phases
drm/i915: Add support for limited color range of broadcast outputs
Merge branch 'drm-intel-fixes' into drm-intel-next
drm/i915: Use a symbolic constant for OpRegion lid state
drm/i915: Silence an innocuous compiler warning for an unused variable
drm/i915: Allow relocation deltas outside of target bo
Revert "drm/i915: Use PM QoS to prevent C-State starvation of gen3 GPU"
drm/i915: Replace vblank PM QoS with "Interrupt-Based AGPBUSY#"
drm/i915: Re-enable GPU semaphores for SandyBridge mobile
Merge branch 'drm-intel-fixes' into drm-intel-next
drm/i915: don't store the reg value for HWS_PGA
Revert "drm/i915: fix corruptions on i8xx due to relaxed fencing"
drm/i915: Do not overflow the MMADDR write FIFO
drm/i915: Disable GPU semaphores by default
drm/i915: Rebind the buffer if its alignment constraints changes with
tiling
drm/i915/dp: Sanity check eDP existence
drm/i915: Only wait on a pending flip if we intend to write to the buffer
Merge branch 'drm-intel-fixes' into drm-intel-next
Eric Anholt (1):
drm/i915: Set the transcoder port to none when disabling DP.
Jesse Barnes (20):
drm/i915: don't enable plane, pipe and PLL prematurely
drm/i915: add pipe/plane enable/disable functions
drm/i915: add panel lock assertion function
drm/i915: add PLL enable/disable functions
drm/i915: add PCH DPLL enable/disable functions
drm/i915: assert panel is unlocked before writing transcoder timing regs
drm/i915: add transcoder enable/disable functions
drm/i915: factor out FDI disable and add FDI assertions
drm/i915: set phase sync pointer override enable before setting phase
sync pointer
drm/i915: skip FDI & PCH enabling for DP_A
drm/i915: tune Sandy Bridge DRPS constants
drm/i915: remove now unnecessary delays in eDP panel power sequencing
drm/i915: use VDD AUX override to make panel power sequencing look better
drm/i915: don't check plane vs pipe enable on ILK+
drm/i915: add port assertion check when disabling transcoders
drm/i915: the PCH reference clocks are global, so don't clobber
unconditionally
drm/i915: cleanup per-pipe reg usage
drm/i915: disable PCH ports if needed when disabling a CRTC
drm/i915: don't enable FDI & transcoder interrupts after all
drm/i915: fix per-pipe reads after "cleanup"
Zhenyu Wang (1):
drm/i915: Don't save/restore hardware status page address register
drivers/gpu/drm/i915/i915_debugfs.c | 82 +-
drivers/gpu/drm/i915/i915_dma.c | 40 +-
drivers/gpu/drm/i915/i915_drv.c | 25 +-
drivers/gpu/drm/i915/i915_drv.h | 136 +--
drivers/gpu/drm/i915/i915_gem.c | 305 +++---
drivers/gpu/drm/i915/i915_gem_debug.c | 45 -
drivers/gpu/drm/i915/i915_gem_evict.c | 5 +
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 180 +--
drivers/gpu/drm/i915/i915_gem_tiling.c | 47 +-
drivers/gpu/drm/i915/i915_irq.c | 214 ++--
drivers/gpu/drm/i915/i915_reg.h | 486 +++++----
drivers/gpu/drm/i915/i915_suspend.c | 435 ++++----
drivers/gpu/drm/i915/i915_trace.h | 301 +++--
drivers/gpu/drm/i915/intel_bios.c | 53 +-
drivers/gpu/drm/i915/intel_crt.c | 33 +-
drivers/gpu/drm/i915/intel_display.c | 1855 ++++++++++++++++++----------
drivers/gpu/drm/i915/intel_dp.c | 157 ++-
drivers/gpu/drm/i915/intel_drv.h | 13 +-
drivers/gpu/drm/i915/intel_dvo.c | 2 +-
drivers/gpu/drm/i915/intel_hdmi.c | 13 +
drivers/gpu/drm/i915/intel_i2c.c | 3 +-
drivers/gpu/drm/i915/intel_lvds.c | 11 +-
drivers/gpu/drm/i915/intel_modes.c | 30 +
drivers/gpu/drm/i915/intel_opregion.c | 4 +
drivers/gpu/drm/i915/intel_overlay.c | 41 +-
drivers/gpu/drm/i915/intel_panel.c | 19 +
drivers/gpu/drm/i915/intel_ringbuffer.c | 30 +-
drivers/gpu/drm/i915/intel_ringbuffer.h | 42 +-
drivers/gpu/drm/i915/intel_sdvo.c | 59 +-
drivers/gpu/drm/i915/intel_tv.c | 10 +-
include/drm/i915_drm.h | 1 +
31 files changed, 2740 insertions(+), 1937 deletions(-)
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
