Revert of ozone/drm: Only reuse ScanoutBuffers with compatible modifiers

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

Index: ui/ozone/platform/drm/gpu/gbm_buffer.cc
diff --git a/ui/ozone/platform/drm/gpu/gbm_buffer.cc b/ui/ozone/platform/drm/gpu/gbm_buffer.cc
index 67238740d5b97af29265dfde111d09a6d9807017..dff2d96b234c136d4bca99760c71942f79a5c67c 100644
--- a/ui/ozone/platform/drm/gpu/gbm_buffer.cc
+++ b/ui/ozone/platform/drm/gpu/gbm_buffer.cc
@@ -81,6 +81,11 @@
 size_t GbmBuffer::GetSize(size_t index) const {
   DCHECK_LT(index, planes_.size());
   return planes_[index].size;
+}
+
+uint64_t GbmBuffer::GetFormatModifier(size_t index) const {
+  DCHECK_LT(index, planes_.size());
+  return planes_[index].modifier;
 }
 
 // TODO(reveman): This should not be needed once crbug.com/597932 is fixed,
@@ -245,7 +250,7 @@
     }
     handle.planes.emplace_back(buffer_->GetStride(i), buffer_->GetOffset(i),
                                buffer_->GetSize(i),
-                               buffer_->GetFormatModifier());
+                               buffer_->GetFormatModifier(i));
   }
   return handle;
 }
@@ -278,7 +283,7 @@
 }
 
 uint64_t GbmPixmap::GetDmaBufModifier(size_t plane) const {
-  return buffer_->GetFormatModifier();
+  return buffer_->GetFormatModifier(plane);
 }
 
 gfx::BufferFormat GbmPixmap::GetBufferFormat() const {