From 48cc350e21acd2b4b03c76937e2861af5271435a Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Mon, 26 Aug 2002 22:16:18 +0000 Subject: merged r200-0-1-branch --- bsd/Makefile | 2 +- bsd/Makefile.bsd | 2 +- bsd/drm_drv.h | 2 +- bsd/radeon_drv.c | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) (limited to 'bsd') 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 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 diff --git a/bsd/drm_drv.h b/bsd/drm_drv.h index fb0454dd..81ca644a 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} }; -- cgit v1.2.3