Changes how to compute the id of a display.

chromeos/display/output_util.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/display/output_util.h"
 
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xatom.h>
 
+#include "base/hash.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/sys_byteorder.h"
 
 namespace chromeos {
 namespace {
 
 // Prefixes for the built-in displays.
 const char kInternal_LVDS[] = "LVDS";
 const char kInternal_eDP[] = "eDP";
 
 // Returns 64-bit persistent ID for the specified manufacturer's ID and
-// product_code, and the index of the output it is connected to.
+// product_name, and the index of the output it is connected to.

[oshima, 2013/05/21 21:53:31]

keep this name consistent in the file, like product_name_code,
product_code_hash.

[Jun Mukai, 2013/05/22 00:28:05]

Done.

 // |output_index| is used to distinguish the displays of the same type. For
 // example, swapping two identical display between two outputs will not be
 // treated as swap. The 'serial number' field in EDID isn't used here because
 // it is not guaranteed to have unique number and it may have the same fixed
 // value (like 0).
 int64 GetID(uint16 manufacturer_id,
-            uint16 product_code,
+            uint32 product_code,

[oshima, 2013/05/21 21:53:31]

ditto

[Jun Mukai, 2013/05/22 00:28:05]

Done.

             uint8 output_index) {
-  return ((static_cast<int64>(manufacturer_id) << 24) |
+  return ((static_cast<int64>(manufacturer_id) << 40) |
           (static_cast<int64>(product_code) << 8) | output_index);
 }
 
 bool IsRandRAvailable() {
   int randr_version_major = 0;
   int randr_version_minor = 0;
   static bool is_randr_available = XRRQueryVersion(
       base::MessagePumpAuraX11::GetDefaultXDisplay(),
       &randr_version_major, &randr_version_minor);
   return is_randr_available;
@@ skipping 69 matching lines @@
 
 }  // namespace
 
 std::string GetDisplayName(XID output_id) {
   std::string display_name;
   GetOutputDeviceData(output_id, NULL, NULL, &display_name);
   return display_name;
 }
 
 bool GetDisplayId(XID output_id, size_t output_index, int64* display_id_out) {
+  unsigned long nitems = 0;
+  unsigned char* prop = NULL;
+  if (!GetEDIDProperty(output_id, &nitems, &prop))
+    return false;
+
+  bool result =
+      GetDisplayIdFromEDID(prop, nitems, output_index, display_id_out);
+  XFree(prop);
+  return result;
+}
+
+bool GetDisplayIdFromEDID(const unsigned char* prop,
+                          unsigned long nitems,
+                          size_t output_index,
+                          int64* display_id_out) {
   uint16 manufacturer_id = 0;
   uint16 product_code = 0;
-  if (GetOutputDeviceData(
-          output_id, &manufacturer_id, &product_code, NULL) &&
-      manufacturer_id != 0) {
+  std::string product_name;
+
+  // ParseOutputDeviceData fails if it doesn't have product_name.
+  ParseOutputDeviceData(
+      prop, nitems, &manufacturer_id, &product_code, &product_name);
+
+  // Generates product specific value from product_name. See crbug.com/240341
+  // for why we use product name string instead of product code in EDID. Use
+  // fallback value to 0 instead of product code just in case that the code
+  // over-classify a device.
+  // TODO(mukai): fix the code when we encounter a vendor which doesn't put
+  // display name but distinguish them by product code.

[oshima, 2013/05/21 21:53:31]

Actually, we can't use product code because we know it's not safe. It's better
to keep this way.

[Jun Mukai, 2013/05/22 00:28:05]

Done.

+  uint32 product_specific_code = product_name.empty() ?
+      0 : base::Hash(product_name);
+  if (manufacturer_id != 0) {
     // An ID based on display's index will be assigned later if this call
     // fails.
-    *display_id_out = GetID(manufacturer_id, product_code, output_index);
+    *display_id_out = GetID(
+        manufacturer_id, product_specific_code, output_index);
     return true;
   }
   return false;
 }
 
 bool ParseOutputDeviceData(const unsigned char* prop,
                            unsigned long nitems,
                            uint16* manufacturer_id,
                            uint16* product_code,

[oshima, 2013/05/21 21:53:31]

and if that's the case, we no longer need to parse product_code?

[Jun Mukai, 2013/05/22 00:28:05]

Done.

                            std::string* human_readable_name) {
   // See http://en.wikipedia.org/wiki/Extended_display_identification_data
   // for the details of EDID data format.  We use the following data:
   //   bytes 8-9: manufacturer EISA ID, in big-endian
   //   bytes 10-11: represents product code, in little-endian
   //   bytes 54-125: four descriptors (18-bytes each) which may contain
   //     the display name.
   const unsigned int kManufacturerOffset = 8;
   const unsigned int kManufacturerLength = 2;
   const unsigned int kProductCodeOffset = 10;
@@ skipping 161 matching lines @@
   }
 
   return false;
 }
 
 bool IsInternalOutputName(const std::string& name) {
   return name.find(kInternal_LVDS) == 0 || name.find(kInternal_eDP) == 0;
 }
 
 }  // namespace chromeos