[PULL] drm-intel-next

Keith Packard
2012-01-05T03:35:41Z

[-- Attachment #1: Type: text/plain, Size: 2606 bytes --]

Here are the rest of the 3.3 pending changes.

This has a bunch of small bug fixes and overlay plane support for i915.

The following changes since commit 7a7e8734ac3235efafd34819b27fbdf5417e6d60:

Merge branch 'drm-radeon-testing' of ../drm-radeon-next into drm-core-next (2012-01-03 09:45:12 +0000)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux drm-intel-next

Ben Widawsky (4):
drm/i915: relative_constants_mode race fix
drm/i915: Force sync command ordering (Gen6+)
drm/i915: Update GEN6_RP_CONTROL definitions
drm/i915: drpc debugfs update for gen6

Daniel Vetter (2):
drm/i915: kicking rings stuck on semaphores considered harmful
drm/i915: don't bail out of intel_wait_ring_buffer too early

Eric Anholt (5):
drm/i915: Set two chicken bits implicated in missed IRQs on Ivybridge.
drm/i915: Do the fallback non-IRQ wait in ring throttle, too.
drm/i915: Work around gen7 BLT ring synchronization issues.
drm/i915: Make the fallback IRQ wait not sleep.
drm/i915: Add support for resetting the SO write pointers on gen7.

Jesse Barnes (5):
drm/i915: add SNB and IVB video sprite support v6
drm/i915: track sprite coverage and disable primary plane if possible
drm/i915: add color key support v4
drm/i915: don't disable a PCH DPLL that's in use
drm/i915: only set the intel_crtc DPMS mode to on if the mode set succeeded

Keith Packard (1):
drm/i915: Clean up multi-threaded forcewake patch

drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/i915_debugfs.c | 86 ++++-
drivers/gpu/drm/i915/i915_dma.c | 5 +
drivers/gpu/drm/i915/i915_drv.c | 7 -
drivers/gpu/drm/i915/i915_drv.h | 6 +-
drivers/gpu/drm/i915/i915_gem.c | 10 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 63 +++-
drivers/gpu/drm/i915/i915_irq.c | 7 -
drivers/gpu/drm/i915/i915_reg.h | 161 +++++++-
drivers/gpu/drm/i915/intel_display.c | 206 ++++++++-
drivers/gpu/drm/i915/intel_drv.h | 40 ++
drivers/gpu/drm/i915/intel_fb.c | 6 +
drivers/gpu/drm/i915/intel_ringbuffer.c | 30 ++-
drivers/gpu/drm/i915/intel_sprite.c | 668 ++++++++++++++++++++++++++++
include/drm/i915_drm.h | 40 ++
15 files changed, 1290 insertions(+), 46 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_sprite.c

--
keith.packard@intel.com

[-- Attachment #2: Type: application/pgp-signature, Size: 827 bytes --]