aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt2005-12-05 04:53:06 -0600
committerEric Anholt2005-12-05 04:53:06 -0600
commit2911edaed70b164c5886ee4f71df769c5e02e0c0 (patch)
treedc15acbf6f2c331e085a775ca0d2e6e4d62b27b1 /bsd-core
parent0b4fdc81d15c1ff8acfe6fcdfcdd58a13fb3696e (diff)
downloadexternal-libdrm-2911edaed70b164c5886ee4f71df769c5e02e0c0.tar.gz
external-libdrm-2911edaed70b164c5886ee4f71df769c5e02e0c0.tar.xz
external-libdrm-2911edaed70b164c5886ee4f71df769c5e02e0c0.zip
Remove driver.device_is_agp code duplicated in drm_device_find_capability,
when it really wanted to live in drm_device_is_agp.
Diffstat (limited to 'bsd-core')
-rw-r--r--bsd-core/drm_agpsupport.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/bsd-core/drm_agpsupport.c b/bsd-core/drm_agpsupport.c
index 0a565105..92fb8e0d 100644
--- a/bsd-core/drm_agpsupport.c
+++ b/bsd-core/drm_agpsupport.c
@@ -44,14 +44,6 @@ drm_device_find_capability(drm_device_t *dev, int cap)
44{ 44{
45 int ret; 45 int ret;
46 46
47 if (dev->driver.device_is_agp != NULL) {
48 ret = (*dev->driver.device_is_agp)(dev);
49
50 if (ret != DRM_MIGHT_BE_AGP) {
51 return ret == 2;
52 }
53 }
54
55#ifdef __FreeBSD__ 47#ifdef __FreeBSD__
56 /* Code taken from agp.c. IWBNI that was a public interface. */ 48 /* Code taken from agp.c. IWBNI that was a public interface. */
57 u_int32_t status; 49 u_int32_t status;
@@ -96,7 +88,7 @@ int drm_device_is_agp(drm_device_t *dev)
96 * AGP, 2 = fall back to PCI capability 88 * AGP, 2 = fall back to PCI capability
97 */ 89 */
98 ret = (*dev->driver.device_is_agp)(dev); 90 ret = (*dev->driver.device_is_agp)(dev);
99 if (ret != 2) 91 if (ret != DRM_MIGHT_BE_AGP)
100 return ret; 92 return ret;
101 } 93 }
102 94