Re: [RFC: 2.6 patch] remove the i830 driver
On Tue, Jul 15, 2008 at 03:28:04PM +0100, Keith Whitwell wrote: You can still buy new i865 boards: http://www.ebuyer.com/product/119412 So I think this isn't a great idea. Why does the i915 driver not work on this board? Keith cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [RFC: 2.6 patch] remove the i830 driver
On Tue, Jul 15, 2008 at 09:14:05PM +0100, Dave Airlie wrote: After seeing that i830_drm.h was just added as a userspace header I wondered whether there's really a non-empty intersection of kernel = 2.6.27 users and users of such an ancient X. I doubt it, and therefore suggest this patch to remove the driver. NAK I'm generally against removing old userspace APIs just because you don't know what people are doing out in the real world, This should go via feature deprecation, it should also include a list of distros that actually shipped an X server/Mesa combo that used the i830 as opposed to the i915 so we can make a better judgement call. Is there any remote chance at all that such distros will work with kernels = 2.6.27 ? I'm asking since I remember that the current stable Debian contains kernel 2.6.18, the previous stable Debian contained kernel 2.6.8 (which was released nearly at the same time as X11R6.8.0), and the upgrade procedure was slightly tricky since there does not exist any udev version supporting both kernel 2.6.8 and kernel 2.6.18. [1] If you know about things people do in the real world I missed please say so. Dave. cu Adrian [1] http://www.debian.org/releases/etch/i386/release-notes/ch-upgrading.en.html#s-upgrading_kernel -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] make drm_minors_cleanup() static
This patch makes the needlessly global drm_minors_cleanup() static.
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
33cfc2c40ea8449f0e36af7107778a2bdaffae19 diff --git
a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c
index fc54140..7166a55 100644
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
@@ -318,7 +318,7 @@ static void drm_cleanup(struct drm_device * dev)
DRM_ERROR(Cannot unload module\n);
}
-int drm_minors_cleanup(int id, void *ptr, void *data)
+static int drm_minors_cleanup(int id, void *ptr, void *data)
{
struct drm_minor *minor = ptr;
struct drm_device *dev;
-
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] make drm_sg_alloc() static
drm_sg_alloc() can now become static.
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
drivers/char/drm/drmP.h|1 -
drivers/char/drm/drm_scatter.c |5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
20df9d65e0cd1dc699129787b2c4b02a010b1bcc
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 9dd0760..98395c1 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -1047,7 +1047,6 @@ extern int drm_proc_cleanup(int minor,
extern void drm_sg_cleanup(struct drm_sg_mem * entry);
extern int drm_sg_alloc_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
-extern int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather *
request);
extern int drm_sg_free(struct drm_device *dev, void *data,
struct drm_file *file_priv);
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c
index eb7fa43..489 100644
--- a/drivers/char/drm/drm_scatter.c
+++ b/drivers/char/drm/drm_scatter.c
@@ -62,7 +62,8 @@ void drm_sg_cleanup(struct drm_sg_mem * entry)
# define ScatterHandle(x) (unsigned int)(x)
#endif
-int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
+static int drm_sg_alloc(struct drm_device *dev,
+ struct drm_scatter_gather * request)
{
struct drm_sg_mem *entry;
unsigned long pages, i, j;
@@ -183,8 +184,6 @@ int drm_sg_alloc(struct drm_device *dev, struct
drm_scatter_gather * request)
drm_sg_cleanup(entry);
return -ENOMEM;
}
-EXPORT_SYMBOL(drm_sg_alloc);
-
int drm_sg_alloc_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv)
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [RFC] full suspend/resume support for i915 DRM driver
On Mon, Oct 22, 2007 at 09:15:43PM -0700, Jesse Barnes wrote: On Friday, October 19, 2007, Jesse Barnes wrote: Dave can you take a look at the new flag and also see what you think about supporting suspend/resume in the event X hasn't started yet? There's some #if 0'd code to support that case, but I haven't tested it. Ok Dave, this one's been updated with support for suspend/resume with or without X running (iow I removed the requirement that X initialize the driver, which DRM drivers usually have). Hope it looks alright, it could definitely use testing on more machines though... Jesse diff --git a/linux-core/Kconfig b/linux-core/Kconfig index 2d02c76..5e73fc7 100644 --- a/linux-core/Kconfig +++ b/linux-core/Kconfig @@ -50,7 +50,7 @@ config DRM_I810 choice prompt Intel 830M, 845G, 852GM, 855GM, 865G - depends on DRM AGP AGP_INTEL + depends on DRM AGP AGP_INTEL !FB_INTEL optional ... This sounds like a bad regression. cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now http://get.splunk.com/ -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] radeon_driver_vblank_do_wait() static
radeon_driver_vblank_do_wait() can become static.
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
--- linux-2.6.23-rc1-mm1/drivers/char/drm/radeon_irq.c.old 2007-07-26
08:49:12.0 +0200
+++ linux-2.6.23-rc1-mm1/drivers/char/drm/radeon_irq.c 2007-07-26
08:49:46.0 +0200
@@ -144,8 +144,8 @@
return ret;
}
-int radeon_driver_vblank_do_wait(struct drm_device * dev, unsigned int
*sequence,
-int crtc)
+static int radeon_driver_vblank_do_wait(struct drm_device * dev,
+ unsigned int *sequence, int crtc)
{
drm_radeon_private_t *dev_priv =
(drm_radeon_private_t *) dev-dev_private;
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] drm_rmmap_ioctl(): remove dead code
This patch removes some obviously dead code spotted by the Coverity
checker.
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
--- linux-2.6.22-rc6-mm1/drivers/char/drm/drm_bufs.c.old2007-07-23
01:09:04.0 +0200
+++ linux-2.6.22-rc6-mm1/drivers/char/drm/drm_bufs.c2007-07-23
01:09:22.0 +0200
@@ -476,15 +476,10 @@ int drm_rmmap_ioctl(struct inode *inode,
if (list_empty(dev-maplist) || !map) {
mutex_unlock(dev-struct_mutex);
return -EINVAL;
}
- if (!map) {
- mutex_unlock(dev-struct_mutex);
- return -EINVAL;
- }
-
/* Register and framebuffer maps are permanent */
if ((map-type == _DRM_REGISTERS) || (map-type == _DRM_FRAME_BUFFER)) {
mutex_unlock(dev-struct_mutex);
return 0;
}
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[-mm patch] make drivers/char/drm/drm_vm.c:drm_io_prot() static
On Fri, Mar 02, 2007 at 03:00:26AM -0800, Andrew Morton wrote:
...
Changes since 2.6.20-mm2:
...
git-drm.patch
...
git trees
...
This patch makes the needlessly global drm_io_prot() static.
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
--- linux-2.6.21-rc2-mm1/drivers/char/drm/drm_vm.c.old 2007-03-04
20:39:25.0 +0100
+++ linux-2.6.21-rc2-mm1/drivers/char/drm/drm_vm.c 2007-03-04
20:39:34.0 +0100
@@ -41,7 +41,7 @@
static void drm_vm_open(struct vm_area_struct *vma);
static void drm_vm_close(struct vm_area_struct *vma);
-pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
+static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
{
pgprot_t tmp = vm_get_page_prot(vma-vm_flags);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[RFC: 2.6 patch] drivers/char/drm/drm_mm.c: remove unused exports
This patch removes two unused exports.
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
This patch was already sent on:
- 11 Jan 2007
- 21 Nov 2006
--- linux-2.6.19-rc5-mm2/drivers/char/drm/drm_mm.c.old 2006-11-21
20:08:02.0 +0100
+++ linux-2.6.19-rc5-mm2/drivers/char/drm/drm_mm.c 2006-11-21
20:09:19.0 +0100
@@ -177,8 +177,6 @@
return 0;
}
-EXPORT_SYMBOL(drm_mm_init);
-
void drm_mm_takedown(drm_mm_t * mm)
{
struct list_head *bnode = mm-root_node.fl_entry.next;
@@ -197,5 +195,3 @@
drm_free(entry, sizeof(*entry), DRM_MEM_MM);
}
-
-EXPORT_SYMBOL(drm_mm_takedown);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[RFC: 2.6 patch] drivers/char/drm/drm_mm.c: remove unused exports
This patch removes two unused exports.
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
This patch was already sent on:
- 21 Nov 2006
--- linux-2.6.19-rc5-mm2/drivers/char/drm/drm_mm.c.old 2006-11-21
20:08:02.0 +0100
+++ linux-2.6.19-rc5-mm2/drivers/char/drm/drm_mm.c 2006-11-21
20:09:19.0 +0100
@@ -177,8 +177,6 @@
return 0;
}
-EXPORT_SYMBOL(drm_mm_init);
-
void drm_mm_takedown(drm_mm_t * mm)
{
struct list_head *bnode = mm-root_node.fl_entry.next;
@@ -197,5 +195,3 @@
drm_free(entry, sizeof(*entry), DRM_MEM_MM);
}
-
-EXPORT_SYMBOL(drm_mm_takedown);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[RFC: 2.6 patch] drivers/char/drm/drm_mm.c: remove unused exports
This patch removes two unused exports.
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
--- linux-2.6.19-rc5-mm2/drivers/char/drm/drm_mm.c.old 2006-11-21
20:08:02.0 +0100
+++ linux-2.6.19-rc5-mm2/drivers/char/drm/drm_mm.c 2006-11-21
20:09:19.0 +0100
@@ -177,8 +177,6 @@
return 0;
}
-EXPORT_SYMBOL(drm_mm_init);
-
void drm_mm_takedown(drm_mm_t * mm)
{
struct list_head *bnode = mm-root_node.fl_entry.next;
@@ -197,5 +195,3 @@
drm_free(entry, sizeof(*entry), DRM_MEM_MM);
}
-
-EXPORT_SYMBOL(drm_mm_takedown);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[-mm patch] drivers/char/drm/: cleanups
On Sun, Aug 13, 2006 at 01:24:54AM -0700, Andrew Morton wrote:
...
Changes since 2.6.18-rc3-mm2:
...
git-drm.patch
...
git trees
...
This patch contains the following cleanups:
- make 3 needlessly global functions static
- sis_mm.c: fix compile warnings with CONFIG_FB_SIS=y
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
drivers/char/drm/drm_bufs.c |4 ++--
drivers/char/drm/drm_sman.c |2 +-
drivers/char/drm/sis_mm.c | 12 +++-
3 files changed, 10 insertions(+), 8 deletions(-)
--- linux-2.6.18-rc4-mm1/drivers/char/drm/drm_bufs.c.old2006-08-13
17:31:20.0 +0200
+++ linux-2.6.18-rc4-mm1/drivers/char/drm/drm_bufs.c2006-08-13
17:31:32.0 +0200
@@ -62,14 +62,14 @@
}
}
return NULL;
}
-int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash,
- unsigned long user_token, int hashed_handle)
+static int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash,
+ unsigned long user_token, int hashed_handle)
{
int use_hashed_handle;
#if (BITS_PER_LONG == 64)
use_hashed_handle = ((user_token 0xUL) ||
hashed_handle);
#elif (BITS_PER_LONG == 32)
use_hashed_handle = hashed_handle;
--- linux-2.6.18-rc4-mm1/drivers/char/drm/drm_sman.c.old2006-08-13
17:33:04.0 +0200
+++ linux-2.6.18-rc4-mm1/drivers/char/drm/drm_sman.c2006-08-13
17:33:12.0 +0200
@@ -111,13 +111,13 @@
{
drm_mm_t *mm = (drm_mm_t *) private;
drm_mm_takedown(mm);
drm_free(mm, sizeof(*mm), DRM_MEM_MM);
}
-unsigned long drm_sman_mm_offset(void *private, void *ref)
+static unsigned long drm_sman_mm_offset(void *private, void *ref)
{
drm_mm_node_t *node = (drm_mm_node_t *) ref;
return node-start;
}
int
--- linux-2.6.18-rc4-mm1/drivers/char/drm/sis_mm.c.old 2006-08-13
17:33:27.0 +0200
+++ linux-2.6.18-rc4-mm1/drivers/char/drm/sis_mm.c 2006-08-13
18:47:14.0 +0200
@@ -37,15 +37,12 @@
#include video/sisfb.h
#define VIDEO_TYPE 0
#define AGP_TYPE 1
-#define SIS_MM_ALIGN_SHIFT 4
-#define SIS_MM_ALIGN_MASK ( (1 SIS_MM_ALIGN_SHIFT) - 1)
-
#if defined(CONFIG_FB_SIS)
/* fb management via fb device */
#define SIS_MM_ALIGN_SHIFT 0
#define SIS_MM_ALIGN_MASK 0
@@ -69,18 +66,23 @@
static void sis_sman_mm_destroy(void *private)
{
;
}
-unsigned long sis_sman_mm_offset(void *private, void *ref)
+static unsigned long sis_sman_mm_offset(void *private, void *ref)
{
return ~((unsigned long)ref);
}
-#endif
+#else /* CONFIG_FB_SIS */
+
+#define SIS_MM_ALIGN_SHIFT 4
+#define SIS_MM_ALIGN_MASK ( (1 SIS_MM_ALIGN_SHIFT) - 1)
+
+#endif /* CONFIG_FB_SIS */
static int sis_fb_init(DRM_IOCTL_ARGS)
{
DRM_DEVICE;
drm_sis_private_t *dev_priv = dev-dev_private;
drm_sis_fb_t fb;
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[RFC: 2.6 patch] drivers/char/drm/: possible cleanups
This patch contains the following possible cleanups:
- make the following needlessly global function static:
- drm_bufs.c: drm_addbufs_fb()
- remove the following unused EXPORT_SYMBOL's:
- drm_agpsupport.c: drm_agp_bind_memory
- drm_bufs.c: drm_rmmap_locked
- drm_bufs.c: drm_rmmap
- drm_stub.c: drm_get_dev
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
drivers/char/drm/drmP.h |1 -
drivers/char/drm/drm_agpsupport.c |2 --
drivers/char/drm/drm_bufs.c |5 +
drivers/char/drm/drm_stub.c |2 --
4 files changed, 1 insertion(+), 9 deletions(-)
--- linux-2.6.17-rc1-mm3-full/drivers/char/drm/drm_agpsupport.c.old
2006-04-20 03:16:40.0 +0200
+++ linux-2.6.17-rc1-mm3-full/drivers/char/drm/drm_agpsupport.c 2006-04-20
03:16:48.0 +0200
@@ -503,8 +503,6 @@
return agp_bind_memory(handle, start);
}
-EXPORT_SYMBOL(drm_agp_bind_memory);
-
/** Calls agp_unbind_memory() */
int drm_agp_unbind_memory(DRM_AGP_MEM * handle)
{
--- linux-2.6.17-rc1-mm3-full/drivers/char/drm/drmP.h.old 2006-04-20
03:18:35.0 +0200
+++ linux-2.6.17-rc1-mm3-full/drivers/char/drm/drmP.h 2006-04-20
03:18:38.0 +0200
@@ -889,7 +889,6 @@
/* Buffer management support (drm_bufs.h) */
extern int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request);
extern int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request);
-extern int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request);
extern int drm_addmap(drm_device_t * dev, unsigned int offset,
unsigned int size, drm_map_type_t type,
drm_map_flags_t flags, drm_local_map_t ** map_ptr);
--- linux-2.6.17-rc1-mm3-full/drivers/char/drm/drm_bufs.c.old 2006-04-20
03:17:18.0 +0200
+++ linux-2.6.17-rc1-mm3-full/drivers/char/drm/drm_bufs.c 2006-04-20
03:18:19.0 +0200
@@ -386,7 +386,6 @@
return 0;
}
-EXPORT_SYMBOL(drm_rmmap_locked);
int drm_rmmap(drm_device_t *dev, drm_local_map_t *map)
{
@@ -398,7 +397,6 @@
return ret;
}
-EXPORT_SYMBOL(drm_rmmap);
/* The rmmap ioctl appears to be unnecessary. All mappings are torn down on
* the last close of the device, and this is necessary for cleanup when things
@@ -1053,7 +1051,7 @@
return 0;
}
-int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request)
+static int drm_addbufs_fb(drm_device_t * dev, drm_buf_desc_t * request)
{
drm_device_dma_t *dma = dev-dma;
drm_buf_entry_t *entry;
@@ -1212,7 +1210,6 @@
atomic_dec(dev-buf_alloc);
return 0;
}
-EXPORT_SYMBOL(drm_addbufs_fb);
/**
--- linux-2.6.17-rc1-mm3-full/drivers/char/drm/drm_stub.c.old 2006-04-20
03:19:16.0 +0200
+++ linux-2.6.17-rc1-mm3-full/drivers/char/drm/drm_stub.c 2006-04-20
03:19:25.0 +0200
@@ -229,8 +229,6 @@
return ret;
}
-EXPORT_SYMBOL(drm_get_dev);
-
/**
* Put a device minor number.
*
---
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[RFC: -mm patch] remove drm_{alloc,free}_pages
On Thu, Mar 23, 2006 at 01:40:46AM -0800, Andrew Morton wrote:
...
Changes since 2.6.16-rc6-mm2:
...
git-drm.patch
...
git trees.
...
drm_alloc_pages and drm_free_pages can now be removed.
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
drivers/char/drm/drmP.h |2
drivers/char/drm/drm_memory.c | 59 ---
drivers/char/drm/drm_memory_debug.h | 70
3 files changed, 131 deletions(-)
--- linux-2.6.16-mm1-full/drivers/char/drm/drmP.h.old 2006-03-23
23:05:06.0 +0100
+++ linux-2.6.16-mm1-full/drivers/char/drm/drmP.h 2006-03-23
23:05:37.0 +0100
@@ -813,8 +813,6 @@
extern int drm_mem_info(char *buf, char **start, off_t offset,
int request, int *eof, void *data);
extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);
-extern unsigned long drm_alloc_pages(int order, int area);
-extern void drm_free_pages(unsigned long address, int order, int area);
extern void *drm_ioremap(unsigned long offset, unsigned long size,
drm_device_t * dev);
extern void *drm_ioremap_nocache(unsigned long offset, unsigned long size,
--- linux-2.6.16-mm1-full/drivers/char/drm/drm_memory_debug.h.old
2006-03-23 23:05:19.0 +0100
+++ linux-2.6.16-mm1-full/drivers/char/drm/drm_memory_debug.h 2006-03-23
23:05:30.0 +0100
@@ -206,76 +206,6 @@
}
}
-unsigned long drm_alloc_pages (int order, int area) {
- unsigned long address;
- unsigned long bytes = PAGE_SIZE order;
- unsigned long addr;
- unsigned int sz;
-
- spin_lock(drm_mem_lock);
- if ((drm_ram_used PAGE_SHIFT)
-(DRM_RAM_PERCENT * drm_ram_available) / 100) {
- spin_unlock(drm_mem_lock);
- return 0;
- }
- spin_unlock(drm_mem_lock);
-
- address = __get_free_pages(GFP_KERNEL|__GFP_COMP, order);
- if (!address) {
- spin_lock(drm_mem_lock);
- ++drm_mem_stats[area].fail_count;
- spin_unlock(drm_mem_lock);
- return 0;
- }
- spin_lock(drm_mem_lock);
- ++drm_mem_stats[area].succeed_count;
- drm_mem_stats[area].bytes_allocated += bytes;
- drm_ram_used += bytes;
- spin_unlock(drm_mem_lock);
-
- /* Zero outside the lock */
- memset((void *)address, 0, bytes);
-
- /* Reserve */
- for (addr = address, sz = bytes;
-sz 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
- SetPageReserved(virt_to_page(addr));
- }
-
- return address;
-}
-
-void drm_free_pages (unsigned long address, int order, int area) {
- unsigned long bytes = PAGE_SIZE order;
- int alloc_count;
- int free_count;
- unsigned long addr;
- unsigned int sz;
-
- if (!address) {
- DRM_MEM_ERROR(area, Attempt to free address 0\n);
- } else {
- /* Unreserve */
- for (addr = address, sz = bytes;
-sz 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
- ClearPageReserved(virt_to_page(addr));
- }
- free_pages(address, order);
- }
-
- spin_lock(drm_mem_lock);
- free_count = ++drm_mem_stats[area].free_count;
- alloc_count = drm_mem_stats[area].succeed_count;
- drm_mem_stats[area].bytes_freed += bytes;
- drm_ram_used -= bytes;
- spin_unlock(drm_mem_lock);
- if (free_count alloc_count) {
- DRM_MEM_ERROR(area,
- Excess frees: %d frees, %d allocs\n,
- free_count, alloc_count);
- }
-}
-
void *drm_ioremap (unsigned long offset, unsigned long size,
drm_device_t * dev) {
void *pt;
--- linux-2.6.16-mm1-full/drivers/char/drm/drm_memory.c.old 2006-03-23
23:05:54.0 +0100
+++ linux-2.6.16-mm1-full/drivers/char/drm/drm_memory.c 2006-03-23
23:06:11.0 +0100
@@ -79,65 +79,6 @@
return pt;
}
-/**
- * Allocate pages.
- *
- * \param order size order.
- * \param area memory area. (Not used.)
- * \return page address on success, or zero on failure.
- *
- * Allocate and reserve free pages.
- */
-unsigned long drm_alloc_pages(int order, int area)
-{
- unsigned long address;
- unsigned long bytes = PAGE_SIZE order;
- unsigned long addr;
- unsigned int sz;
-
- address = __get_free_pages(GFP_KERNEL|__GFP_COMP, order);
- if (!address)
- return 0;
-
- /* Zero */
- memset((void *)address, 0, bytes);
-
- /* Reserve */
- for (addr = address, sz = bytes;
-sz 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
- SetPageReserved(virt_to_page(addr));
- }
-
- return address;
-}
-
-/**
- * Free pages.
- *
- * \param address address of the pages to free.
- * \param order size order.
- * \param area memory
[-mm patch] drivers/video/intelfb/intelfbhw.c: make struct plls static
On Thu, Mar 23, 2006 at 01:40:46AM -0800, Andrew Morton wrote:
...
Changes since 2.6.16-rc6-mm2:
...
git-intelfb.patch
...
git trees.
...
This patch makes a needlessly global struct static.
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
--- linux-2.6.16-mm1-full/drivers/video/intelfb/intelfbhw.c.old 2006-03-23
23:12:20.0 +0100
+++ linux-2.6.16-mm1-full/drivers/video/intelfb/intelfbhw.c 2006-03-23
23:12:30.0 +0100
@@ -56,7 +56,7 @@
#define PLLS_I9xx 1
#define PLLS_MAX 2
-struct pll_min_max plls[PLLS_MAX] = {
+static struct pll_min_max plls[PLLS_MAX] = {
{ 108, 140, 18, 26, 6, 16, 3, 16, 4, 128, 0, 31, 93, 140,
165000, 4, 22 }, //I8xx
{ 75, 120, 10, 20, 5, 9, 4, 7, 5, 80, 1, 8, 93, 280, 20,
10, 5 } //I9xx
};
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnkkid=110944bid=241720dat=121642
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: 2.6.16-rc3: more regressions
On Mon, Feb 13, 2006 at 10:16:59AM -0800, Linus Torvalds wrote: On Mon, 13 Feb 2006, Linus Torvalds wrote: DaveA, I'll apply this for now. Comments? Btw, the fact that Mauro has the same exact PCI ID (well, lspci stupidly suppresses the ID entirely, but the string seems to match the one that Dave Jones reports) may be unrelated. Dave's patch removes the entry for the card with the 0x5b60. According to his bug report, Mauro has a Radeon X300SE that should have the 0x5b70 according to pci.ids from pciutils and that doesn't seem to be claimed by the DRM driver (and the dmesg from the bug report confirms that the radeon DRM driver didn't claim to be responsible for this card). DaveJ (or Mauro): since you can test this, can you test having that ID there but _without_ the other changes to drm in -rc1? Ie was it the addition of that particular ID, or are the other radeon driver changes (which haven't had as much testing) perhaps the culprit? I realize that without the ID, that card would never have been tested anyway, but the point being that plain 2.6.15 with _just_ that ID added has at least gotten more testing on other (similar) chips. So before I revert that particular ID, it would be nice to know that it was broken even with the previous radeon driver state. The ID removed by Dave's patch is the only ID listed for an RV370 chips (the other RV370's aren't listed in the radeon DRM driver). I suspect Dave and Mauro having unrelated problems. Linus cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: 2.6.16-rc3: more regressions
On Mon, Feb 13, 2006 at 01:42:09PM -0500, Dave Jones wrote: On Mon, Feb 13, 2006 at 07:34:45PM +0100, Adrian Bunk wrote: On Mon, Feb 13, 2006 at 10:16:59AM -0800, Linus Torvalds wrote: On Mon, 13 Feb 2006, Linus Torvalds wrote: DaveA, I'll apply this for now. Comments? Btw, the fact that Mauro has the same exact PCI ID (well, lspci stupidly suppresses the ID entirely, but the string seems to match the one that Dave Jones reports) may be unrelated. Dave's patch removes the entry for the card with the 0x5b60. According to his bug report, Mauro has a Radeon X300SE that should have the 0x5b70 according to pci.ids from pciutils and that doesn't seem to be claimed by the DRM driver (and the dmesg from the bug report confirms that the radeon DRM driver didn't claim to be responsible for this card). The X300SE (mine at least) is a dual head card, with a 0x5b60 _and_ a 0x5b70 OK, this might explain it. Then your patch could indeed fix Mauro's problem. Dave cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: 2.6.16-rc3: more regressions
On Mon, Feb 13, 2006 at 10:50:52AM -0800, Linus Torvalds wrote: ... I just worry whether (a) the other added PCI ID's are any good for that core and (b) whether the bug was really introduced with some of the other changes. I admit that (b) is pretty unlikely, but it would be good to test. ... The one thing I have not yet been proven wrong for is that this PCI id is the only one we have in this driver for an RV370. Perhaps someone will be able to prove this wrong, too, ;-) but otherwise it would be a good explanation why exactly this one is causing problems. Linus cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnkkid=103432bid=230486dat=121642 -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] drivers/char/drm/: make some functions static
This patch makes some needlessly global functions static.
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
This patch was already sent on:
- 19 Jan 2006
drivers/char/drm/i810_dma.c|2 +-
drivers/char/drm/i810_drv.h|2 --
drivers/char/drm/i830_dma.c|2 +-
drivers/char/drm/i830_drv.h|3 ---
drivers/char/drm/savage_bci.c |4 +++-
drivers/char/drm/savage_drv.h |1 -
drivers/char/drm/via_dma.c | 10 +-
drivers/char/drm/via_dmablit.c |2 +-
drivers/char/drm/via_drv.h |7 ---
drivers/char/drm/via_irq.c |2 +-
10 files changed, 12 insertions(+), 23 deletions(-)
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/i810_drv.h.old 2006-01-19
00:15:28.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/i810_drv.h 2006-01-19
00:15:36.0 +0100
@@ -113,8 +113,6 @@
} drm_i810_private_t;
/* i810_dma.c */
-extern void i810_reclaim_buffers(drm_device_t * dev, struct file *filp);
-
extern int i810_driver_dma_quiescent(drm_device_t * dev);
extern void i810_driver_reclaim_buffers_locked(drm_device_t * dev,
struct file *filp);
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/i810_dma.c.old 2006-01-19
00:15:44.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/i810_dma.c 2006-01-19
00:15:49.0 +0100
@@ -958,7 +958,7 @@
}
/* Must be called with the lock held */
-void i810_reclaim_buffers(drm_device_t * dev, struct file *filp)
+static void i810_reclaim_buffers(drm_device_t * dev, struct file *filp)
{
drm_device_dma_t *dma = dev-dma;
int i;
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/i830_drv.h.old 2006-01-19
00:17:38.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/i830_drv.h 2006-01-19
00:17:47.0 +0100
@@ -123,9 +123,6 @@
extern drm_ioctl_desc_t i830_ioctls[];
extern int i830_max_ioctl;
-/* i830_dma.c */
-extern void i830_reclaim_buffers(drm_device_t * dev, struct file *filp);
-
/* i830_irq.c */
extern int i830_irq_emit(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/i830_dma.c.old 2006-01-19
00:18:33.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/i830_dma.c 2006-01-19
00:18:41.0 +0100
@@ -1239,7 +1239,7 @@
}
/* Must be called with the lock held */
-void i830_reclaim_buffers(drm_device_t * dev, struct file *filp)
+static void i830_reclaim_buffers(drm_device_t * dev, struct file *filp)
{
drm_device_dma_t *dma = dev-dma;
int i;
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/savage_drv.h.old 2006-01-19
00:19:48.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/savage_drv.h 2006-01-19
00:19:55.0 +0100
@@ -212,7 +212,6 @@
extern int savage_driver_firstopen(drm_device_t *dev);
extern void savage_driver_lastclose(drm_device_t *dev);
extern int savage_driver_unload(drm_device_t *dev);
-extern int savage_do_cleanup_bci(drm_device_t * dev);
extern void savage_reclaim_buffers(drm_device_t * dev, DRMFILE filp);
/* state functions */
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/savage_bci.c.old 2006-01-19
00:20:02.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/savage_bci.c 2006-01-19
00:20:24.0 +0100
@@ -32,6 +32,8 @@
#define SAVAGE_EVENT_USEC_TIMEOUT 500 /* 5s */
#define SAVAGE_FREELIST_DEBUG 0
+static int savage_do_cleanup_bci(drm_device_t * dev);
+
static int
savage_bci_wait_fifo_shadow(drm_savage_private_t * dev_priv, unsigned int n)
{
@@ -895,7 +897,7 @@
return 0;
}
-int savage_do_cleanup_bci(drm_device_t * dev)
+static int savage_do_cleanup_bci(drm_device_t * dev)
{
drm_savage_private_t *dev_priv = dev-dev_private;
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/via_drv.h.old2006-01-19
00:21:25.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/via_drv.h2006-01-19
01:07:36.0 +0100
@@ -110,11 +110,6 @@
extern int via_agp_init(DRM_IOCTL_ARGS);
extern int via_map_init(DRM_IOCTL_ARGS);
extern int via_decoder_futex(DRM_IOCTL_ARGS);
-extern int via_dma_init(DRM_IOCTL_ARGS);
-extern int via_cmdbuffer(DRM_IOCTL_ARGS);
-extern int via_flush_ioctl(DRM_IOCTL_ARGS);
-extern int via_pci_cmdbuffer(DRM_IOCTL_ARGS);
-extern int via_cmdbuf_size(DRM_IOCTL_ARGS);
extern int via_wait_irq(DRM_IOCTL_ARGS);
extern int via_dma_blit_sync( DRM_IOCTL_ARGS );
extern int via_dma_blit( DRM_IOCTL_ARGS );
@@ -139,8 +134,6 @@
extern void via_init_futex(drm_via_private_t * dev_priv);
extern void via_cleanup_futex(drm_via_private_t * dev_priv);
extern void via_release_futex(drm_via_private_t * dev_priv, int context);
-extern int via_driver_irq_wait(drm_device_t * dev, unsigned int irq,
- int force_sequence, unsigned int *sequence);
extern void
[2.6 patch] drivers/char/drm/: make some functions static
This patch makes some needlessly global functions static.
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
drivers/char/drm/i810_dma.c|2 +-
drivers/char/drm/i810_drv.h|2 --
drivers/char/drm/i830_dma.c|2 +-
drivers/char/drm/i830_drv.h|3 ---
drivers/char/drm/savage_bci.c |4 +++-
drivers/char/drm/savage_drv.h |1 -
drivers/char/drm/via_dma.c | 10 +-
drivers/char/drm/via_dmablit.c |2 +-
drivers/char/drm/via_drv.h |7 ---
drivers/char/drm/via_irq.c |2 +-
10 files changed, 12 insertions(+), 23 deletions(-)
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/i810_drv.h.old 2006-01-19
00:15:28.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/i810_drv.h 2006-01-19
00:15:36.0 +0100
@@ -113,8 +113,6 @@
} drm_i810_private_t;
/* i810_dma.c */
-extern void i810_reclaim_buffers(drm_device_t * dev, struct file *filp);
-
extern int i810_driver_dma_quiescent(drm_device_t * dev);
extern void i810_driver_reclaim_buffers_locked(drm_device_t * dev,
struct file *filp);
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/i810_dma.c.old 2006-01-19
00:15:44.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/i810_dma.c 2006-01-19
00:15:49.0 +0100
@@ -958,7 +958,7 @@
}
/* Must be called with the lock held */
-void i810_reclaim_buffers(drm_device_t * dev, struct file *filp)
+static void i810_reclaim_buffers(drm_device_t * dev, struct file *filp)
{
drm_device_dma_t *dma = dev-dma;
int i;
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/i830_drv.h.old 2006-01-19
00:17:38.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/i830_drv.h 2006-01-19
00:17:47.0 +0100
@@ -123,9 +123,6 @@
extern drm_ioctl_desc_t i830_ioctls[];
extern int i830_max_ioctl;
-/* i830_dma.c */
-extern void i830_reclaim_buffers(drm_device_t * dev, struct file *filp);
-
/* i830_irq.c */
extern int i830_irq_emit(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg);
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/i830_dma.c.old 2006-01-19
00:18:33.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/i830_dma.c 2006-01-19
00:18:41.0 +0100
@@ -1239,7 +1239,7 @@
}
/* Must be called with the lock held */
-void i830_reclaim_buffers(drm_device_t * dev, struct file *filp)
+static void i830_reclaim_buffers(drm_device_t * dev, struct file *filp)
{
drm_device_dma_t *dma = dev-dma;
int i;
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/savage_drv.h.old 2006-01-19
00:19:48.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/savage_drv.h 2006-01-19
00:19:55.0 +0100
@@ -212,7 +212,6 @@
extern int savage_driver_firstopen(drm_device_t *dev);
extern void savage_driver_lastclose(drm_device_t *dev);
extern int savage_driver_unload(drm_device_t *dev);
-extern int savage_do_cleanup_bci(drm_device_t * dev);
extern void savage_reclaim_buffers(drm_device_t * dev, DRMFILE filp);
/* state functions */
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/savage_bci.c.old 2006-01-19
00:20:02.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/savage_bci.c 2006-01-19
00:20:24.0 +0100
@@ -32,6 +32,8 @@
#define SAVAGE_EVENT_USEC_TIMEOUT 500 /* 5s */
#define SAVAGE_FREELIST_DEBUG 0
+static int savage_do_cleanup_bci(drm_device_t * dev);
+
static int
savage_bci_wait_fifo_shadow(drm_savage_private_t * dev_priv, unsigned int n)
{
@@ -895,7 +897,7 @@
return 0;
}
-int savage_do_cleanup_bci(drm_device_t * dev)
+static int savage_do_cleanup_bci(drm_device_t * dev)
{
drm_savage_private_t *dev_priv = dev-dev_private;
--- linux-2.6.16-rc1-mm1-full/drivers/char/drm/via_drv.h.old2006-01-19
00:21:25.0 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/char/drm/via_drv.h2006-01-19
01:07:36.0 +0100
@@ -110,11 +110,6 @@
extern int via_agp_init(DRM_IOCTL_ARGS);
extern int via_map_init(DRM_IOCTL_ARGS);
extern int via_decoder_futex(DRM_IOCTL_ARGS);
-extern int via_dma_init(DRM_IOCTL_ARGS);
-extern int via_cmdbuffer(DRM_IOCTL_ARGS);
-extern int via_flush_ioctl(DRM_IOCTL_ARGS);
-extern int via_pci_cmdbuffer(DRM_IOCTL_ARGS);
-extern int via_cmdbuf_size(DRM_IOCTL_ARGS);
extern int via_wait_irq(DRM_IOCTL_ARGS);
extern int via_dma_blit_sync( DRM_IOCTL_ARGS );
extern int via_dma_blit( DRM_IOCTL_ARGS );
@@ -139,8 +134,6 @@
extern void via_init_futex(drm_via_private_t * dev_priv);
extern void via_cleanup_futex(drm_via_private_t * dev_priv);
extern void via_release_futex(drm_via_private_t * dev_priv, int context);
-extern int via_driver_irq_wait(drm_device_t * dev, unsigned int irq,
- int force_sequence, unsigned int *sequence);
extern void via_dmablit_handler(drm_device_t *dev, int engine, int
[2.6 patch] drivers/char/drm/: small cleanups
This patch contains the following small cleanups:
- make two needlessly global functions static
- drm_sysfs.c: every file should #include the header with the prototypes
of the global functions it is offering
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
This patch was already sent on:
- 24 Aug 2005
drivers/char/drm/drm_bufs.c|2 +-
drivers/char/drm/drm_context.c |2 +-
drivers/char/drm/drm_sysfs.c |1 +
3 files changed, 3 insertions(+), 2 deletions(-)
--- linux-2.6.13-rc6-mm2-full/drivers/char/drm/drm_bufs.c.old 2005-08-24
16:55:50.0 +0200
+++ linux-2.6.13-rc6-mm2-full/drivers/char/drm/drm_bufs.c 2005-08-24
16:56:06.0 +0200
@@ -1041,7 +1041,7 @@
return 0;
}
-int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request)
+static int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request)
{
drm_device_dma_t *dma = dev-dma;
drm_buf_entry_t *entry;
--- linux-2.6.13-rc6-mm2-full/drivers/char/drm/drm_context.c.old
2005-08-24 16:56:29.0 +0200
+++ linux-2.6.13-rc6-mm2-full/drivers/char/drm/drm_context.c2005-08-24
16:56:42.0 +0200
@@ -308,7 +308,7 @@
*
* Attempt to set drm_device::context_flag.
*/
-int drm_context_switch( drm_device_t *dev, int old, int new )
+static int drm_context_switch( drm_device_t *dev, int old, int new )
{
if ( test_and_set_bit( 0, dev-context_flag ) ) {
DRM_ERROR( Reentering -- FIXME\n );
--- linux-2.6.13-rc6-mm2-full/drivers/char/drm/drm_sysfs.c.old 2005-08-24
16:57:02.0 +0200
+++ linux-2.6.13-rc6-mm2-full/drivers/char/drm/drm_sysfs.c 2005-08-24
16:57:20.0 +0200
@@ -17,6 +17,7 @@
#include linux/err.h
#include drm_core.h
+#include drmP.h
struct drm_sysfs_class {
struct class_device_attribute attr;
---
SF.Net email is Sponsored by the Better Software Conference EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile Plan-Driven Development * Managing Projects Teams * Testing QA
Security * Process Improvement Measurement * http://www.sqe.com/bsce5sf
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] drivers/char/drm/: small cleanups
This patch contains the following small cleanups:
- make two needlessly global functions static
- drm_sysfs.c: every file should #include the header with the prototypes
of the global functions it is offering
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
drivers/char/drm/drm_bufs.c|2 +-
drivers/char/drm/drm_context.c |2 +-
drivers/char/drm/drm_sysfs.c |1 +
3 files changed, 3 insertions(+), 2 deletions(-)
--- linux-2.6.13-rc6-mm2-full/drivers/char/drm/drm_bufs.c.old 2005-08-24
16:55:50.0 +0200
+++ linux-2.6.13-rc6-mm2-full/drivers/char/drm/drm_bufs.c 2005-08-24
16:56:06.0 +0200
@@ -1041,7 +1041,7 @@
return 0;
}
-int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request)
+static int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request)
{
drm_device_dma_t *dma = dev-dma;
drm_buf_entry_t *entry;
--- linux-2.6.13-rc6-mm2-full/drivers/char/drm/drm_context.c.old
2005-08-24 16:56:29.0 +0200
+++ linux-2.6.13-rc6-mm2-full/drivers/char/drm/drm_context.c2005-08-24
16:56:42.0 +0200
@@ -308,7 +308,7 @@
*
* Attempt to set drm_device::context_flag.
*/
-int drm_context_switch( drm_device_t *dev, int old, int new )
+static int drm_context_switch( drm_device_t *dev, int old, int new )
{
if ( test_and_set_bit( 0, dev-context_flag ) ) {
DRM_ERROR( Reentering -- FIXME\n );
--- linux-2.6.13-rc6-mm2-full/drivers/char/drm/drm_sysfs.c.old 2005-08-24
16:57:02.0 +0200
+++ linux-2.6.13-rc6-mm2-full/drivers/char/drm/drm_sysfs.c 2005-08-24
16:57:20.0 +0200
@@ -17,6 +17,7 @@
#include linux/err.h
#include drm_core.h
+#include drmP.h
struct drm_sysfs_class {
struct class_device_attribute attr;
---
SF.Net email is Sponsored by the Better Software Conference EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile Plan-Driven Development * Managing Projects Teams * Testing QA
Security * Process Improvement Measurement * http://www.sqe.com/bsce5sf
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] drivers/char/drm/drm_pci.c: fix warnings
This patch fixes the following warnings:
-- snip --
...
CC drivers/char/drm/drm_pci.o
drivers/char/drm/drm_pci.c:53:5: warning: DRM_DEBUG_MEMORY is not defined
drivers/char/drm/drm_pci.c:84:5: warning: DRM_DEBUG_MEMORY is not defined
drivers/char/drm/drm_pci.c:119:5: warning: DRM_DEBUG_MEMORY is not defined
drivers/char/drm/drm_pci.c:126:5: warning: DRM_DEBUG_MEMORY is not defined
drivers/char/drm/drm_pci.c:134:5: warning: DRM_DEBUG_MEMORY is not defined
...
-- snip --
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
This patch was already sent on:
- 22 Jul 2005
drivers/char/drm/drm_pci.c | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
--- linux-2.6.13-rc3-mm1-full/drivers/char/drm/drm_pci.c.old2005-07-22
18:16:02.0 +0200
+++ linux-2.6.13-rc3-mm1-full/drivers/char/drm/drm_pci.c2005-07-22
18:16:24.0 +0200
@@ -50,7 +50,7 @@
dma_addr_t maxaddr)
{
drm_dma_handle_t *dmah;
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
int area = DRM_MEM_DMA;
spin_lock(drm_mem_lock);
@@ -81,7 +81,7 @@
dmah-size = size;
dmah-vaddr = pci_alloc_consistent(dev-pdev, size, dmah-busaddr);
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
if (dmah-vaddr == NULL) {
spin_lock(drm_mem_lock);
++drm_mem_stats[area].fail_count;
@@ -116,14 +116,14 @@
void
__drm_pci_free(drm_device_t * dev, drm_dma_handle_t *dmah)
{
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
int area = DRM_MEM_DMA;
int alloc_count;
int free_count;
#endif
if (!dmah-vaddr) {
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
DRM_MEM_ERROR(area, Attempt to free address 0\n);
#endif
} else {
@@ -131,7 +131,7 @@
dmah-busaddr);
}
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
spin_lock(drm_mem_lock);
free_count = ++drm_mem_stats[area].free_count;
alloc_count = drm_mem_stats[area].succeed_count;
---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] drivers/char/drm/drm_pci.c: fix -Wundef warnings
This patch fixes the following warnings with -Wundef:
-- snip --
...
CC drivers/char/drm/drm_pci.o
drivers/char/drm/drm_pci.c:53:5: warning: DRM_DEBUG_MEMORY is not defined
drivers/char/drm/drm_pci.c:84:5: warning: DRM_DEBUG_MEMORY is not defined
drivers/char/drm/drm_pci.c:119:5: warning: DRM_DEBUG_MEMORY is not defined
drivers/char/drm/drm_pci.c:126:5: warning: DRM_DEBUG_MEMORY is not defined
drivers/char/drm/drm_pci.c:134:5: warning: DRM_DEBUG_MEMORY is not defined
...
-- snip --
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
---
drivers/char/drm/drm_pci.c | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
--- linux-2.6.13-rc3-mm1-full/drivers/char/drm/drm_pci.c.old2005-07-22
18:16:02.0 +0200
+++ linux-2.6.13-rc3-mm1-full/drivers/char/drm/drm_pci.c2005-07-22
18:16:24.0 +0200
@@ -50,7 +50,7 @@
dma_addr_t maxaddr)
{
drm_dma_handle_t *dmah;
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
int area = DRM_MEM_DMA;
spin_lock(drm_mem_lock);
@@ -81,7 +81,7 @@
dmah-size = size;
dmah-vaddr = pci_alloc_consistent(dev-pdev, size, dmah-busaddr);
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
if (dmah-vaddr == NULL) {
spin_lock(drm_mem_lock);
++drm_mem_stats[area].fail_count;
@@ -116,14 +116,14 @@
void
__drm_pci_free(drm_device_t * dev, drm_dma_handle_t *dmah)
{
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
int area = DRM_MEM_DMA;
int alloc_count;
int free_count;
#endif
if (!dmah-vaddr) {
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
DRM_MEM_ERROR(area, Attempt to free address 0\n);
#endif
} else {
@@ -131,7 +131,7 @@
dmah-busaddr);
}
-#if DRM_DEBUG_MEMORY
+#ifdef DRM_DEBUG_MEMORY
spin_lock(drm_mem_lock);
free_count = ++drm_mem_stats[area].free_count;
alloc_count = drm_mem_stats[area].succeed_count;
---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] DRM: misc cleanup
I've seen that part of this is already in recent kernels. Below is as a FYI a version against 2.6.13-rc1-mm1. -- snip -- 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] --- drivers/char/drm/ati_pcigart.c |2 drivers/char/drm/drmP.h| 22 --- drivers/char/drm/drm_auth.c|4 - drivers/char/drm/drm_bufs.c| 12 ++-- drivers/char/drm/drm_context.c |6 +- drivers/char/drm/drm_drv.c |9 ++- drivers/char/drm/drm_fops.c| 10 +-- drivers/char/drm/drm_irq.c |2 drivers/char/drm/drm_lock.c| 12 +++- drivers/char/drm/drm_proc.c|2 drivers/char/drm/drm_stub.c| 92 - drivers/char/drm/drm_vm.c | 10 ++- drivers/char/drm/i810_dma.c| 24 drivers/char/drm/i810_drv.h|1 drivers/char/drm/i830_dma.c| 20 +++ drivers/char/drm/i830_drv.c|2 drivers/char/drm/i830_drv.h|2 drivers/char/drm/i830_irq.c|4 - drivers/char/drm/i915_dma.c| 60 - drivers/char/drm/i915_drv.c|2 drivers/char/drm/i915_drv.h| 10 --- drivers/char/drm/i915_irq.c|4 - drivers/char/drm/r128_state.c |2 drivers/char/drm/via_ds.c |1 24 files changed, 137 insertions(+), 178 deletions(-) --- linux-2.6.12-rc2-mm3-full/drivers/char/drm/drmP.h.old 2005-04-18 03:54:16.0 +0200 +++ linux-2.6.12-rc2-mm3-full/drivers/char/drm/drmP.h 2005-04-18 03:54:49.0 +0200 @@ -774,8 +774,6 @@ /* Driver support (drm_drv.h) */ extern int drm_init(struct drm_driver *driver); extern void drm_exit(struct drm_driver *driver); -extern int drm_version(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); extern int drm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); extern long drm_compat_ioctl(struct file *filp, @@ -785,21 +783,13 @@ /* Device support (drm_fops.h) */ extern int drm_open(struct inode *inode, struct file *filp); extern int drm_stub_open(struct inode *inode, struct file *filp); -extern int drm_open_helper(struct inode *inode, struct file *filp, - drm_device_t *dev); extern int drm_flush(struct file *filp); extern int drm_fasync(int fd, struct file *filp, int on); extern int drm_release(struct inode *inode, struct file *filp); /* Mapping support (drm_vm.h) */ -extern void drm_vm_open(struct vm_area_struct *vma); -extern void drm_vm_close(struct vm_area_struct *vma); -extern void drm_vm_shm_close(struct vm_area_struct *vma); -extern int drm_mmap_dma(struct file *filp, - struct vm_area_struct *vma); extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); -extern ssize_t drm_read(struct file *filp, char __user *buf, size_t count, loff_t *off); /* Memory management support (drm_memory.h) */ #include drm_memory.h @@ -854,9 +844,6 @@ extern int drm_rmctx( struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg ); -extern int drm_context_switch(drm_device_t *dev, int old, int new); -extern int drm_context_switch_complete(drm_device_t *dev, int new); - extern int drm_ctxbitmap_init( drm_device_t *dev ); extern void drm_ctxbitmap_cleanup( drm_device_t *dev ); extern void drm_ctxbitmap_free( drm_device_t *dev, int ctx_handle ); @@ -874,9 +861,6 @@ /* Authentication IOCTL support (drm_auth.h) */ -extern int drm_add_magic(drm_device_t *dev, drm_file_t *priv, - drm_magic_t magic); -extern int drm_remove_magic(drm_device_t *dev, drm_magic_t magic); extern int drm_getmagic(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); extern int drm_authmagic(struct inode *inode, struct file *filp, @@ -893,13 +877,9 @@ unsigned int cmd, unsigned long arg); extern int drm_lock_take(__volatile__ unsigned int *lock, unsigned int context); -extern int drm_lock_transfer(drm_device_t *dev, - __volatile__ unsigned int *lock
[2.6 patch] DRM: misc cleanup
On Tue, Feb 01, 2005 at 09:16:16PM +1100, Dave Airlie wrote: I'll nack this patch for now Adrian, but I'm going to bring all these changes into the DRM tree as soon as I can.. one of the functions you removed pointed out a bug in the i810/i830/i915 drivers (granted no-one uses pageflip in those drivers but still should fix it..), I'm going to put the through drm CVS first... I've seen that part of this is already in recent kernels. Below is as a FYI a version against 2.6.12-rc5-mm1. Thanks, Dave. cu Adrian -- snip -- 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 - via_ds.c: via_mmDumpMemInfo - via_ds.c: via_mmAddRange - via_ds.c: via_mmReserveMem - via_ds.c: via_mmFreeReserved - via_ds.c: via_mmDestroy - remove the followig unused global variable: - via_mm.c: VIA_DEBUG Signed-off-by: Adrian Bunk [EMAIL PROTECTED] --- drivers/char/drm/ati_pcigart.c |2 drivers/char/drm/drmP.h| 22 -- drivers/char/drm/drm_auth.c|4 - drivers/char/drm/drm_bufs.c| 12 +-- drivers/char/drm/drm_context.c |6 - drivers/char/drm/drm_drv.c |9 +- drivers/char/drm/drm_fops.c| 10 --- drivers/char/drm/drm_irq.c |2 drivers/char/drm/drm_lock.c| 12 ++- drivers/char/drm/drm_proc.c|2 drivers/char/drm/drm_stub.c| 92 ++-- drivers/char/drm/drm_vm.c | 10 +-- drivers/char/drm/i810_dma.c| 24 +++ drivers/char/drm/i810_drv.h|1 drivers/char/drm/i830_dma.c| 20 +++--- drivers/char/drm/i830_drv.c|2 drivers/char/drm/i830_drv.h|2 drivers/char/drm/i830_irq.c|4 - drivers/char/drm/i915_dma.c| 60 +++--- drivers/char/drm/i915_drv.c|2 drivers/char/drm/i915_drv.h| 10 --- drivers/char/drm/i915_irq.c|4 - drivers/char/drm/r128_state.c |2 drivers/char/drm/via_dma.c |4 - drivers/char/drm/via_drv.h |2 drivers/char/drm/via_ds.c | 108 - drivers/char/drm/via_ds.h |8 -- drivers/char/drm/via_map.c |2 drivers/char/drm/via_mm.c | 14 ++-- drivers/char/drm/via_mm.h |5 - 30 files changed, 149 insertions(+), 308 deletions(-) --- linux-2.6.12-rc2-mm3-full/drivers/char/drm/drmP.h.old 2005-04-18 03:54:16.0 +0200 +++ linux-2.6.12-rc2-mm3-full/drivers/char/drm/drmP.h 2005-04-18 03:54:49.0 +0200 @@ -774,8 +774,6 @@ /* Driver support (drm_drv.h) */ extern int drm_init(struct drm_driver *driver); extern void drm_exit(struct drm_driver *driver); -extern int drm_version(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); extern int drm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); extern long drm_compat_ioctl(struct file *filp, @@ -785,21 +783,13 @@ /* Device support (drm_fops.h) */ extern int drm_open(struct inode *inode, struct file *filp); extern int drm_stub_open(struct inode *inode, struct file *filp); -extern int drm_open_helper(struct inode *inode, struct file *filp, - drm_device_t *dev); extern int drm_flush(struct file *filp); extern int drm_fasync(int fd, struct file *filp, int on); extern int drm_release(struct inode *inode, struct file *filp); /* Mapping support (drm_vm.h) */ -extern void drm_vm_open(struct vm_area_struct *vma); -extern void drm_vm_close(struct vm_area_struct *vma); -extern void drm_vm_shm_close(struct vm_area_struct *vma); -extern int drm_mmap_dma(struct file *filp, - struct vm_area_struct *vma); extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); -extern ssize_t drm_read(struct file *filp, char __user *buf, size_t count, loff_t *off); /* Memory management support (drm_memory.h) */ #include drm_memory.h @@ -854,9 +844,6 @@ extern int drm_rmctx( struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg ); -extern int drm_context_switch(drm_device_t *dev, int old, int new); -extern int drm_context_switch_complete(drm_device_t *dev, int new); - extern int drm_ctxbitmap_init( drm_device_t *dev ); extern void drm_ctxbitmap_cleanup( drm_device_t *dev ); extern void drm_ctxbitmap_free( drm_device_t *dev, int ctx_handle ); @@ -874,9 +861,6
[2.6 patch] DRM: misc cleanup
On Tue, Feb 01, 2005 at 09:16:16PM +1100, Dave Airlie wrote: I'll nack this patch for now Adrian, but I'm going to bring all these changes into the DRM tree as soon as I can.. one of the functions you removed pointed out a bug in the i810/i830/i915 drivers (granted no-one uses pageflip in those drivers but still should fix it..), I'm going to put the through drm CVS first... I've seen that part of this is already in recent kernels. Below is as a FYI a version against 2.6.12-rc2-mm3. Thanks, Dave. cu Adrian -- snip -- 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 - via_ds.c: via_mmDumpMemInfo - via_ds.c: via_mmAddRange - via_ds.c: via_mmReserveMem - via_ds.c: via_mmFreeReserved - via_ds.c: via_mmDestroy - remove the followig unused global variable: - via_mm.c: VIA_DEBUG Signed-off-by: Adrian Bunk [EMAIL PROTECTED] --- drivers/char/drm/ati_pcigart.c |2 drivers/char/drm/drmP.h| 22 -- drivers/char/drm/drm_auth.c|4 - drivers/char/drm/drm_bufs.c| 12 +-- drivers/char/drm/drm_context.c |6 - drivers/char/drm/drm_drv.c |9 +- drivers/char/drm/drm_fops.c| 10 --- drivers/char/drm/drm_irq.c |2 drivers/char/drm/drm_lock.c| 12 ++- drivers/char/drm/drm_proc.c|2 drivers/char/drm/drm_stub.c| 92 ++-- drivers/char/drm/drm_vm.c | 10 +-- drivers/char/drm/i810_dma.c| 24 +++ drivers/char/drm/i810_drv.h|1 drivers/char/drm/i830_dma.c| 20 +++--- drivers/char/drm/i830_drv.c|2 drivers/char/drm/i830_drv.h|2 drivers/char/drm/i830_irq.c|4 - drivers/char/drm/i915_dma.c| 60 +++--- drivers/char/drm/i915_drv.c|2 drivers/char/drm/i915_drv.h| 10 --- drivers/char/drm/i915_irq.c|4 - drivers/char/drm/r128_state.c |2 drivers/char/drm/via_dma.c |4 - drivers/char/drm/via_drv.h |2 drivers/char/drm/via_ds.c | 108 - drivers/char/drm/via_ds.h |8 -- drivers/char/drm/via_map.c |2 drivers/char/drm/via_mm.c | 14 ++-- drivers/char/drm/via_mm.h |5 - 30 files changed, 149 insertions(+), 308 deletions(-) --- linux-2.6.12-rc2-mm3-full/drivers/char/drm/drmP.h.old 2005-04-18 03:54:16.0 +0200 +++ linux-2.6.12-rc2-mm3-full/drivers/char/drm/drmP.h 2005-04-18 03:54:49.0 +0200 @@ -774,8 +774,6 @@ /* Driver support (drm_drv.h) */ extern int drm_init(struct drm_driver *driver); extern void drm_exit(struct drm_driver *driver); -extern int drm_version(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg); extern int drm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); extern long drm_compat_ioctl(struct file *filp, @@ -785,21 +783,13 @@ /* Device support (drm_fops.h) */ extern int drm_open(struct inode *inode, struct file *filp); extern int drm_stub_open(struct inode *inode, struct file *filp); -extern int drm_open_helper(struct inode *inode, struct file *filp, - drm_device_t *dev); extern int drm_flush(struct file *filp); extern int drm_fasync(int fd, struct file *filp, int on); extern int drm_release(struct inode *inode, struct file *filp); /* Mapping support (drm_vm.h) */ -extern void drm_vm_open(struct vm_area_struct *vma); -extern void drm_vm_close(struct vm_area_struct *vma); -extern void drm_vm_shm_close(struct vm_area_struct *vma); -extern int drm_mmap_dma(struct file *filp, - struct vm_area_struct *vma); extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); -extern ssize_t drm_read(struct file *filp, char __user *buf, size_t count, loff_t *off); /* Memory management support (drm_memory.h) */ #include drm_memory.h @@ -854,9 +844,6 @@ extern int drm_rmctx( struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg ); -extern int drm_context_switch(drm_device_t *dev, int old, int new); -extern int drm_context_switch_complete(drm_device_t *dev, int new); - extern int drm_ctxbitmap_init( drm_device_t *dev ); extern void drm_ctxbitmap_cleanup( drm_device_t *dev ); extern void drm_ctxbitmap_free( drm_device_t *dev, int ctx_handle ); @@ -874,9 +861,6
[2.6 patch] drm_memory.h doesn't need to #include tlbflush.h
The flush_tlb_kernel_range call in drm_memory.h was removed in 2003, so there's no more reason for this #include. Signed-off-by: Adrian Bunk [EMAIL PROTECTED] --- This patch was already sent on: - 21 Jan 2005 --- linux-2.6.11-rc1-mm2-full/drivers/char/drm/drm_memory.h.old 2005-01-21 11:21:15.0 +0100 +++ linux-2.6.11-rc1-mm2-full/drivers/char/drm/drm_memory.h 2005-01-21 11:21:20.0 +0100 @@ -57,8 +57,6 @@ # endif #endif -#include asm/tlbflush.h - /* * Find the drm_map that covers the range [offset, offset+size). */ --- This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting Tool for open source databases. Create drag--drop reports. Save time by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc. Download a FREE copy at http://www.intelliview.com/go/osdn_nl -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] drm_memory.h doesn't need to #include tlbflush.h
The flush_tlb_kernel_range call in drm_memory.h was removed in 2003, so there's no more reason for this #include. Signed-off-by: Adrian Bunk [EMAIL PROTECTED] --- linux-2.6.11-rc1-mm2-full/drivers/char/drm/drm_memory.h.old 2005-01-21 11:21:15.0 +0100 +++ linux-2.6.11-rc1-mm2-full/drivers/char/drm/drm_memory.h 2005-01-21 11:21:20.0 +0100 @@ -57,8 +57,6 @@ # endif #endif -#include asm/tlbflush.h - /* * Find the drm_map that covers the range [offset, offset+size). */ --- This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting Tool for open source databases. Create drag--drop reports. Save time by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc. Download a FREE copy at http://www.intelliview.com/go/osdn_nl -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] DRM: remove unused functions (fwd)
The patch forwarded below still applies and compiles against
2.6.10-rc2-mm4.
Please apply.
- Forwarded message from Adrian Bunk [EMAIL PROTECTED] -
Date: Fri, 29 Oct 2004 02:16:18 +0200
From: Adrian Bunk [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Subject: [2.6 patch] DRM: remove unused functions
The patch below removes two unused functions from DRM.
diffstat output:
drivers/char/drm/i810_dma.c | 18 --
drivers/char/drm/i915_dma.c | 18 --
2 files changed, 36 deletions(-)
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
Acked-by: Dave Airlie [EMAIL PROTECTED]
--- linux-2.6.10-rc1-mm1-full/drivers/char/drm/i810_dma.c.old 2004-10-28
22:55:34.0 +0200
+++ linux-2.6.10-rc1-mm1-full/drivers/char/drm/i810_dma.c 2004-10-28
22:55:45.0 +0200
@@ -51,24 +51,6 @@
#define up_write up
#endif
-static inline void i810_print_status_page(drm_device_t *dev)
-{
- drm_device_dma_t *dma = dev-dma;
- drm_i810_private_t *dev_priv = dev-dev_private;
- u32 *temp = dev_priv-hw_status_page;
- int i;
-
- DRM_DEBUG( hw_status: Interrupt Status : %x\n, temp[0]);
- DRM_DEBUG( hw_status: LpRing Head ptr : %x\n, temp[1]);
- DRM_DEBUG( hw_status: IRing Head ptr : %x\n, temp[2]);
- DRM_DEBUG( hw_status: Reserved : %x\n, temp[3]);
- DRM_DEBUG( hw_status: Last Render: %x\n, temp[4]);
- DRM_DEBUG( hw_status: Driver Counter : %d\n, temp[5]);
- for(i = 6; i dma-buf_count + 6; i++) {
- DRM_DEBUG( buffer status idx : %d used: %d\n, i - 6, temp[i]);
- }
-}
-
static drm_buf_t *i810_freelist_get(drm_device_t *dev)
{
drm_device_dma_t *dma = dev-dma;
--- linux-2.6.10-rc1-mm1-full/drivers/char/drm/i915_dma.c.old 2004-10-28
22:56:35.0 +0200
+++ linux-2.6.10-rc1-mm1-full/drivers/char/drm/i915_dma.c 2004-10-28
22:56:47.0 +0200
@@ -13,24 +13,6 @@
#include i915_drm.h
#include i915_drv.h
-static inline void i915_print_status_page(drm_device_t * dev)
-{
- drm_i915_private_t *dev_priv = dev-dev_private;
- u32 *temp = dev_priv-hw_status_page;
-
- if (!temp) {
- DRM_DEBUG(no status page\n);
- return;
- }
-
- DRM_DEBUG(hw_status: Interrupt Status : %x\n, temp[0]);
- DRM_DEBUG(hw_status: LpRing Head ptr : %x\n, temp[1]);
- DRM_DEBUG(hw_status: IRing Head ptr : %x\n, temp[2]);
- DRM_DEBUG(hw_status: Reserved : %x\n, temp[3]);
- DRM_DEBUG(hw_status: Driver Counter : %d\n, temp[5]);
-
-}
-
/* Really want an OS-independent resettable timer. Would like to have
* this loop run for (eg) 3 sec, but have the timer reset every time
* the head pointer changes, so that EBUSY only happens if the ring
-
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/
- End forwarded message -
---
SF email is sponsored by - The IT Product Guide
Read honest candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel
2.6.10-rc1-mm3: drm_ati_pcigart_{init,cleanup} multiple definition
On Fri, Nov 05, 2004 at 12:13:28AM -0800, Andrew Morton wrote: ... Changes since 2.6.10-rc1-mm2: ... bk-drm.patch ... This causes the following compile error: -- snip -- ... LD drivers/char/drm/built-in.o drivers/char/drm/radeon.o(.text+0x120): In function `drm_ati_pcigart_init': : multiple definition of `drm_ati_pcigart_init' drivers/char/drm/r128.o(.text+0x120): first defined here drivers/char/drm/radeon.o(.text+0x350): In function `drm_ati_pcigart_cleanup': : multiple definition of `drm_ati_pcigart_cleanup' drivers/char/drm/r128.o(.text+0x350): first defined here make[3]: *** [drivers/char/drm/built-in.o] Error 1 -- snip -- The definition of non-inline functions in drivers/char/drm/ati_pcigart.h is not a good idea. cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed --- This SF.Net email is sponsored by: Sybase ASE Linux Express Edition - download now for FREE LinuxWorld Reader's Choice Award Winner for best database on Linux. http://ads.osdn.com/?ad_id=5588alloc_id=12065op=click -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] DRM: remove unused functions
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
The patch below removes two unused functions from DRM.
diffstat output:
drivers/char/drm/i810_dma.c | 18 --
drivers/char/drm/i915_dma.c | 18 --
2 files changed, 36 deletions(-)
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
- --- linux-2.6.10-rc1-mm1-full/drivers/char/drm/i810_dma.c.old 2004-10-28
22:55:34.0 +0200
+++ linux-2.6.10-rc1-mm1-full/drivers/char/drm/i810_dma.c 2004-10-28
22:55:45.0 +0200
@@ -51,24 +51,6 @@
#define up_write up
#endif
- -static inline void i810_print_status_page(drm_device_t *dev)
- -{
- - drm_device_dma_t *dma = dev-dma;
- - drm_i810_private_t *dev_priv = dev-dev_private;
- - u32 *temp = dev_priv-hw_status_page;
- - int i;
- -
- - DRM_DEBUG( hw_status: Interrupt Status : %x\n, temp[0]);
- - DRM_DEBUG( hw_status: LpRing Head ptr : %x\n, temp[1]);
- - DRM_DEBUG( hw_status: IRing Head ptr : %x\n, temp[2]);
- - DRM_DEBUG( hw_status: Reserved : %x\n, temp[3]);
- - DRM_DEBUG( hw_status: Last Render: %x\n, temp[4]);
- - DRM_DEBUG( hw_status: Driver Counter : %d\n, temp[5]);
- - for(i = 6; i dma-buf_count + 6; i++) {
- - DRM_DEBUG( buffer status idx : %d used: %d\n, i - 6, temp[i]);
- - }
- -}
- -
static drm_buf_t *i810_freelist_get(drm_device_t *dev)
{
drm_device_dma_t *dma = dev-dma;
- --- linux-2.6.10-rc1-mm1-full/drivers/char/drm/i915_dma.c.old 2004-10-28
22:56:35.0 +0200
+++ linux-2.6.10-rc1-mm1-full/drivers/char/drm/i915_dma.c 2004-10-28
22:56:47.0 +0200
@@ -13,24 +13,6 @@
#include i915_drm.h
#include i915_drv.h
- -static inline void i915_print_status_page(drm_device_t * dev)
- -{
- - drm_i915_private_t *dev_priv = dev-dev_private;
- - u32 *temp = dev_priv-hw_status_page;
- -
- - if (!temp) {
- - DRM_DEBUG(no status page\n);
- - return;
- - }
- -
- - DRM_DEBUG(hw_status: Interrupt Status : %x\n, temp[0]);
- - DRM_DEBUG(hw_status: LpRing Head ptr : %x\n, temp[1]);
- - DRM_DEBUG(hw_status: IRing Head ptr : %x\n, temp[2]);
- - DRM_DEBUG(hw_status: Reserved : %x\n, temp[3]);
- - DRM_DEBUG(hw_status: Driver Counter : %d\n, temp[5]);
- -
- -}
- -
/* Really want an OS-independent resettable timer. Would like to have
* this loop run for (eg) 3 sec, but have the timer reset every time
* the head pointer changes, so that EBUSY only happens if the ring
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.6 (GNU/Linux)
iD8DBQFBgW+HmfzqmE8StAARAttqAJ4h16xPCGoaSdpSQISliKrGQ4U6xwCgqOwN
uU4Jwi0yuUSGoB4AbZHHN1U=
=Oppa
-END PGP SIGNATURE-
---
This Newsletter Sponsored by: Macrovision
For reliable Linux application installations, use the industry's leading
setup authoring tool, InstallShield X. Learn more and evaluate
today. http://clk.atdmt.com/MSI/go/ins003001msi/direct/01/
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel
[2.6 patch] DRM: remove unused functions
[ this time without the problems due to a digital signature... ]
The patch below removes two unused functions from DRM.
diffstat output:
drivers/char/drm/i810_dma.c | 18 --
drivers/char/drm/i915_dma.c | 18 --
2 files changed, 36 deletions(-)
Signed-off-by: Adrian Bunk [EMAIL PROTECTED]
--- linux-2.6.10-rc1-mm1-full/drivers/char/drm/i810_dma.c.old 2004-10-28
22:55:34.0 +0200
+++ linux-2.6.10-rc1-mm1-full/drivers/char/drm/i810_dma.c 2004-10-28
22:55:45.0 +0200
@@ -51,24 +51,6 @@
#define up_write up
#endif
-static inline void i810_print_status_page(drm_device_t *dev)
-{
- drm_device_dma_t *dma = dev-dma;
- drm_i810_private_t *dev_priv = dev-dev_private;
- u32 *temp = dev_priv-hw_status_page;
- int i;
-
- DRM_DEBUG( hw_status: Interrupt Status : %x\n, temp[0]);
- DRM_DEBUG( hw_status: LpRing Head ptr : %x\n, temp[1]);
- DRM_DEBUG( hw_status: IRing Head ptr : %x\n, temp[2]);
- DRM_DEBUG( hw_status: Reserved : %x\n, temp[3]);
- DRM_DEBUG( hw_status: Last Render: %x\n, temp[4]);
- DRM_DEBUG( hw_status: Driver Counter : %d\n, temp[5]);
- for(i = 6; i dma-buf_count + 6; i++) {
- DRM_DEBUG( buffer status idx : %d used: %d\n, i - 6, temp[i]);
- }
-}
-
static drm_buf_t *i810_freelist_get(drm_device_t *dev)
{
drm_device_dma_t *dma = dev-dma;
--- linux-2.6.10-rc1-mm1-full/drivers/char/drm/i915_dma.c.old 2004-10-28
22:56:35.0 +0200
+++ linux-2.6.10-rc1-mm1-full/drivers/char/drm/i915_dma.c 2004-10-28
22:56:47.0 +0200
@@ -13,24 +13,6 @@
#include i915_drm.h
#include i915_drv.h
-static inline void i915_print_status_page(drm_device_t * dev)
-{
- drm_i915_private_t *dev_priv = dev-dev_private;
- u32 *temp = dev_priv-hw_status_page;
-
- if (!temp) {
- DRM_DEBUG(no status page\n);
- return;
- }
-
- DRM_DEBUG(hw_status: Interrupt Status : %x\n, temp[0]);
- DRM_DEBUG(hw_status: LpRing Head ptr : %x\n, temp[1]);
- DRM_DEBUG(hw_status: IRing Head ptr : %x\n, temp[2]);
- DRM_DEBUG(hw_status: Reserved : %x\n, temp[3]);
- DRM_DEBUG(hw_status: Driver Counter : %d\n, temp[5]);
-
-}
-
/* Really want an OS-independent resettable timer. Would like to have
* this loop run for (eg) 3 sec, but have the timer reset every time
* the head pointer changes, so that EBUSY only happens if the ring
---
This Newsletter Sponsored by: Macrovision
For reliable Linux application installations, use the industry's leading
setup authoring tool, InstallShield X. Learn more and evaluate
today. http://clk.atdmt.com/MSI/go/ins003001msi/direct/01/
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel
[Dri-devel] [patch] 2.6.6-rc2-mm1: drm_irq.h has useless __NO_VERSION__
On Wed, Apr 21, 2004 at 01:45:44AM -0700, Andrew Morton wrote: ... All 222 patches: ... bk-drm.patch ... The drivers/char/drm/drm_irq.h in this patch contains a #define __NO_VERSION__ which is useless since ages. The patch below removes it. Please apply Adrian --- linux-2.6.6-rc2-mm1-full/drivers/char/drm/drm_irq.h.old 2004-04-25 03:14:24.0 +0200 +++ linux-2.6.6-rc2-mm1-full/drivers/char/drm/drm_irq.h 2004-04-25 03:14:35.0 +0200 @@ -33,7 +33,6 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#define __NO_VERSION__ #include drmP.h #include linux/interrupt.h /* For task queue support */ --- This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek For a limited time only, get FREE Ground shipping on all orders of $35 or more. Hurry up and shop folks, this offer expires April 30th! http://www.thinkgeek.com/freeshipping/?cpg=12297 -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
[Dri-devel] [2.6 patch] disallow DRM on 386
I got the following compile error in 2.6.1-mm5 with X86_CMPXCHG=n. This problem is not specific to -mm, and it always occurs when you include support for the 386 cpu (oposed to the 486 or later cpus) since in this case X86_CMPXCHG=n and therefoore cmpxchg isn't defined in include/asm-i386/system.h . The patch below disallows DRM if X86_CMPXCHG=n. Please apply Adrian --- linux-2.6.1-mm5/drivers/char/drm/Kconfig.old2004-01-20 14:42:27.0 +0100 +++ linux-2.6.1-mm5/drivers/char/drm/Kconfig2004-01-20 14:43:02.0 +0100 @@ -6,6 +6,7 @@ # config DRM bool Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) + depends on !X86 || X86_CMPXCHG help Kernel-level support for the Direct Rendering Infrastructure (DRI) introduced in XFree86 4.0. If you say Y here, you need to select --- The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA. http://www.eclipsecon.org/osdn -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
Re: [Dri-devel] [2.6 patch] disallow DRM on 386
On Wed, Jan 21, 2004 at 12:04:59AM +, Alan Cox wrote: On Maw, 2004-01-20 at 21:24, Adrian Bunk wrote: I got the following compile error in 2.6.1-mm5 with X86_CMPXCHG=n. This problem is not specific to -mm, and it always occurs when you include support for the 386 cpu (oposed to the 486 or later cpus) since in this case X86_CMPXCHG=n and therefoore cmpxchg isn't defined in include/asm-i386/system.h . The patch below disallows DRM if X86_CMPXCHG=n. Ugly. Fix system.h to always define cmpxchg.h and check its presence at runtime when the DRM module loads, then you can build 386 kernels that support DRI on higher machines. The problem isnt that cmpxchg definitely doesn't exist, so system.h is wrong IMHO ??? AFAIR cmpxchg wasn't present in cpus earlier than the 486. cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed --- The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA. http://www.eclipsecon.org/osdn -- ___ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
