Promoting two videos to overlays on some latest Intel platforms

Some latest Intel platforms(Icelake, Tigerlake) support two yuv MPO
planes. This CL add a workaround to promote two video quads to overlays
on Intel platforms. Previous test has showed this will benefit power
consumption when playing two videos simultaneously.

Bug: 1105618
Change-Id: I5fc44a5064d371a2fdad97dc63068c328ed55a46
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2592629Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Maggie Chen <magchen@chromium.org>
Commit-Queue: Richard Li <richard.li@intel.com>
Cr-Commit-Position: refs/heads/master@{#837928}

components/viz/service/display/dc_layer_overlay.cc

@@ -660,23 +660,21 @@ void DCLayerOverlayProcessor::Process(
 
     candidate_index_list.push_back(index);
   }
-  // A YUV quad might be rejected later due to not allowed as an underlay.
-  // Recount the YUV overlays when they are added to the overlay list
-  // successfully.
-  processed_yuv_overlay_count_ = 0;
 
-  // TODO(magchen@): Revisit this code if allowed_yuv_overlay_count_ > 1.
-  // We might not save power if there are more than one videos and only one is
-  // promoted to overlay. Skip overlays for this frame unless there are
+  // We might not save power if there are more than one videos and only part of
+  // them are promoted to overlay. Skip overlays for this frame unless there are
   // protected video or texture overlays.
-  if (candidate_index_list.size() > 0 &&
-      yuv_quads_in_quad_list > allowed_yuv_overlay_count_ &&
+  bool reject_overlays = false;
+  if (yuv_quads_in_quad_list != processed_yuv_overlay_count_ &&
       !has_protected_video_or_texture_overlays) {
-    candidate_index_list.clear();
-    // In this case, there is only one candidate in the list.
-    RecordDCLayerResult(DC_LAYER_FAILED_TOO_MANY_OVERLAYS, prev_it);
+    reject_overlays = true;
   }
 
+  // A YUV quad might be rejected later due to not allowed as an underlay.
+  // Recount the YUV overlays when they are added to the overlay list
+  // successfully.
+  processed_yuv_overlay_count_ = 0;
+
   // Copy the overlay quad info to dc_layer_overlays and replace/delete overlay
   // quads in quad_list.
   for (auto index : candidate_index_list) {
@@ -684,6 +682,10 @@ void DCLayerOverlayProcessor::Process(
     prev_it = it;
     prev_index = index;
 
+    if (reject_overlays) {
+      RecordDCLayerResult(DC_LAYER_FAILED_TOO_MANY_OVERLAYS, it);
+      continue;
+    }
     gfx::Rect quad_rectangle_in_target_space =
         gfx::ToEnclosingRect(ClippedQuadRectangle(*it));
 

components/viz/service/display/dc_layer_overlay.h

@@ -161,7 +161,6 @@ class VIZ_SERVICE_EXPORT DCLayerOverlayProcessor
 
   bool has_overlay_support_;
   const bool use_overlay_damage_list_;
-  // TODO(magchen@): We are going to support more than one YUV overlay.
   const int allowed_yuv_overlay_count_;
   int processed_yuv_overlay_count_ = 0;
 

components/viz/service/display/output_surface.h

@@ -115,6 +115,9 @@ class VIZ_SERVICE_EXPORT OutputSurface {
     int max_render_target_size = 0;
     // The root surface is rendered using vulkan secondary command buffer.
     bool root_is_vulkan_secondary_command_buffer = false;
+    // Some new Intel GPUs support two YUV MPO planes. Promoting two videos
+    // to hardware overlays in these platforms will benefit power consumption.
+    bool supports_two_yuv_hardware_overlays = false;
 
     // SkColorType for all supported buffer formats.
     SkColorType sk_color_types[static_cast<int>(gfx::BufferFormat::LAST) + 1] =

components/viz/service/display/overlay_processor_interface.cc

@@ -98,8 +98,12 @@ OverlayProcessorInterface::CreateOverlayProcessor(
     return std::make_unique<OverlayProcessorStub>();
 
   return std::make_unique<OverlayProcessorWin>(
-      output_surface, std::make_unique<DCLayerOverlayProcessor>(
-                          debug_settings, /*allowed_yuv_overlay_count=*/1));
+      output_surface,
+      std::make_unique<DCLayerOverlayProcessor>(
+          debug_settings, /*allowed_yuv_overlay_count=*/capabilities
+                                  .supports_two_yuv_hardware_overlays
+                              ? 2
+                              : 1));
 #elif defined(USE_OZONE)
   if (!features::IsUsingOzonePlatform())
     return std::make_unique<OverlayProcessorStub>();

components/viz/service/display_embedder/skia_output_device_gl.cc

@@ -132,6 +132,9 @@ SkiaOutputDeviceGL::SkiaOutputDeviceGL(
   if (feature_info->workarounds().force_rgb10a2_overlay_support_flags) {
     capabilities_.forces_rgb10a2_overlay_support_flags = true;
   }
+  if (feature_info->workarounds().supports_two_yuv_hardware_overlays) {
+    capabilities_.supports_two_yuv_hardware_overlays = true;
+  }
   capabilities_.max_frames_pending = gl_surface_->GetBufferCount() - 1;
   capabilities_.supports_commit_overlay_planes =
       gl_surface_->SupportsCommitOverlayPlanes();

gpu/config/gpu_driver_bug_list.json

@@ -3644,6 +3644,21 @@
       "features": [
         "disable_accelerated_vp9_profile2_decode"
       ]
+    },
+    {
+      "id": 362,
+      "description": "Promote 2 videos to hardware overlays on Windows Intel platforms",
+      "cr_bugs": [1105618],
+      "os": {
+        "type": "win"
+      },
+      "intel_gpu_series": [
+        "icelake",
+        "tigerlake"
+      ],
+      "features": [
+        "supports_two_yuv_hardware_overlays"
+      ]
     }
   ]
 }

gpu/config/gpu_workaround_list.txt

@@ -110,6 +110,7 @@ round_down_uniform_bind_buffer_range_size
 scalarize_vec_and_mat_constructor_args
 set_zero_level_before_generating_mipmap
 simulate_out_of_memory_on_large_textures
+supports_two_yuv_hardware_overlays
 unbind_attachments_on_bound_render_fbo_delete
 unbind_egl_context_to_flush_driver_caches
 unbind_fbo_on_context_switch