Reland: ash: reset color management when new screens are hotplugged

ui/ozone/platform/drm/gpu/drm_device.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_device.h"
 
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <unistd.h>
 #include <xf86drm.h>
@@ skipping 202 matching lines @@
   return ctm;
 }
 
 bool SetBlobProperty(int fd,
                      uint32_t object_id,
                      uint32_t object_type,
                      uint32_t prop_id,
                      const char* property_name,
                      unsigned char* data,
                      size_t length) {
-  uint32_t blob_id;
+  uint32_t blob_id = 0;
   int res;
-  res = CreatePropertyBlob(fd, data, length, &blob_id);
-  if (res != 0) {
-    LOG(ERROR) << "Error creating property blob: " << base::safe_strerror(res)
-               << " for property " << property_name;
-    return false;
+
+  if (data) {
+    res = CreatePropertyBlob(fd, data, length, &blob_id);
+    if (res != 0) {
+      LOG(ERROR) << "Error creating property blob: " << base::safe_strerror(res)
+                 << " for property " << property_name;
+      return false;
+    }
   }
+
+  bool success = false;
   res = drmModeObjectSetProperty(fd, object_id, object_type, prop_id, blob_id);
   if (res != 0) {
     LOG(ERROR) << "Error updating property: " << base::safe_strerror(res)
                << " for property " << property_name;
+  } else {
+    success = true;
+  }
+  if (blob_id != 0)
     DestroyPropertyBlob(fd, blob_id);
-    return false;
-  }
-  DestroyPropertyBlob(fd, blob_id);
-  return true;
+  return success;
 }
 
 std::vector<GammaRampRGBEntry> ResampleLut(
     const std::vector<GammaRampRGBEntry>& lut_in,
     size_t desired_size) {
   TRACE_EVENT1("drm", "ResampleLut", "desired_size", desired_size);
   if (lut_in.size() == desired_size)
     return lut_in;
 
   std::vector<GammaRampRGBEntry> result;
@@ skipping 471 matching lines @@
 
     if (degamma_lut_size && gamma_lut_size)
       break;
   }
 
   if (degamma_lut_size == 0 || gamma_lut_size == 0) {
     LOG(WARNING) << "No available (de)gamma tables.";
     return false;
   }
 
-  ScopedDrmColorLutPtr degamma_blob_data =
-      CreateLutBlob(ResampleLut(degamma_lut, degamma_lut_size));
-  ScopedDrmColorLutPtr gamma_blob_data =
-      CreateLutBlob(ResampleLut(gamma_lut, gamma_lut_size));
-  ScopedDrmColorCtmPtr ctm_blob_data = CreateCTMBlob(correction_matrix);
+  ScopedDrmColorLutPtr degamma_blob_data;
+  if (!degamma_lut.empty()) {
+    degamma_blob_data =
+        CreateLutBlob(ResampleLut(degamma_lut, degamma_lut_size));

[robert.bradford, 2016/04/27 12:29:46]

Is there any way to put this into CreateLutBlob/CreateCTMBlob instead?

+  }
+  ScopedDrmColorLutPtr gamma_blob_data;
+  if (!gamma_lut.empty())
+    gamma_blob_data = CreateLutBlob(ResampleLut(gamma_lut, gamma_lut_size));
+  ScopedDrmColorCtmPtr ctm_blob_data;
+  if (!correction_matrix.empty())
+    ctm_blob_data = CreateCTMBlob(correction_matrix);
 
   for (uint32_t i = 0; i < crtc_props->count_props; ++i) {
     ScopedDrmPropertyPtr property(
         drmModeGetProperty(file_.GetPlatformFile(), crtc_props->props[i]));
     if (!property)
       continue;
 
     if (!strcmp(property->name, "DEGAMMA_LUT")) {
       if (!SetBlobProperty(
               file_.GetPlatformFile(), crtc_id, DRM_MODE_OBJECT_CRTC,
@@ skipping 17 matching lines @@
               reinterpret_cast<unsigned char*>(ctm_blob_data.get()),
               sizeof(DrmColorCtm)))
         return false;
     }
   }
 
   return true;
 }
 
 }  // namespace ui