From e8de44210d5ae274638f72aaf2402a1f08e8a168 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 18 May 2011 05:25:41 +0000 Subject: [PATCH] fix reversed memory units git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41562 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../drivers/graphics/radeon_hd/radeon_hd.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp b/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp index df17dd16d7..507c955608 100644 --- a/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp +++ b/src/add-ons/kernel/drivers/graphics/radeon_hd/radeon_hd.cpp @@ -112,20 +112,20 @@ radeon_hd_init(radeon_info &info) // Populate graphics_memory/aperture_size with KB if (info.shared_info->device_chipset >= RADEON_R800) { // R800+ has memory stored in MB - info.shared_info->graphics_memory_size - = read32(info.registers + R6XX_CONFIG_MEMSIZE) / 1024; - info.shared_info->graphics_aperture_size - = read32(info.registers + R6XX_CONFIG_APER_SIZE) / 1024; - } else { - // R600-R700 has memory stored in bytes info.shared_info->graphics_memory_size = read32(info.registers + R6XX_CONFIG_MEMSIZE) * 1024; info.shared_info->graphics_aperture_size = read32(info.registers + R6XX_CONFIG_APER_SIZE) * 1024; + } else { + // R600-R700 has memory stored in bytes + info.shared_info->graphics_memory_size + = read32(info.registers + R6XX_CONFIG_MEMSIZE) / 1024; + info.shared_info->graphics_aperture_size + = read32(info.registers + R6XX_CONFIG_APER_SIZE) / 1024; } - int32 memory_size = info.shared_info->graphics_memory_size * 1024; - int32 aperture_size = info.shared_info->graphics_aperture_size * 1024; + int32 memory_size = info.shared_info->graphics_memory_size / 1024; + int32 aperture_size = info.shared_info->graphics_aperture_size / 1024; TRACE("card(%ld): found %ld MB memory on card.\n", info.id, memory_size); TRACE("card(%ld): found %ld MB aperture on card.\n", info.id,