Gfx release ww30

common/compositor/gl/glprogram.cpp

@@ -301,6 +301,7 @@ GLProgram::GLProgram()
       alpha_loc_(0),
       premult_loc_(0),
       tex_matrix_loc_(0),
+      solid_color_loc_(0),
       initialized_(false) {
 }
 

common/core/gpudevice.cpp

@@ -399,9 +399,9 @@ void GpuDevice::ParseLogicalDisplaySetting(
   if (logical_split_str.empty() ||
       logical_split_str.find_first_not_of("0123456789") != std::string::npos)
     return;
-  uint32_t physical_index = atoi(physical_index_str.c_str());
-  if (physical_index < 0)
+  if (physical_index_str.length() > 1)
     return;
+  uint32_t physical_index = atoi(physical_index_str.c_str());
   uint32_t logical_split_num = atoi(logical_split_str.c_str());
   if (logical_split_num <= 1)
     return;

common/core/overlaylayer.cpp

@@ -571,7 +571,7 @@ void OverlayLayer::ValidatePreviousFrameState(OverlayLayer* rhs,
 
   if (!layer->HasVisibleRegionChanged() && !content_changed &&
       surface_damage_.empty() && !layer->HasLayerContentChanged() &&
-      !(state_ & kNeedsReValidation) && !force_content_changed_) {
+      !(state_ & kNeedsReValidation)) {
     state_ &= ~kLayerContentChanged;
   }
 }

common/core/overlaylayer.h

@@ -123,17 +123,11 @@ struct OverlayLayer {
   }
 
   const HwcRect<int>& GetSurfaceDamage() const {
-    if (force_content_changed_)
-      return display_frame_;
-    else
-      return surface_damage_;
+    return surface_damage_;
   }
 
   HwcRect<int>& GetSurfaceDamage() {
-    if (force_content_changed_)
-      return display_frame_;
-    else
-      return surface_damage_;
+    return surface_damage_;
   }
 
   uint32_t GetSourceCropWidth() const {
@@ -258,10 +252,6 @@ struct OverlayLayer {
   void CloneLayer(const OverlayLayer* layer, const HwcRect<int>& display_frame,
                   ResourceManager* resource_manager, uint32_t z_order);
 
-  void SetForceContentChanged() {
-    force_content_changed_ = true;
-  }
-
   void Dump();
 
  private:
@@ -316,7 +306,6 @@ struct OverlayLayer {
   uint32_t dataspace_ = 0;
 
   uint32_t solid_color_ = 0;
-  bool force_content_changed_ = false;
 
   HwcRect<float> source_crop_;
   HwcRect<int> display_frame_;

common/display/displayplanemanager.cpp

@@ -112,12 +112,28 @@ bool DisplayPlaneManager::ValidateLayers(
         OverlayPlane(temp.GetDisplayPlane(), temp.GetOverlayLayer()));
   }
 
+  size_t video_layers = 0;
+  for (size_t lindex = add_index; lindex < layers.size(); lindex++) {
+    if (layers[lindex].IsVideoLayer())
+      video_layers++;
+  }
+
   // In case we are forcing GPU composition for all layers and using a single
   // plane.
   if (disable_overlay) {
-    ISURFACETRACE("Forcing GPU For all layers %d %d %d %d \n", disable_overlay,
-                  composition.empty(), add_index <= 0, layers.size());
-    ForceGpuForAllLayers(commit_planes, composition, layers, mark_later, false);
+    if (!video_layers) {
+      ISURFACETRACE("Forcing GPU For all layers %d %d %d %d \n",
+                    disable_overlay, composition.empty(), add_index <= 0,
+                    layers.size());
+      ForceGpuForAllLayers(commit_planes, composition, layers, mark_later,
+                           false);
+    } else {
+      ISURFACETRACE("Forcing VPP For all layers %d %d %d %d \n",
+                    disable_overlay, composition.empty(), add_index <= 0,
+                    layers.size());
+      ForceVppForAllLayers(commit_planes, composition, layers, add_index,
+                           mark_later, false);
+    }
 
     *re_validation_needed = false;
     *commit_checked = true;
@@ -134,11 +150,6 @@ bool DisplayPlaneManager::ValidateLayers(
     j->get()->SetInUse(false);
   }
 
-  size_t video_layers = 0;
-  for (size_t lindex = add_index; lindex < layers.size(); lindex++) {
-    if (layers[lindex].IsVideoLayer())
-      video_layers++;
-  }
   size_t avail_planes = overlay_planes_.size() - composition.size();
   if (!(overlay_planes_[overlay_planes_.size() - 1]->IsUniversal()))
     avail_planes--;
@@ -393,7 +404,8 @@ bool DisplayPlaneManager::ValidateLayers(
   }
 
   if (validate_final_layers) {
-    ValidateFinalLayers(commit_planes, composition, layers, mark_later, false);
+    ValidateFinalLayers(commit_planes, composition, layers, mark_later, false,
+                        add_index);
     test_commit_done = true;
   }
 
@@ -734,11 +746,14 @@ void DisplayPlaneManager::SetDisplayTransform(uint32_t transform) {
 void DisplayPlaneManager::EnsureOffScreenTarget(DisplayPlaneState &plane) {
   NativeSurface *surface = NULL;
   // We only use media formats when video compostion for 1 layer
+  int dest_x = plane.GetDisplayFrame().left;
+  int dest_w = plane.GetDisplayFrame().right - dest_x;
+
   bool video_separate =
       plane.IsVideoPlane() && (plane.GetSourceLayers().size() == 1);
   uint32_t preferred_format = 0;
   uint32_t usage = hwcomposer::kLayerNormal;
-  if (video_separate) {
+  if (video_separate && !(dest_w % 2 || dest_x % 2)) {
     preferred_format = plane.GetDisplayPlane()->GetPreferredVideoFormat();
   } else {
     preferred_format = plane.GetDisplayPlane()->GetPreferredFormat();
@@ -773,6 +788,8 @@ void DisplayPlaneManager::EnsureOffScreenTarget(DisplayPlaneState &plane) {
     bool modifer_succeeded = false;
     new_surface->Init(resource_manager_, preferred_format, usage, modifier,
                       &modifer_succeeded);
+    if (video_separate)
+      new_surface->GetLayer()->SetVideoLayer(true);
 
     if (modifer_succeeded) {
       plane.GetDisplayPlane()->PreferredFormatModifierValidated();
@@ -791,17 +808,25 @@ void DisplayPlaneManager::EnsureOffScreenTarget(DisplayPlaneState &plane) {
 void DisplayPlaneManager::ValidateFinalLayers(
     std::vector<OverlayPlane> &commit_planes,
     DisplayPlaneStateList &composition, std::vector<OverlayLayer> &layers,
-    std::vector<NativeSurface *> &mark_later, bool recycle_resources) {
+    std::vector<NativeSurface *> &mark_later, bool recycle_resources,
+    size_t add_index) {
+  bool has_video = false;
   for (DisplayPlaneState &plane : composition) {
     if (plane.NeedsOffScreenComposition() && !plane.GetOffScreenTarget()) {
       EnsureOffScreenTarget(plane);
     }
+    if (!has_video && plane.IsVideoPlane())
+      has_video = true;
   }
 
   // If this combination fails just fall back to 3D for all layers.
   if (!plane_handler_->TestCommit(commit_planes)) {
-    ForceGpuForAllLayers(commit_planes, composition, layers, mark_later,
-                         recycle_resources);
+    if (!has_video)
+      ForceGpuForAllLayers(commit_planes, composition, layers, mark_later,
+                           recycle_resources);
+    else
+      ForceVppForAllLayers(commit_planes, composition, layers, add_index,
+                           mark_later, false);
   }
 }
 

common/display/displayplanemanager.h

@@ -133,7 +133,7 @@ class DisplayPlaneManager {
                            DisplayPlaneStateList &list,
                            std::vector<OverlayLayer> &layers,
                            std::vector<NativeSurface *> &mark_later,
-                           bool recycle_resources);
+                           bool recycle_resources, size_t add_index);
 
   void ResetPlaneTarget(DisplayPlaneState &plane, OverlayPlane &overlay_plane);
 

common/display/displayqueue.cpp

@@ -545,8 +545,6 @@ void DisplayQueue::InitializeOverlayLayers(
 
     layers.emplace_back();
     OverlayLayer* overlay_layer = &(layers.back());
-    if (refrsh_display_id_ > 0)
-      overlay_layer->SetForceContentChanged();
     OverlayLayer* previous_layer = NULL;
     if (previous_size > z_order) {
       previous_layer = &(in_flight_layers_.at(z_order));

os/android/gralloc1bufferhandler.cpp

@@ -149,16 +149,21 @@ bool Gralloc1BufferHandler::CreateBuffer(uint32_t w, uint32_t h, int format,
 
   set_format_(gralloc1_dvc, temp->gralloc1_buffer_descriptor_t_, pixel_format);
 #ifdef ENABLE_RBC
-  uint64_t modifier = 0;
-  if (set_modifier_) {
-    if (preferred_modifier != -1) {
-      modifier = preferred_modifier;
+  if (preferred_modifier != 0) {
+    uint64_t modifier = 0;
+    if (set_modifier_) {
+      if (preferred_modifier != -1) {
+        modifier = preferred_modifier;
+      }
+      set_modifier_(gralloc1_dvc, temp->gralloc1_buffer_descriptor_t_,
+                    modifier);
     }
-    set_modifier_(gralloc1_dvc, temp->gralloc1_buffer_descriptor_t_, modifier);
-  }
 
-  if (modifier_used && modifier != DRM_FORMAT_MOD_NONE) {
-    *modifier_used = true;
+    if (modifier_used && modifier != DRM_FORMAT_MOD_NONE) {
+      *modifier_used = true;
+    }
+  } else {
+    *modifier_used = false;
   }
 #else
   if (modifier_used) {