[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 71 matching lines @@
   explicit FindByDevicePath(const base::FilePath& path) : path_(path) {}
 
   bool operator()(const scoped_refptr<DrmDevice>& device) {
     return device->device_path() == path_;
   }
 
  private:
   base::FilePath path_;
 };
 
+std::string GetEnumNameForProperty(drmModeConnector* connector,
+                                   drmModePropertyRes* property) {
+  for (int prop_idx = 0; prop_idx < connector->count_props; ++prop_idx) {
+    if (connector->props[prop_idx] != property->prop_id)
+      continue;
+
+    for (int enum_idx = 0; enum_idx < property->count_enums; ++enum_idx) {
+      const drm_mode_property_enum& property_enum = property->enums[enum_idx];
+      if (property_enum.value == connector->prop_values[prop_idx])
+        return property_enum.name;
+    }
+  }
+
+  NOTREACHED();
+  return std::string();
+}
+
 }  // namespace
 
 DrmGpuDisplayManager::DrmGpuDisplayManager(
     ScreenManager* screen_manager,
     const scoped_refptr<DrmDevice>& primary_device,
     scoped_ptr<DrmDeviceGenerator> drm_device_generator)
     : screen_manager_(screen_manager),
       drm_device_generator_(drm_device_generator.Pass()) {
   devices_.push_back(primary_device);
 }
@@ skipping 226 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(hdcp_property->enums[hdcp_state_idx].name);
+  std::string name =
+      GetEnumNameForProperty(connector.get(), hdcp_property.get());
   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