lkml.org 
[lkml]   [2003]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH][2.4.23] fix some DRM43 warnings
[Resend. Was ignored for 2.4.23-pre :-(]

This patch fixes three sources of warnings in the new 4.3 DRM code:
- drm_os_linux.h has a #warning on broken list_entry usage.
The patch backports a fix from the 2.6 code.
- radeon_drv.h has a #warning PCI posting bug.
The #warning refers to an obsolete and unused macro.
Simply remove it. It's also gone from the 2.6 code.
- drm_agpsupport.h generates a gcc warning on an assignment
used as a truth value.
The patch backports a fix from the 2.6 code.

These changes are well-tested: they have been in 2.6 for ages,
and I've been running them in 2.4.23-pre/rc for months.
Please apply.

/Mikael

diff -ruN linux-2.4.23/drivers/char/drm/drm_agpsupport.h linux-2.4.23.drm43-fixes/drivers/char/drm/drm_agpsupport.h
--- linux-2.4.23/drivers/char/drm/drm_agpsupport.h 2003-11-29 00:28:11.000000000 +0100
+++ linux-2.4.23.drm43-fixes/drivers/char/drm/drm_agpsupport.h 2003-11-29 00:33:29.000000000 +0100
@@ -79,7 +79,7 @@
return -EBUSY;
if(!drm_agp->acquire)
return -EINVAL;
- if (retcode = drm_agp->acquire())
+ if ((retcode = drm_agp->acquire()))
return retcode;
dev->agp->acquired = 1;
return 0;
diff -ruN linux-2.4.23/drivers/char/drm/drm_os_linux.h linux-2.4.23.drm43-fixes/drivers/char/drm/drm_os_linux.h
--- linux-2.4.23/drivers/char/drm/drm_os_linux.h 2003-11-29 00:28:11.000000000 +0100
+++ linux-2.4.23.drm43-fixes/drivers/char/drm/drm_os_linux.h 2003-11-29 00:33:29.000000000 +0100
@@ -13,12 +13,10 @@
return -EFAULT


-#warning the author of this code needs to read up on list_entry
#define DRM_GETSAREA() \
do { \
- struct list_head *list; \
- list_for_each( list, &dev->maplist->head ) { \
- drm_map_list_t *entry = (drm_map_list_t *)list; \
+ drm_map_list_t *entry; \
+ list_for_each_entry( entry, &dev->maplist->head, head ) { \
if ( entry->map && \
entry->map->type == _DRM_SHM && \
(entry->map->flags & _DRM_CONTAINS_LOCK) ) { \
diff -ruN linux-2.4.23/drivers/char/drm/radeon_drv.h linux-2.4.23.drm43-fixes/drivers/char/drm/radeon_drv.h
--- linux-2.4.23/drivers/char/drm/radeon_drv.h 2003-11-29 00:28:11.000000000 +0100
+++ linux-2.4.23.drm43-fixes/drivers/char/drm/radeon_drv.h 2003-11-29 00:33:29.000000000 +0100
@@ -839,14 +839,6 @@
* Ring control
*/

-#if defined(__powerpc__)
-#define radeon_flush_write_combine() (void) GET_RING_HEAD( &dev_priv->ring )
-#else
-#define radeon_flush_write_combine() wmb()
-#warning PCI posting bug
-#endif
-
-
#define RADEON_VERBOSE 0

#define RING_LOCALS int write, _nr; unsigned int mask; u32 *ring;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:59    [W:0.022 / U:3.696 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site