[6/8][Ozone-Drm] Fix lookup for DRM property values

ui/ozone/platform/drm/gpu/drm_gpu_display_manager.cc

 // Copyright 2014 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 "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_descriptor_posix.h"
 #include "base/files/file.h"
@@ skipping 329 matching lines @@
     return false;
   }
 
   ScopedDrmPropertyPtr hdcp_property(
       output.drm()->GetProperty(connector.get(), kContentProtection));
   if (!hdcp_property) {
     PLOG(ERROR) << "'" << kContentProtection << "' property doesn't exist.";
     return false;
   }
 
-  DCHECK_LT(static_cast<int>(hdcp_property->prop_id), connector->count_props);
-  int hdcp_state_idx = connector->prop_values[hdcp_property->prop_id];
-  DCHECK_LT(hdcp_state_idx, hdcp_property->count_enums);
+  std::string name;
+  for (int prop_idx = 0; prop_idx < connector->count_props; ++prop_idx) {

[spang, 2015/03/26 17:56:29]

Please factor out the property search.

[dnicoara, 2015/04/14 21:57:17]

Done.

+    if (connector->props[prop_idx] != hdcp_property->prop_id)
+      continue;
 
-  std::string name(hdcp_property->enums[hdcp_state_idx].name);
+    for (int enum_idx = 0; enum_idx < hdcp_property->count_enums; ++enum_idx) {

[spang, 2015/03/26 17:56:29]

It'll be a lot clearer if you do.

drm_mode_property_enum* property_enum = hdcp_property->enums[enum_idx];

[dnicoara, 2015/04/14 21:57:17]

Done.

+      if (hdcp_property->enums[enum_idx].value ==
+          connector->prop_values[prop_idx]) {
+        name = hdcp_property->enums[enum_idx].name;
+        break;
+      }
+    }
+
+    break;
+  }
+
   for (size_t i = 0; i < arraysize(kContentProtectionStates); ++i) {
     if (name == kContentProtectionStates[i].name) {
       *state = kContentProtectionStates[i].state;
       VLOG(3) << "HDCP state: " << *state << " (" << name << ")";
       return true;
     }
   }
 
   LOG(ERROR) << "Unknown content protection value '" << name << "'";
   return false;
@@ skipping 41 matching lines @@
 
     if (it == old_displays.end()) {
       screen_manager_->AddDisplayController(new_displays[i]->drm(),
                                             new_displays[i]->crtc(),
                                             new_displays[i]->connector());
     }
   }
 }
 
 }  // namespace ui