Home » Mailing list archives » linux-kernel » 2008 » March » 29

[git pull] drm fixes for 2.6.25 final

Previous thread: sound/usb/usbaudio.c: printk() is fine by Pavel Machek on Saturday, March 29, 2008 - 2:20 pm. (4 messages)

Next thread: [RFC][PATCH 0/3] PM: Rework suspend and hibernation code for devices (rev. 3) by Rafael J. Wysocki on Saturday, March 29, 2008 - 3:17 pm. (30 messages)
[view original message]
From: Dave Airlie
Subject: [git pull] drm fixes for 2.6.25 final
Date: Saturday, March 29, 2008 - 3:09 pm

Hi Linus,

Please pull the 'drm-fixes' branch from
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes

This contains a bug fix for hangs in the r300 3D system due to a really 
badly defined hardware wait interface, I've had to do some workarounds as 
its a userspace exposed interface and I want to fix it for old and new 
users. I've also included an oops fixer, a sparse cleanup, and patch to 
support non-coherent DMA for powerpc that I was going to hold but since 
I'm pushing stuff it may as well go now..

Dave.

 drivers/char/drm/ati_pcigart.c |    6 ++++
 drivers/char/drm/drm_scatter.c |   11 +++++++-
 drivers/char/drm/drm_vm.c      |   20 +++++++++++---
 drivers/char/drm/i915_dma.c    |    3 ++
 drivers/char/drm/r300_cmdbuf.c |   54 +++++++++++++++++++++++++++++++---------
 drivers/char/drm/radeon_drm.h  |   12 +++++++++
 drivers/char/drm/radeon_mem.c  |    8 +++---
 7 files changed, 92 insertions(+), 22 deletions(-)

commit 6876b3bacaaa4c73fb8752b47c84b2b7fad5422a
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Fri Mar 28 14:23:07 2008 -0700

    drm: fix for non-coherent DMA PowerPC
    
    This patch fixes bits of the DRM so to make the radeon DRI work on
    non-cache coherent PCI DMA variants of the PowerPC processors.
    
    It moves the few places that needs change to wrappers to that
    other architectures with similar issues can easily add their
    own changes to those wrappers, at least until we have more useful
    generic kernel API.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: "Luck, Tony" <tony.luck@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 2b46278b6af0a4df43016f01a0741d8e0a76bfd4
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Fri Mar 28 14:23:06 2008 -0700

    drm: radeon: fix sparse integer as NULL pointer ...
[ message continues ]
Previous thread: sound/usb/usbaudio.c: printk() is fine by Pavel Machek on Saturday, March 29, 2008 - 2:20 pm. (4 messages)

Next thread: [RFC][PATCH 0/3] PM: Rework suspend and hibernation code for devices (rev. 3) by Rafael J. Wysocki on Saturday, March 29, 2008 - 3:17 pm. (30 messages)