diff options
author | Adrian Salido <salidoa@google.com> | 2017-08-24 19:50:49 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-24 19:50:49 +0000 |
commit | fa2a576c1176778b53ff3e203581e93b132e7971 (patch) | |
tree | 5638118cde6a9de26ec082db4ac89db320e69384 | |
parent | 3216ff8d56fb5b49f3ad4a4b623a37d584839ff3 (diff) | |
parent | 4e3352699419b5a002f4b23ceff7910a958ea43c (diff) | |
download | drm_hwcomposer-fa2a576c1176778b53ff3e203581e93b132e7971.tar.gz |
drm_hwcomposer: skip layers with non-premult blending am: 329e7682c6 am: 56a3fe4fcd am: 5ecd39be96 am: cca0ee2b3f
am: 4e33526994
Change-Id: Ica3d8f6aef144729913029229c496800a8f6b7c2
-rw-r--r-- | platformnv.cpp | 15 | ||||
-rw-r--r-- | platformnv.h | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/platformnv.cpp b/platformnv.cpp index d3e5d70..e680981 100644 --- a/platformnv.cpp +++ b/platformnv.cpp @@ -286,7 +286,7 @@ int PlanStageProtectedRotated::ProvisionPlanes( return 0; } -bool PlanStageNvLimits::CheckLayer(DrmHwcLayer *layer) { +bool PlanStageNvLimits::CheckLayer(size_t zorder, DrmHwcLayer *layer) { auto src_w = layer->source_crop.width(); auto src_h = layer->source_crop.height(); auto dst_w = layer->display_frame.width(); @@ -295,6 +295,17 @@ bool PlanStageNvLimits::CheckLayer(DrmHwcLayer *layer) { int v_limit; switch (layer->buffer->format) { + case DRM_FORMAT_ARGB8888: + case DRM_FORMAT_ABGR8888: + case DRM_FORMAT_XBGR8888: + // tegra driver assumes any layer with alpha channel has premult + // blending, avoid handling it this is not the case. This is not an + // issue for bottom-most layer since there's nothing to blend with + if (zorder > 0 && layer->blending != DrmHwcBlending::kPreMult) + return false; + + v_limit = 2; + break; case DRM_FORMAT_YVU420: case DRM_FORMAT_BGR565: v_limit = 4; @@ -323,7 +334,7 @@ int PlanStageNvLimits::ProvisionPlanes( for (auto i = layers.begin(); i != layers.end();) { // Skip layer if supported - if (CheckLayer(i->second)) { + if (CheckLayer(i->first, i->second)) { i++; continue; } diff --git a/platformnv.h b/platformnv.h index 3c1f49e..7e2784f 100644 --- a/platformnv.h +++ b/platformnv.h @@ -83,7 +83,7 @@ class PlanStageNvLimits : public Planner::PlanStage { std::map<size_t, DrmHwcLayer *> &layers, DrmCrtc *crtc, std::vector<DrmPlane *> *planes); protected: - bool CheckLayer(DrmHwcLayer *layer); + bool CheckLayer(size_t zorder, DrmHwcLayer *layer); }; } |