From 9a7d25966c87433d4ea3c829ffd588bcca2402a7 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 21 Sep 2011 22:25:08 +0000
Subject: [PATCH] - client: fix bug in ATI GPU detection, caused zero RAM
 measurements

svn path=/trunk/boinc/; revision=24251
---
 checkin_notes            |  8 +++++++-
 client/coproc_detect.cpp | 10 +++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index b22e72777b..e60398ce51 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6299,7 +6299,7 @@ David  21 Sept 2011
         - deprecate/undeprecate versions of the app.
         - abort jobs for that app
 
-        You can also designate a user a manage for the project.
+        You can also designate a user as manager for the project.
         They can then edit permissions and quotas,
         as well as performing the app-specific functions for all apps.
 
@@ -6328,3 +6328,9 @@ David  21 Sept 2011
             submit.php
     py/Boinc/
         setup_project.py
+
+David  21 Sept 2011
+    - client: fix bug in ATI GPU detection, caused zero RAM measurements
+
+    client/
+        coproc_detect.cpp
diff --git a/client/coproc_detect.cpp b/client/coproc_detect.cpp
index 4f5e651621..ac979f9dd2 100644
--- a/client/coproc_detect.cpp
+++ b/client/coproc_detect.cpp
@@ -1368,12 +1368,11 @@ void COPROC_ATI::get(
         cc.atirt_detected = atirt_detected;
         cc.device_num = i;
         cc.set_peak_flops();
+        cc.get_available_ram();
         gpus.push_back(cc);
     }
 
-    get_available_ram();
-
-    // shut down, otherwise Lenovo won't be able to switch to low-power GPU
+    // shut down CAL, otherwise Lenovo won't be able to switch to low-power GPU
     //
     retval = (*__calShutdown)();
 
@@ -1382,6 +1381,8 @@ void COPROC_ATI::get(
         return;
     }
 
+    // find the most capable non-ignored instance
+    //
     bool first = true;
     unsigned int i;
     for (i=0; i<gpus.size(); i++) {
@@ -1394,6 +1395,9 @@ void COPROC_ATI::get(
         }
     }
 
+    // see which other instances are equivalent,
+    // and set the "count" and "device_nums" fields
+    //
     count = 0;
     for (i=0; i<gpus.size(); i++) {
         char buf2[256];