Skip to contentSkip to conversation

drm-intel fixes for 2.6.33-rc7

GIT PULL Eric Anholt 1 participant 1 message Feb 12, 2010

lore
Share & tools
lore
#0 lore raw

The following changes since commit e28cab42f384745c8a947a9ccd51e4aae52f5d51:
Linus Torvalds (1):
Merge branch 'i2c-for-linus' of git://git.kernel.org/.../jdelvare/staging

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel for-linus

These are all regression fixes.

Chris Wilson (1):
drm/i915: Increase fb alignment to 64k

Daniel Vetter (1):
drm/i915: Update write_domains on active list after flush.

Jesse Barnes (3):
drm/i915: handle FBC and self-refresh better drm/i915: untangle page flip completion drm/i915: hold ref on flip object until it completes

Owain Ainsworth (1):
drm/i915: Correctly return -ENOMEM on allocation failure in cmdbuf ioctls.

Rafael J. Wysocki (1):
drm/i915: Fix crash while aborting hibernation

Zhenyu Wang (3):
drm/i915: Rework DPLL calculation parameters for Ironlake drm/i915: fix flip done interrupt on Ironlake drm/i915: fix pipe source image setting in flip command

 drivers/gpu/drm/i915/i915_dma.c      |    4 +-
 drivers/gpu/drm/i915/i915_drv.c      |  168 ++++++++++++++---------
 drivers/gpu/drm/i915/i915_drv.h      |   11 ++
 drivers/gpu/drm/i915/i915_gem.c      |   27 +++-
 drivers/gpu/drm/i915/i915_irq.c      |   16 +-
 drivers/gpu/drm/i915/i915_reg.h      |    1 +
 drivers/gpu/drm/i915/intel_display.c |  245 +++++++++++++++++++++++++--------
 drivers/gpu/drm/i915/intel_fb.c      |    2 +-
 8 files changed, 332 insertions(+), 142 deletions(-)