drm-intel fixes since 2.6.35-rc1
Subsystems (2)
The following changes since commit aef4b9aaae1decc775778903922bd0075cce7a88:
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (2010-06-01 14:13:14 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel for-linus
The last pull request didn't seem to stick, so trying again. The highlight here I'd say is EDP panel setup fix, which is making a lot of newer hardware work it looks like.
Adam Jackson (1):
drm/i915/gen4: Fix interrupt setup ordering
Andy Lutomirski (1):
drm/i915: Fix CRT hotplug regression in 2.6.35-rc1
Carl Worth (1):
Revert "drm/i915: Don't enable pipe/plane/VCO early (wait for DPMS on)."
Chris Wilson (2):
drm/i915: Move non-phys cursors into the GTT
drm/i915: Account for space on the ring buffer consumed whilst wrapping.
Dan Carpenter (1):
drm/i915: take struct_mutex in i915_dma_cleanup()
Dave Airlie (1):
i915: fix ironlake edp panel setup (v4)
Dave Müller (1):
drm/i915: Use RSEN instead of HTPLG for tfp410 monitor detection.
Jesse Barnes (4):
drm/i915: don't queue flips during a flip pending event drm/i915: gen3 page flipping fixes
drm/i915: don't access FW_BLC_SELF on 965G
drm/i915: change default panel fitting mode to preserve aspect ratio
Li Peng (1):
drm/i915: Turn on 945 self-refresh only if single CRTC is active
Prarit Bhargava (1):
drm/i915: fix uninitialized variable warning in i915_setup_compression()
Zou Nan hai (1):
drm/i915: Fix incorrect intel_ring_begin size in BSD ringbuffer.
drivers/gpu/drm/i915/dvo_tfp410.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_dma.c | 8 +++- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_irq.c | 76 ++++++++++++++++++------------- drivers/gpu/drm/i915/i915_reg.h | 5 ++- drivers/gpu/drm/i915/intel_crt.c | 6 --- drivers/gpu/drm/i915/intel_display.c | 74 +++++++++++++++++++++++++----- drivers/gpu/drm/i915/intel_dp.c | 27 ++++++++++- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_lvds.c | 4 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 10 +++-- 12 files changed, 154 insertions(+), 64 deletions(-)
Quoted 1 line
drm/i915: gen3 page flipping fixes
I didn't think this one would be queued up yet, it needs a typo fix (see below).
Linus, if you pull, please apply this on top.
Thanks,
Jesse Barnes, Intel Open Source Technology Center
Quoted 1 line
From
c76f1288e580ce5ee95ccf55ae7aedc433a3cb54Mon Sep 17 00:00:00 2001
From: Jesse Barnes <[email protected]>
Date: Thu, 1 Jul 2010 04:45:43 -0700
Subject: [PATCH] drm/i915: fix page flip finish vs. prepare on plane B
The refreshed patch had a copy & paste bug.
--- drivers/gpu/drm/i915/i915_irq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -947,9 +947,9 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) }if (iir &I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT ) { +intel_prepare_page_flip (dev,1 );if (dev_priv->flip_pending_is_done)intel_finish_page_flip_plane (dev,1 ); -intel_prepare_page_flip (dev,1 ); }if (pipea_stats & vblank_status) {
Signature · 1 line
1.6.1.3