summaryrefslogtreecommitdiffstats
path: root/sys/dev/drm/drm_agpsupport.c
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2006-04-09 20:45:45 +0000
committeranholt <anholt@FreeBSD.org>2006-04-09 20:45:45 +0000
commit766ae564a2243b4e8dc68fe9b8e5d8875d1e4bdd (patch)
treef57db1633125210d36e905094cb555bdb5e70914 /sys/dev/drm/drm_agpsupport.c
parentf1ed1ae32f905b9101d13a09efee70142edabf48 (diff)
downloadFreeBSD-src-766ae564a2243b4e8dc68fe9b8e5d8875d1e4bdd.zip
FreeBSD-src-766ae564a2243b4e8dc68fe9b8e5d8875d1e4bdd.tar.gz
Update to DRM CVS as of 2006-04-09. The most notable new feature is the updated
Radeon memmap code, which with a new DDX driver and DRI drivers should fix long-term stability issues with Radeons. Also adds support for r200's ATI_fragment_shader, r300 texrect support and texture caching fixes, i915 vblank support and bugfixes, and new PCI IDs.
Diffstat (limited to 'sys/dev/drm/drm_agpsupport.c')
-rw-r--r--sys/dev/drm/drm_agpsupport.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/dev/drm/drm_agpsupport.c b/sys/dev/drm/drm_agpsupport.c
index 19785ea..f809acb 100644
--- a/sys/dev/drm/drm_agpsupport.c
+++ b/sys/dev/drm/drm_agpsupport.c
@@ -45,16 +45,6 @@ __FBSDID("$FreeBSD$");
static int
drm_device_find_capability(drm_device_t *dev, int cap)
{
- int ret;
-
- if (dev->driver.device_is_agp != NULL) {
- ret = (*dev->driver.device_is_agp)(dev);
-
- if (ret != DRM_MIGHT_BE_AGP) {
- return ret == 2;
- }
- }
-
#ifdef __FreeBSD__
#if __FreeBSD_version >= 700010
@@ -104,7 +94,7 @@ int drm_device_is_agp(drm_device_t *dev)
* AGP, 2 = fall back to PCI capability
*/
ret = (*dev->driver.device_is_agp)(dev);
- if (ret != 2)
+ if (ret != DRM_MIGHT_BE_AGP)
return ret;
}
OpenPOWER on IntegriCloud