[git pull] drm patches for 2.6.17

From: Dave Airlie
Date: Tue Apr 18 2006 - 07:15:49 EST


Hi Linus,
This contains various cleanups and coverity fixes, deinlining patch, and a minor ioctl flags change.

Please pull 'drm-patches' from:
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git

Dave.

drmP.h | 4 -
drm_drv.c | 4 -
drm_memory.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++
drm_memory.h | 128 +-------------------------------------------------
drm_memory_debug.h | 2
drm_pci.c | 1
via_irq.c | 12 ++--
7 files changed, 152 insertions(+), 133 deletions(-)

commit d253258c80117c2afaa644554e613201992e4ee9
Author: Jayachandran C <c.jayachandran@xxxxxxxxx>
Date: Mon Apr 10 23:18:28 2006 -0700

drm: Fix further issues in drivers/char/drm/via_irq.c

Fix de-reference of 'dev_priv' before NULL check.

Signed-off-by: Jayachandran C. <c.jayachandran@xxxxxxxxx>
Cc: Dave Airlie <airlied@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>

commit 031de96af0e7ed6ad4a7ec2b74a77bf9782f966e
Author: Adrian Bunk <bunk@xxxxxxxxx>
Date: Mon Apr 10 23:18:27 2006 -0700

drivers/char/drm/drm_memory.c: possible cleanups

- #if 0 the following unused global function:
- drm_ioremap_nocache()

- make the following needlessly global functions static:
- agp_remap()
- drm_lookup_map()

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Dave Airlie <airlied@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>

commit 31f64bd101ea256f9fc4a7f1f1706d6417d5550a
Author: Dave Airlie <airlied@xxxxxxxx>
Date: Fri Apr 7 16:55:43 2006 +1000

drm: deline a few large inlines in DRM code

This patch moves a few large functions from drm_memory.h
to drm_memory.c, with the following effect:

text data bss dec hex filename
46305 1304 20 47629 ba0d new/drm.ko
46367 1304 20 47691 ba4b org/drm.ko
12969 1372 0 14341 3805 new/i810.ko
14712 1372 0 16084 3ed4 org/i810.ko
16447 1364 0 17811 4593 new/i830.ko
18198 1364 0 19562 4c6a org/i830.ko
11875 1324 0 13199 338f new/i915.ko
13025 1324 0 14349 380d org/i915.ko
23936 29288 0 53224 cfe8 new/mga.ko
27280 29288 0 56568 dcf8 org/mga.ko

Please apply.

Signed-off-by: Denis Vlasenko <vda@xxxxxxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxx>

commit 11bab7d2c86fe486e3581ac3dcdb349478ffb899
Author: Dave Airlie <airlied@xxxxxxxx>
Date: Wed Apr 5 18:13:13 2006 +1000

drm: remove master setting from add/remove context

Clients can do this in the miniglx setups.

Signed-off-by: Dave Airlie <airlied@xxxxxxxx>

commit 195b3a2d57b81d30e3129575ef6c8a95b2c936b7
Author: Dave Airlie <airlied@xxxxxxxx>
Date: Wed Apr 5 18:12:18 2006 +1000

drm: drm_pci needs dma-mapping.h

On alpha:

WARNING: "dma_free_coherent" [drivers/char/drm/drm.ko] undefined!
WARNING: "dma_alloc_coherent" [drivers/char/drm/drm.ko] undefined!

Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxx>

commit 86678dfddba55a7b9e2ea084d59be6500fec2256
Author: Dave Airlie <airlied@xxxxxxxx>
Date: Wed Apr 5 18:10:11 2006 +1000

[PATCH] drm: Fix issue reported by Coverity in drivers/char/drm/via_irq.c

This patch tries to fix an issue reported in drivers/char/drm/via_irq.c by
Coverity, please review and apply if correct.

Error reported:
CID: 3444 Checker: REVERSE_INULL (help)
File: /export2/p4-coverity/mc2/linux26/drivers/char/drm/via_irq.c
Function: via_driver_irq_wait
Description: Pointer "dev_priv" dereferenced before NULL check

Patch Description:
Move de-referencing dev_priv to after the NULL check.

Signed-off-by: Jayachandran C. <c.jayachandran at gmail.com>
Signed-off-by: Dave Airlie <airlied@xxxxxxxx>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/