hwc: Enable single layer NV12 DSS composition

In the case of single NV12 layer, assign it to overlay plane and setup
primary plane with a dummy buffer.

Change-Id: Ib951621f5a7ed04616e32f8193d91183548a3dbc
Signed-off-by: Gowtham Tammana <g-tammana@ti.com>

2 files changed, 25 insertions, 3 deletions

diff --git a/hwcomposer/display.c b/hwcomposer/display.c
index 7641098..b58d3f9 100644
--- a/hwcomposer/display.c
+++ b/hwcomposer/display.c
@@ -320,6 +320,9 @@ bool can_dss_render_all_layers(omap_hwc_device_t *hwc_dev, int disp)
     if (disp)
         return false;
 
+    if (!display->disp_link.is_crtc_set)
+        return false;
+
     if (layer_stats->bgr)
         return false;
 
@@ -1204,6 +1207,20 @@ static int display_configure_pipes(display_t *display)
             }
         }
     }
+    if (comp->used_ovls == 1 && display->layer_stats.nv12) {
+        plane_info = &comp->plane_info[comp->ovl_indices[1]];
+        plane_info->crtc_w = kdisp->dummy_fb.width;
+        plane_info->crtc_h = kdisp->dummy_fb.height;
+        plane_info->src_w = kdisp->dummy_fb.width;
+        plane_info->src_h = kdisp->dummy_fb.height;
+        plane_info->zorder = 0;
+        err = set_plane_properties(kdisp->atomic_req,
+                plane_info, &kdisp->dummy_fb);
+        if (err) {
+            ALOGE("Failed to configure pipe with dummy fb (%s)",
+                    strerror(err));
+        }
+    }
     return err;
 }
 
diff --git a/hwcomposer/hwc.c b/hwcomposer/hwc.c
index be7a829..532a159 100644
--- a/hwcomposer/hwc.c
+++ b/hwcomposer/hwc.c
@@ -160,7 +160,7 @@ static void hwc_check_dss_composition(omap_hwc_device_t *hwc_dev, int disp)
     hwc_layer_1_t *layer = NULL;
     uint32_t i, j;
 
-    if (disp || list->numHwLayers <= 2 || comp->use_blitter)
+    if (disp || list->numHwLayers == 1 || comp->use_blitter)
         return;
 
     if (!property_get_bool("persist.hwc.dss.comp", 1))
@@ -254,8 +254,13 @@ static int hwc_prepare_for_display(omap_hwc_device_t *hwc_dev, int disp)
             /* GFX pipe cannot handle NV12, swap out if layer[0] is NV12,
              * assuming second is non-NV12. FIXME
              */
-            adjust_drm_plane_to_layer(&list->hwLayers[0], 0, &comp->plane_info[1]);
-            adjust_drm_plane_to_layer(&list->hwLayers[1], 1, &comp->plane_info[0]);
+            if (comp->used_ovls > 1) {
+                adjust_drm_plane_to_layer(&list->hwLayers[0], 0, &comp->plane_info[1]);
+                adjust_drm_plane_to_layer(&list->hwLayers[1], 1, &comp->plane_info[0]);
+            } else {
+                adjust_drm_plane_to_layer(&list->hwLayers[0], 1, &comp->plane_info[1]);
+                reset_drm_plane(&comp->plane_info[0]);
+            }
             comp->ovl_indices[0] = 1;
             comp->ovl_indices[1] = 0;
         }