summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrnoland <rnoland@FreeBSD.org>2009-03-17 03:36:24 +0000
committerrnoland <rnoland@FreeBSD.org>2009-03-17 03:36:24 +0000
commitf71848841262d00f36a99be682a31b13dbbc8863 (patch)
treea68e95285261846d84f15a8655204aca4a00cb85
parenta1322394c1f2559065476ca465a89336495231a2 (diff)
downloadFreeBSD-src-f71848841262d00f36a99be682a31b13dbbc8863.zip
FreeBSD-src-f71848841262d00f36a99be682a31b13dbbc8863.tar.gz
Change the logic around to match ati_pcigart.
MFC after: 3 days
-rw-r--r--sys/dev/drm/r600_cp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/drm/r600_cp.c b/sys/dev/drm/r600_cp.c
index 72af8c8..73bc9af 100644
--- a/sys/dev/drm/r600_cp.c
+++ b/sys/dev/drm/r600_cp.c
@@ -174,7 +174,6 @@ int r600_page_table_init(struct drm_device *dev)
if (entry->busaddr[i] == 0) {
DRM_ERROR("unable to map PCIGART pages!\n");
r600_page_table_cleanup(dev, gart_info);
- ret = -EINVAL;
goto done;
}
#endif
@@ -193,6 +192,7 @@ int r600_page_table_init(struct drm_device *dev)
entry_addr += ATI_PCIGART_PAGE_SIZE;
}
}
+ ret = 1;
#ifdef __linux__
done:
#endif
@@ -2100,7 +2100,7 @@ int r600_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
dev_priv->gart_info.addr,
dev_priv->pcigart_offset);
- if (r600_page_table_init(dev)) {
+ if (!r600_page_table_init(dev)) {
DRM_ERROR("Failed to init GART table\n");
r600_do_cleanup_cp(dev);
return -EINVAL;
OpenPOWER on IntegriCloud