Revert "ozone: drm: Emulate per-CRTC color transform matrix"

This reverts commit fe99bbd3.

Reason for revert: broken on Kevin device (https://crbug.com/839672 )

Original change's description:
> ozone: drm: Emulate per-CRTC color transform matrix
> 
> On some devices we don't have a per-CRTC color transform matrix,
> but we do have a per-plane CTM that is currently not used.
> 
> This CL emulates a per-crtc CTM on those devices.
> 
> Bug: 749250
> Test: Night light on RK3399
> Change-Id: Id5135e00e72085b7890426dca7688d34cf6759f7
> Reviewed-on: https://chromium-review.googlesource.com/1037403
> Commit-Queue: Daniele Castagna <dcastagna@chromium.org>
> Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
> Reviewed-by: Miguel Casas <mcasas@chromium.org>
> Reviewed-by: Daniel Nicoara <dnicoara@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#555571}

TBR=dnicoara@chromium.org,mcasas@chromium.org,dcastagna@chromium.org,afakhry@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 749250
Change-Id: I10649350317ccab3dc3d10950e5245578716d033
Reviewed-on: https://chromium-review.googlesource.com/1043228Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555969}

ui/ozone/platform/drm/common/drm_util.cc

@@ -193,18 +193,16 @@ int ConnectorIndex(int device_index, int display_index) {
   return ((device_index << 4) + display_index) & 0xFF;
 }
 
-bool HasPerPlaneColorCorrectionMatrix(const int fd, drmModeCrtc* crtc) {
-  ScopedDrmPlaneResPtr plane_resources(drmModeGetPlaneResources(fd));
-  DCHECK(plane_resources);
-  for (uint32_t i = 0; i < plane_resources->count_planes; ++i) {
-    ScopedDrmObjectPropertyPtr plane_props(drmModeObjectGetProperties(
-        fd, plane_resources->planes[i], DRM_MODE_OBJECT_PLANE));
-    DCHECK(plane_props);
-
-    if (!FindDrmProperty(fd, plane_props.get(), "PLANE_CTM"))
-      return false;
+bool HasColorCorrectionMatrix(int fd, drmModeCrtc* crtc) {
+  ScopedDrmObjectPropertyPtr crtc_props(
+      drmModeObjectGetProperties(fd, crtc->crtc_id, DRM_MODE_OBJECT_CRTC));
+
+  for (uint32_t i = 0; i < crtc_props->count_props; ++i) {
+    ScopedDrmPropertyPtr property(drmModeGetProperty(fd, crtc_props->props[i]));
+    if (property && !strcmp(property->name, "CTM"))
+      return true;
   }
-  return true;
+  return false;
 }
 
 bool AreDisplayModesEqual(const DisplayMode_Params& lhs,
@@ -215,23 +213,6 @@ bool AreDisplayModesEqual(const DisplayMode_Params& lhs,
 
 }  // namespace
 
-ScopedDrmPropertyPtr FindDrmProperty(int fd,
-                                     drmModeObjectProperties* properties,
-                                     const char* name) {
-  for (uint32_t i = 0; i < properties->count_props; ++i) {
-    ScopedDrmPropertyPtr property(drmModeGetProperty(fd, properties->props[i]));
-    if (property && !strcmp(property->name, name))
-      return property;
-  }
-  return nullptr;
-}
-
-bool HasColorCorrectionMatrix(int fd, drmModeCrtc* crtc) {
-  ScopedDrmObjectPropertyPtr crtc_props(
-      drmModeObjectGetProperties(fd, crtc->crtc_id, DRM_MODE_OBJECT_CRTC));
-  return !!FindDrmProperty(fd, crtc_props.get(), "CTM");
-}
-
 DisplayMode_Params GetDisplayModeParams(const display::DisplayMode& mode) {
   DisplayMode_Params params;
   params.size = mode.size();
@@ -415,8 +396,7 @@ std::unique_ptr<display::DisplaySnapshot> CreateDisplaySnapshot(
   const bool is_aspect_preserving_scaling =
       IsAspectPreserving(fd, info->connector());
   const bool has_color_correction_matrix =
-      HasColorCorrectionMatrix(fd, info->crtc()) ||
-      HasPerPlaneColorCorrectionMatrix(fd, info->crtc());
+      HasColorCorrectionMatrix(fd, info->crtc());
   const gfx::Size maximum_cursor_size = GetMaximumCursorSize(fd);
 
   std::string display_name;

ui/ozone/platform/drm/common/drm_util.h

@@ -106,12 +106,6 @@ int GetFourCCFormatForOpaqueFramebuffer(gfx::BufferFormat format);
 
 gfx::Size GetMaximumCursorSize(int fd);
 
-ScopedDrmPropertyPtr FindDrmProperty(int fd,
-                                     drmModeObjectProperties* properties,
-                                     const char* name);
-
-bool HasColorCorrectionMatrix(int fd, drmModeCrtc* crtc);
-
 DisplayMode_Params GetDisplayModeParams(const display::DisplayMode& mode);
 
 std::unique_ptr<display::DisplayMode> CreateDisplayModeFromParams(

ui/ozone/platform/drm/common/scoped_drm_types.cc

@@ -55,11 +55,4 @@ void DrmFramebufferDeleter::operator()(drmModeFB* framebuffer) const {
   drmModeFreeFB(framebuffer);
 }
 
-ScopedDrmPropertyBlob::ScopedDrmPropertyBlob(int fd, uint32_t blob_id)
-    : fd(fd), blob_id(blob_id) {}
-
-ScopedDrmPropertyBlob::~ScopedDrmPropertyBlob() {
-  drmModeDestroyPropertyBlob(fd, blob_id);
-}
-
 }  // namespace ui

ui/ozone/platform/drm/common/scoped_drm_types.h

@@ -7,8 +7,6 @@
 
 #include <memory>
 
-#include "base/memory/free_deleter.h"
-
 typedef struct _drmModeConnector drmModeConnector;
 typedef struct _drmModeCrtc drmModeCrtc;
 typedef struct _drmModeEncoder drmModeEncoder;
@@ -20,8 +18,6 @@ typedef struct _drmModeProperty drmModePropertyRes;
 typedef struct _drmModeAtomicReq drmModeAtomicReq;
 typedef struct _drmModePropertyBlob drmModePropertyBlobRes;
 typedef struct _drmModeRes drmModeRes;
-typedef struct drm_color_lut drm_color_lut;
-typedef struct drm_color_ctm drm_color_ctm;
 
 namespace ui {
 
@@ -78,16 +74,6 @@ typedef std::unique_ptr<drmModePropertyBlobRes, DrmPropertyBlobDeleter>
 typedef std::unique_ptr<drmModeFB, DrmFramebufferDeleter>
     ScopedDrmFramebufferPtr;
 
-struct ScopedDrmPropertyBlob {
-  ScopedDrmPropertyBlob(int fd, uint32_t blob_id);
-  ~ScopedDrmPropertyBlob();
-  int fd;
-  uint32_t blob_id;
-};
-
-typedef std::unique_ptr<drm_color_lut, base::FreeDeleter> ScopedDrmColorLutPtr;
-typedef std::unique_ptr<drm_color_ctm, base::FreeDeleter> ScopedDrmColorCtmPtr;
-
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_COMMON_SCOPED_DRM_TYPES_H_

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

@@ -132,6 +132,8 @@ bool CanQueryForResources(int fd) {
   return !drmIoctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &resources);
 }
 
+using ScopedDrmColorLutPtr = std::unique_ptr<drm_color_lut, base::FreeDeleter>;
+using ScopedDrmColorCtmPtr = std::unique_ptr<drm_color_ctm, base::FreeDeleter>;
 
 ScopedDrmColorLutPtr CreateLutBlob(
     const std::vector<display::GammaRampRGBEntry>& source) {
@@ -692,25 +694,13 @@ bool DrmDevice::SetColorCorrection(
     const std::vector<display::GammaRampRGBEntry>& degamma_lut,
     const std::vector<display::GammaRampRGBEntry>& gamma_lut,
     const std::vector<float>& correction_matrix) {
-  const bool should_set_gamma_properties =
-      !degamma_lut.empty() || !gamma_lut.empty();
-
-  ScopedDrmCrtcPtr crtc(drmModeGetCrtc(file_.GetPlatformFile(), crtc_id));
-  // TODO(dcastagna): Precompute and cache the return value of
-  // HasColorCorrectionMatrix when we initialize DrmDevice.
-  // We currently assume that if a per-CRTC CTM is not available, per-plane
-  // CTMs will be. We can make this more explicit once we address this TODO.
-  if (!HasColorCorrectionMatrix(file_.GetPlatformFile(), crtc.get()) &&
-      !should_set_gamma_properties) {
-    return plane_manager_->SetColorCorrectionOnAllCrtcPlanes(
-        crtc_id, CreateCTMBlob(correction_matrix));
-  }
-
   ScopedDrmObjectPropertyPtr crtc_props(drmModeObjectGetProperties(
       file_.GetPlatformFile(), crtc_id, DRM_MODE_OBJECT_CRTC));
 
   // Extract only the needed properties.
   int max_num_properties_expected = 1;
+  const bool should_set_gamma_properties =
+      !degamma_lut.empty() || !gamma_lut.empty();
   if (should_set_gamma_properties)
     max_num_properties_expected += 4;
 

ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h

@@ -93,12 +93,6 @@ class HardwareDisplayPlaneManager {
   // plane_list->old_plane_list.
   virtual bool DisableOverlayPlanes(HardwareDisplayPlaneList* plane_list) = 0;
 
-  // Set the drm_color_ctm contained in |ctm_blob_data| to all planes' KMS
-  // states
-  virtual bool SetColorCorrectionOnAllCrtcPlanes(
-      uint32_t crtc_id,
-      ScopedDrmColorCtmPtr ctm_blob_data) = 0;
-
   // Check that the primary plane is valid for this
   // PlaneManager. Specifically, legacy can't support primary planes
   // that don't have the same size as the current mode of the crtc.

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

@@ -4,14 +4,10 @@
 
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h"
 
-#include <xf86drm.h>
-#include <xf86drmMode.h>
-
 #include "base/bind.h"
 #include "base/files/platform_file.h"
 #include "base/stl_util.h"
 #include "base/threading/sequenced_task_runner_handle.h"
-#include "ui/ozone/platform/drm/common/drm_util.h"
 #include "ui/ozone/platform/drm/gpu/crtc_controller.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_plane_atomic.h"
@@ -122,50 +118,6 @@ bool HardwareDisplayPlaneManagerAtomic::DisableOverlayPlanes(
   return ret;
 }
 
-bool HardwareDisplayPlaneManagerAtomic::SetColorCorrectionOnAllCrtcPlanes(
-    uint32_t crtc_id,
-    ScopedDrmColorCtmPtr ctm_blob_data) {
-  ScopedDrmAtomicReqPtr property_set(drmModeAtomicAlloc());
-  uint32_t blob_id = 0;
-  int fd = drm_->get_fd();
-  int ret = drmModeCreatePropertyBlob(fd, ctm_blob_data.get(),
-                                      sizeof(drm_color_ctm), &blob_id);
-  DCHECK(!ret && blob_id);
-  ScopedDrmPropertyBlob property_blob(fd, blob_id);
-
-  const int crtc_index = LookupCrtcIndex(crtc_id);
-  DCHECK_GE(crtc_index, 0);
-  const int crtc_bit = 1 << crtc_index;
-
-  ScopedDrmPlaneResPtr plane_resources(drmModeGetPlaneResources(fd));
-  DCHECK(plane_resources);
-  bool all_planes_ctm = true;
-  for (uint32_t i = 0; i < plane_resources->count_planes; ++i) {
-    ScopedDrmPlanePtr drm_plane(
-        drmModeGetPlane(fd, plane_resources->planes[i]));
-    DCHECK(drm_plane);
-
-    // This assumes planes can belong only to one crtc.
-    if (!(drm_plane->possible_crtcs & crtc_bit))
-      continue;
-    ScopedDrmObjectPropertyPtr plane_props(drmModeObjectGetProperties(
-        fd, plane_resources->planes[i], DRM_MODE_OBJECT_PLANE));
-    DCHECK(plane_props);
-    ScopedDrmPropertyPtr property(
-        FindDrmProperty(fd, plane_props.get(), "PLANE_CTM"));
-    if (property) {
-      int ret = drmModeAtomicAddProperty(
-          property_set.get(), plane_resources->planes[i], property->prop_id,
-          property_blob.blob_id);
-      LOG_IF(ERROR, ret < 0) << "Failed to set PLANE_CTM property.";
-    }
-    all_planes_ctm = all_planes_ctm && property;
-  }
-  drm_->CommitProperties(property_set.get(), DRM_MODE_ATOMIC_NONBLOCK, 0,
-                         DrmDevice::PageFlipCallback());
-  return all_planes_ctm;
-}
-
 bool HardwareDisplayPlaneManagerAtomic::ValidatePrimarySize(
     const OverlayPlane& primary,
     const drmModeModeInfo& mode) {

ui/ozone/platform/drm/gpu/hardware_display_plane_manager_atomic.h

@@ -22,10 +22,6 @@ class HardwareDisplayPlaneManagerAtomic : public HardwareDisplayPlaneManager {
               bool test_only) override;
   bool DisableOverlayPlanes(HardwareDisplayPlaneList* plane_list) override;
 
-  bool SetColorCorrectionOnAllCrtcPlanes(
-      uint32_t crtc_id,
-      ScopedDrmColorCtmPtr ctm_blob_data) override;
-
   bool ValidatePrimarySize(const OverlayPlane& primary,
                            const drmModeModeInfo& mode) override;
 

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

@@ -131,14 +131,6 @@ bool HardwareDisplayPlaneManagerLegacy::DisableOverlayPlanes(
   return true;
 }
 
-bool HardwareDisplayPlaneManagerLegacy::SetColorCorrectionOnAllCrtcPlanes(
-    uint32_t crtc_id,
-    ScopedDrmColorCtmPtr ctm_blob_data) {
-  NOTREACHED()
-      << "HardwareDisplayPlaneManagerLegacy doesn't support per plane CTM";
-  return false;
-}
-
 bool HardwareDisplayPlaneManagerLegacy::ValidatePrimarySize(
     const OverlayPlane& primary,
     const drmModeModeInfo& mode) {

ui/ozone/platform/drm/gpu/hardware_display_plane_manager_legacy.h

@@ -22,10 +22,6 @@ class HardwareDisplayPlaneManagerLegacy : public HardwareDisplayPlaneManager {
               bool test_only) override;
   bool DisableOverlayPlanes(HardwareDisplayPlaneList* plane_list) override;
 
-  bool SetColorCorrectionOnAllCrtcPlanes(
-      uint32_t crtc_id,
-      ScopedDrmColorCtmPtr ctm_blob_data) override;
-
   bool ValidatePrimarySize(const OverlayPlane& primary,
                            const drmModeModeInfo& mode) override;