summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGowtham Tammana <g-tammana@ti.com>2016-07-08 15:58:43 -0500
committerVishal Mahaveer <vishalm@ti.com>2016-07-08 16:45:24 -0500
commit74de7c09167a5ae73c50362a65c2b708d93584b1 (patch)
tree89649ad345048411a48402c4d91344ee32a050b4
parent9484ff0277c3c5938e0ca9d02cf59a00fb2157b3 (diff)
downloaddra7xx-74de7c09167a5ae73c50362a65c2b708d93584b1.tar.gz
hwc: [temp] disable dss composition
some of the API, eg. drmModeObjectSetPlane(), is not functional in omapdrm module of libdrm-2.4.67. Disabling DSS path until its fixed. Change-Id: Id4df121a0fd5ee87df6068869e91192191153c50 Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
-rw-r--r--hwcomposer/display.c3
-rw-r--r--hwcomposer/hwc.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/hwcomposer/display.c b/hwcomposer/display.c
index c4bd7e2..eddb716 100644
--- a/hwcomposer/display.c
+++ b/hwcomposer/display.c
@@ -255,6 +255,8 @@ bool can_dss_render_all_layers(omap_hwc_device_t *hwc_dev, int disp)
bool support_bgr = is_lcd_display(hwc_dev, disp);
bool tform = false;
+ return false;
+#if 0
return !hwc_dev->force_sgx &&
/* Must have at least one layer if using composition bypass to get sync object */
layer_stats->composable &&
@@ -271,6 +273,7 @@ bool can_dss_render_all_layers(omap_hwc_device_t *hwc_dev, int disp)
(support_bgr && !layer_stats->nv12)) || !hwc_dev->flags_rgb_order) &&
/* If nv12_only flag is set DSS should only render NV12 */
(!hwc_dev->flags_nv12_only || (layer_stats->bgr == 0 && layer_stats->rgb == 0));
+#endif
}
bool can_dss_render_layer(omap_hwc_device_t *hwc_dev, int disp, hwc_layer_1_t *layer)
diff --git a/hwcomposer/hwc.c b/hwcomposer/hwc.c
index 83e0d46..5344a53 100644
--- a/hwcomposer/hwc.c
+++ b/hwcomposer/hwc.c
@@ -240,7 +240,8 @@ static int hwc_prepare_for_display(omap_hwc_device_t *hwc_dev, int disp)
for (i = 0; i < list->numHwLayers; i++) {
hwc_layer_1_t *layer = &list->hwLayers[i];
- if (hwc_dev->num_ovls < comp->avail_ovls && layer->handle &&
+
+ if (hwc_dev->num_ovls < comp->avail_ovls && layer->handle && 0 &&
(disp == HWC_DISPLAY_PRIMARY) && is_nv12_layer(layer) && !comp->use_sgx &&
can_dss_render_layer(hwc_dev, disp, layer) &&
(!hwc_dev->force_sgx ||