Collect multiple GPUs' info on Mac and display them in about:gpu.

Collect multiple GPUs' info on Mac and display them in about:gpu.

Also, we detect AMD switchable.

For the purpose of blacklisting, we always put AMD as primary GPU in case of AMD switchable.

Tested on Mac with AMD switchable and it works correctly.

BUG=121024
TEST=manual
R=kbr
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=137174

[Zhenyao Mo, 2012-05-11 22:28:40]

Please have a look.

[Ken Russell (switch to Gerrit), 2012-05-11 22:46:15]

http://codereview.chromium.org/10383146/diff/1/content/gpu/gpu_info_collector...
File content/gpu/gpu_info_collector_mac.mm (right):

http://codereview.chromium.org/10383146/diff/1/content/gpu/gpu_info_collector...
content/gpu/gpu_info_collector_mac.mm:75: while ((entry =
IOIteratorNext(entry_iterator))) {
Because of the asymmetry between GPUInfo::gpu and GPUInfo::secondary_gpus, I
would suggest building up the list of GPUDevices into a temporary vector and
then assigning the entries into the GPUInfo at the end.

http://codereview.chromium.org/10383146/diff/1/content/gpu/gpu_info_collector...
content/gpu/gpu_info_collector_mac.mm:79: CFSTR("class-code"))));
There's a lot of boilerplate code duplicated in this block.

http://codereview.chromium.org/10383146/diff/1/content/gpu/gpu_info_collector...
content/gpu/gpu_info_collector_mac.mm:108: gpu_info->secondary_gpus[0].vendor_id
== kVendorIDAMD)) {
This must be generalized for non-AMD GPUs, or blacklisting on dual Intel/NVIDIA
GPU MacBook Pros will be broken.

[Zhenyao Mo, 2012-05-14 18:41:11]

revised, please have another look.

http://codereview.chromium.org/10383146/diff/1/content/gpu/gpu_info_collector...
File content/gpu/gpu_info_collector_mac.mm (right):

http://codereview.chromium.org/10383146/diff/1/content/gpu/gpu_info_collector...
content/gpu/gpu_info_collector_mac.mm:75: while ((entry =
IOIteratorNext(entry_iterator))) {
On 2012/05/11 22:46:15, kbr wrote:
> Because of the asymmetry between GPUInfo::gpu and GPUInfo::secondary_gpus, I
> would suggest building up the list of GPUDevices into a temporary vector and
> then assigning the entries into the GPUInfo at the end.

Done.

http://codereview.chromium.org/10383146/diff/1/content/gpu/gpu_info_collector...
content/gpu/gpu_info_collector_mac.mm:79: CFSTR("class-code"))));
On 2012/05/11 22:46:15, kbr wrote:
> There's a lot of boilerplate code duplicated in this block.

Done.

http://codereview.chromium.org/10383146/diff/1/content/gpu/gpu_info_collector...
content/gpu/gpu_info_collector_mac.mm:108: gpu_info->secondary_gpus[0].vendor_id
== kVendorIDAMD)) {
On 2012/05/11 22:46:15, kbr wrote:
> This must be generalized for non-AMD GPUs, or blacklisting on dual
Intel/NVIDIA
> GPU MacBook Pros will be broken.

Is optimus supported on Mac also?  Anyway, I implemented the optimus detection
logic in case it's supported now or in the future.

[Ken Russell (switch to Gerrit), 2012-05-15 18:08:22]

LGTM

http://codereview.chromium.org/10383146/diff/1/content/gpu/gpu_info_collector...
File content/gpu/gpu_info_collector_mac.mm (right):

http://codereview.chromium.org/10383146/diff/1/content/gpu/gpu_info_collector...
content/gpu/gpu_info_collector_mac.mm:108: gpu_info->secondary_gpus[0].vendor_id
== kVendorIDAMD)) {
On 2012/05/14 18:41:11, Zhenyao Mo wrote:
> On 2012/05/11 22:46:15, kbr wrote:
> > This must be generalized for non-AMD GPUs, or blacklisting on dual
> Intel/NVIDIA
> > GPU MacBook Pros will be broken.
> 
> Is optimus supported on Mac also?  Anyway, I implemented the optimus detection
> logic in case it's supported now or in the future.

I believe that Apple implements their own GPU-switching mechanism that isn't
branded under either of NVIDIA's "Optimus" AMD's "switchable GPU" names, but
from the standpoint of this logic, it's fine to call it Optimus.