bsd patches from Mark McCleary

11 files changed, 15 insertions, 13 deletions

diff --git a/bsd-core/Makefile b/bsd-core/Makefile
index 9c87d963..f26fd53d 100644
--- a/bsd-core/Makefile
+++ b/bsd-core/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 # i810, i830 & sis are not complete
-SUBDIR = tdfx mga r128 radeon gamma # i810 sis i830
+SUBDIR = radeon # r128 i810 sis i830 tdfx mga gamma
 
 .include <bsd.subdir.mk>
diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c
index 8d75e698..45e145dc 100644
--- a/bsd-core/drm_drv.c
+++ b/bsd-core/drm_drv.c
@@ -1207,7 +1207,7 @@ int DRM(unlock)( DRM_IOCTL_ARGS )
 	DRM(dma_schedule)( dev, 1 );
 #endif
 
-	/* FIXME: Do we ever really need to check this???
+	/* FIXME: Do we ever really need to check this?
 	 */
 	if ( 1 /* !dev->context_flag */ ) {
 		if ( DRM(lock_free)( dev, &dev->lock.hw_lock->lock,
diff --git a/bsd-core/radeon_drv.c b/bsd-core/radeon_drv.c
index fe69fbb8..d02ab959 100644
--- a/bsd-core/radeon_drv.c
+++ b/bsd-core/radeon_drv.c
@@ -52,6 +52,7 @@ drm_chipinfo_t DRM(devicelist)[] = {
 	{0x1002, 0x5157, 1, "ATI Radeon QW 7500 (AGP)"},
 	{0x1002, 0x5159, 1, "ATI Radeon QY VE (AGP)"},
 	{0x1002, 0x515A, 1, "ATI Radeon QZ VE (AGP)"},
+	{0x1002, 0x514C, 1, "ATI Radeon QL 8500 (AGP)"},
 	{0, 0, 0, NULL}
 };
 
diff --git a/bsd/Makefile b/bsd/Makefile
index 9c87d963..f26fd53d 100644
--- a/bsd/Makefile
+++ b/bsd/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 # i810, i830 & sis are not complete
-SUBDIR = tdfx mga r128 radeon gamma # i810 sis i830
+SUBDIR = radeon # r128 i810 sis i830 tdfx mga gamma
 
 .include <bsd.subdir.mk>
diff --git a/bsd/Makefile.bsd b/bsd/Makefile.bsd
index 9c87d963..f26fd53d 100644
--- a/bsd/Makefile.bsd
+++ b/bsd/Makefile.bsd
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 # i810, i830 & sis are not complete
-SUBDIR = tdfx mga r128 radeon gamma # i810 sis i830
+SUBDIR = radeon # r128 i810 sis i830 tdfx mga gamma
 
 .include <bsd.subdir.mk>
diff --git a/bsd/drm_drv.h b/bsd/drm_drv.h
index 8d75e698..45e145dc 100644
--- a/bsd/drm_drv.h
+++ b/bsd/drm_drv.h
@@ -1207,7 +1207,7 @@ int DRM(unlock)( DRM_IOCTL_ARGS )
 	DRM(dma_schedule)( dev, 1 );
 #endif
 
-	/* FIXME: Do we ever really need to check this???
+	/* FIXME: Do we ever really need to check this?
 	 */
 	if ( 1 /* !dev->context_flag */ ) {
 		if ( DRM(lock_free)( dev, &dev->lock.hw_lock->lock,
diff --git a/bsd/radeon_drv.c b/bsd/radeon_drv.c
index fe69fbb8..d02ab959 100644
--- a/bsd/radeon_drv.c
+++ b/bsd/radeon_drv.c
@@ -52,6 +52,7 @@ drm_chipinfo_t DRM(devicelist)[] = {
 	{0x1002, 0x5157, 1, "ATI Radeon QW 7500 (AGP)"},
 	{0x1002, 0x5159, 1, "ATI Radeon QY VE (AGP)"},
 	{0x1002, 0x515A, 1, "ATI Radeon QZ VE (AGP)"},
+	{0x1002, 0x514C, 1, "ATI Radeon QL 8500 (AGP)"},
 	{0, 0, 0, NULL}
 };
 
diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h
index 463a1fa1..6469bfb8 100644
--- a/shared-core/radeon_drm.h
+++ b/shared-core/radeon_drm.h
@@ -95,8 +95,8 @@
 #define R200_EMIT_PP_TXCBLEND_3                     24 /* tex3/4 */
 #define R200_EMIT_PP_TXCBLEND_4                     25 /* tex4/4 */
 #define R200_EMIT_PP_TXCBLEND_5                     26 /* tex5/4 */
-#define R200_EMIT_PP_TXCBLEND_6                     27 /* ???/4 */
-#define R200_EMIT_PP_TXCBLEND_7                     28 /* ???/4 */
+#define R200_EMIT_PP_TXCBLEND_6                     27 /* /4 */
+#define R200_EMIT_PP_TXCBLEND_7                     28 /* /4 */
 #define R200_EMIT_TCL_LIGHT_MODEL_CTL_0             29 /* tcl/7 */
 #define R200_EMIT_TFACTOR_0                         30 /* tf/7 */
 #define R200_EMIT_VTX_FMT_0                         31 /* vtx/5 */
diff --git a/shared-core/radeon_state.c b/shared-core/radeon_state.c
index 64845350..8b0432dd 100644
--- a/shared-core/radeon_state.c
+++ b/shared-core/radeon_state.c
@@ -1834,7 +1834,7 @@ static __inline__ int radeon_emit_scalars(
 
 /* God this is ugly
  */
-static inline int radeon_emit_scalars2( 
+static __inline__ int radeon_emit_scalars2( 
 	drm_radeon_private_t *dev_priv,
 	drm_radeon_cmd_header_t header,
 	drm_radeon_cmd_buffer_t *cmdbuf )
@@ -1856,7 +1856,7 @@ static inline int radeon_emit_scalars2(
 	return 0;
 }
 
-static inline int radeon_emit_vectors( 
+static __inline__ int radeon_emit_vectors( 
 	drm_radeon_private_t *dev_priv,
 	drm_radeon_cmd_header_t header,
 	drm_radeon_cmd_buffer_t *cmdbuf )
diff --git a/shared/radeon_drm.h b/shared/radeon_drm.h
index 463a1fa1..6469bfb8 100644
--- a/shared/radeon_drm.h
+++ b/shared/radeon_drm.h
@@ -95,8 +95,8 @@
 #define R200_EMIT_PP_TXCBLEND_3                     24 /* tex3/4 */
 #define R200_EMIT_PP_TXCBLEND_4                     25 /* tex4/4 */
 #define R200_EMIT_PP_TXCBLEND_5                     26 /* tex5/4 */
-#define R200_EMIT_PP_TXCBLEND_6                     27 /* ???/4 */
-#define R200_EMIT_PP_TXCBLEND_7                     28 /* ???/4 */
+#define R200_EMIT_PP_TXCBLEND_6                     27 /* /4 */
+#define R200_EMIT_PP_TXCBLEND_7                     28 /* /4 */
 #define R200_EMIT_TCL_LIGHT_MODEL_CTL_0             29 /* tcl/7 */
 #define R200_EMIT_TFACTOR_0                         30 /* tf/7 */
 #define R200_EMIT_VTX_FMT_0                         31 /* vtx/5 */
diff --git a/shared/radeon_state.c b/shared/radeon_state.c
index 64845350..8b0432dd 100644
--- a/shared/radeon_state.c
+++ b/shared/radeon_state.c
@@ -1834,7 +1834,7 @@ static __inline__ int radeon_emit_scalars(
 
 /* God this is ugly
  */
-static inline int radeon_emit_scalars2( 
+static __inline__ int radeon_emit_scalars2( 
 	drm_radeon_private_t *dev_priv,
 	drm_radeon_cmd_header_t header,
 	drm_radeon_cmd_buffer_t *cmdbuf )
@@ -1856,7 +1856,7 @@ static inline int radeon_emit_scalars2(
 	return 0;
 }
 
-static inline int radeon_emit_vectors( 
+static __inline__ int radeon_emit_vectors( 
 	drm_radeon_private_t *dev_priv,
 	drm_radeon_cmd_header_t header,
 	drm_radeon_cmd_buffer_t *cmdbuf )