Mesa (master): radeong: Use vram_size instead of vram_visible.
Corbin Simpson
csimpson at kemper.freedesktop.org
Mon Jan 18 09:13:38 UTC 2010
Module: Mesa
Branch: master
Commit: 11a2bbc3e96a5d72cc1473362c771ddebe0f9b8d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=11a2bbc3e96a5d72cc1473362c771ddebe0f9b8d
Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date: Sun Jan 17 15:57:26 2010 -0800
radeong: Use vram_size instead of vram_visible.
The kernel will decide on its own what to give us.
---
src/gallium/winsys/drm/radeon/core/radeon_drm.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/gallium/winsys/drm/radeon/core/radeon_drm.c b/src/gallium/winsys/drm/radeon/core/radeon_drm.c
index dd73b33..017d1be 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_drm.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_drm.c
@@ -55,8 +55,8 @@ static void do_ioctls(int fd, struct radeon_winsys* winsys)
*
* The GEM info is actually bogus on the kernel side, as well as our side
* (see radeon_gem_info_ioctl in radeon_gem.c) but that's alright because
- * we don't actually use the info for anything yet.
- * XXX update the above when we can safely use vram_size instead of vram_visible */
+ * we don't actually use the info for anything yet. */
+
info.request = RADEON_INFO_DEVICE_ID;
retval = drmCommandWriteRead(fd, DRM_RADEON_INFO, &info, sizeof(info));
if (retval) {
@@ -92,8 +92,7 @@ static void do_ioctls(int fd, struct radeon_winsys* winsys)
exit(1);
}
winsys->gart_size = gem_info.gart_size;
- /* XXX */
- winsys->vram_size = gem_info.vram_visible;
+ winsys->vram_size = gem_info.vram_size;
}
/* Guess at whether this chipset should use r300g.
More information about the mesa-commit
mailing list