Hi Linus,
Can you please pull the 'drm-fixes' tree from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
This tree contains the following patches:
commit 850eb83a6a21b086624b227653ce90ad927ba423
Author: Dave Airlie <airlied@starflyer.(none)>
Date: Thu Jul 7 21:09:14 2005 +1000
drm: wrap config.h include in a ifdef KERNEL
This file can be included from userspace so wrap the config.h include.
Signed-off-by: David Airlie <[email protected]>
commit c94f70298529d99ac6e1ee7709f61eab00adeb39
Author: Dave Airlie <airlied@starflyer.(none)>
Date: Thu Jul 7 21:03:38 2005 +1000
drm: misc cleanup
This patch contains the following cleanups:
- make needlessly global functions static
- remove the following unused global functions:
- drm_fops.c: drm_read
- i915_dma.c: i915_do_cleanup_pageflip
Signed-off-by: Adrian Bunk <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit b9523249de59c49e7c2cc83dfa73fb011a489a45
Author: Dave Airlie <airlied@starflyer.(none)>
Date: Thu Jul 7 20:33:26 2005 +1000
drm: use kcalloc now that it is available..
Make the DRM drm_calloc call kcalloc now.
Signed-off-by: Dave Airlie <[email protected]>
commit f650130803c4c0b5e5d76eff24faae722e3a69e2
Author: Dave Airlie <airlied@starflyer.(none)>
Date: Thu Jul 7 20:17:42 2005 +1000
drm: ctx release can happen before dev->ctxlist is allocated
From: Jon Smirl <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit 0c7b525c344bc29a760c37053f8d5c80292ee1be
Author: Dave Airlie <airlied@starflyer.(none)>
Date: Thu Jul 7 20:16:08 2005 +1000
drm: fix minor issues caused by core conversion
The conversion to core/driver got this check in-correct.
Signed-off-by: Dave Airlie <[email protected]>
ati_pcigart.c | 2 -
drm.h | 2 +
drmP.h | 30 ++++--------------
drm_auth.c | 4 +-
drm_bufs.c | 12 +++----
drm_context.c | 4 +-
drm_drv.c | 9 +++--
drm_fops.c | 14 +++-----
drm_irq.c | 2 -
drm_lock.c | 12 +++++--
drm_memory.c | 13 --------
drm_proc.c | 2 -
drm_stub.c | 92 ++++++++++++++++++++++++++++------------------------------
drm_vm.c | 10 +++---
i810_dma.c | 24 +++++++--------
i810_drv.h | 1
i830_dma.c | 20 ++++++------
i830_drv.c | 2 -
i830_drv.h | 2 -
i830_irq.c | 5 +--
i915_dma.c | 60 +++++++++++++++----------------------
i915_drv.c | 2 -
i915_drv.h | 10 ------
i915_irq.c | 4 +-
r128_state.c | 2 -
25 files changed, 146 insertions(+), 194 deletions(-)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
| |
 |