Skip to contentSkip to conversation

drm-intel-fixes (drm/i915 driver)

GIT PULL Keith Packard 1 participant 1 message Jul 1, 2011

lore
Share & tools
lore
#0 lore raw

Another forcewake fix, a NULL pointer oops, some error-path cleanups, a UMS for IRL fix and another IVB fix. The UMS for IRL fix (from Jesse) contains a bunch of code motion, hence the fairly large diffstat. Otherwise, these are all tiny fixes.

The following changes since commit 0d72c6fcb5cd215eeab824fac216ea42c5b574aa:

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 (2011-06-28 11:15:57 -0700)

are available in the git repository at:

ssh://master.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git drm-intel-fixes

Ben Widawsky (1):
drm/i915: Don't call describe_obj on NULL pointers

Chris Wilson (1):
drm/i915/overlay: Fix unpinning along init error paths

Jesse Barnes (2):
drm/i915: move IRQ function table init to i915_irq.c drm/i915: apply HWSTAM writes to Ivy Bridge as well

Keith Packard (1):
drm/i915: Hold struct_mutex during i915_save_state/i915_restore_state

 drivers/gpu/drm/i915/i915_debugfs.c  |   16 ++++---
 drivers/gpu/drm/i915/i915_dma.c      |   31 +-------------
 drivers/gpu/drm/i915/i915_drv.c      |    8 ---
 drivers/gpu/drm/i915/i915_drv.h      |   32 +-------------
 drivers/gpu/drm/i915/i915_irq.c      |   80 +++++++++++++++++++++++++---------
 drivers/gpu/drm/i915/i915_suspend.c  |   19 ++++++---
 drivers/gpu/drm/i915/intel_overlay.c |   17 ++++---
 7 files changed, 94 insertions(+), 109 deletions(-)
Signature · 1 line
[email protected]