[git tree] DRM fixes/cleanups tree

[git tree] DRM fixes/cleanups tree

[Dave Airlie]

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 <airlied@linux.ie>

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 <bunk@stusta.de>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

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 <airlied@linux.ie>

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 <jonsmirl@gmail.com>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

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 <airlied@linux.ie>

 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(-)

Re: [git tree] DRM fixes/cleanups tree

[Russell King]

On Sat, Jul 09, 2005 at 12:04:07PM +0100, Dave Airlie wrote:
>  ati_pcigart.c |    2 -
>  drm.h         |    2 +
>  drmP.h        |   30 ++++--------------
>  drm_auth.c    |    4 +-
>...
>  i915_irq.c    |    4 +-
>  r128_state.c  |    2 -
>  25 files changed, 146 insertions(+), 194 deletions(-)

Can folk consider using the -p argument to diffstat to obtain the full
path to the file from the kernels top directory please?

Consider the case where you modify just a Kconfig or Makefile.  What
use does a diffstat showing that just one Makefile or Kconfig somewhere
in the kernel tree was modified, but not where it was?

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core

Re: [git tree] DRM fixes/cleanups tree

[Dave Airlie]

>
> Can folk consider using the -p argument to diffstat to obtain the full
> path to the file from the kernels top directory please?
>
> Consider the case where you modify just a Kconfig or Makefile.  What
> use does a diffstat showing that just one Makefile or Kconfig somewhere
> in the kernel tree was modified, but not where it was?

Will do in future...

Granted in this case it should be obviously be the drm ones as I usually
stay in my own directory, but I can see your point...

Dave.

-- 
David Airlie, Software Engineer
http://www.skynet.ie/~airlied / airlied at skynet.ie
Linux kernel - DRI, VAX / pam_smb / ILUG