LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "hwc2: Add support for Secure Display"

Browse Source
This commit is contained in:
Linux Build Service Account
2017-10-02 12:18:04 -07:00
committed by Gerrit - the friendly Code Review server
parent 87ce4f1a99 46a1bee9ab
commit ddb2218d71
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sdm/libs/hwc2/hwc_display.cpp
View File

@@ -462,6 +462,7 @@ void HWCDisplay::BuildLayerStack() {
display_rect_ = LayerRect(); display_rect_ = LayerRect();
metadata_refresh_rate_ = 0; metadata_refresh_rate_ = 0;
auto working_primaries = ColorPrimaries_BT709_5; auto working_primaries = ColorPrimaries_BT709_5;
bool secure_display_active = false;
// Add one layer for fb target // Add one layer for fb target
// TODO(user): Add blit target layers // TODO(user): Add blit target layers
@@ -520,6 +521,10 @@ void HWCDisplay::BuildLayerStack() {
layer_stack_.flags.skip_present = true; layer_stack_.flags.skip_present = true;
} }
if (layer->input_buffer.flags.secure_display) {
secure_display_active = true;
}
if (hwc_layer->GetClientRequestedCompositionType() == HWC2::Composition::Cursor) { if (hwc_layer->GetClientRequestedCompositionType() == HWC2::Composition::Cursor) {
// Currently we support only one HWCursor & only at top most z-order // Currently we support only one HWCursor & only at top most z-order
if ((*layer_set_.rbegin())->GetId() == hwc_layer->GetId()) { if ((*layer_set_.rbegin())->GetId() == hwc_layer->GetId()) {
@@ -599,6 +604,8 @@ void HWCDisplay::BuildLayerStack() {
// Must fall back to client composition // Must fall back to client composition
MarkLayersForClientComposition(); MarkLayersForClientComposition();
} }
// set secure display
SetSecureDisplay(secure_display_active);
} }
void HWCDisplay::BuildSolidFillStack() { void HWCDisplay::BuildSolidFillStack() {
@@ -1844,7 +1851,12 @@ int HWCDisplay::GetVisibleDisplayRect(hwc_rect_t *visible_rect) {
} }
void HWCDisplay::SetSecureDisplay(bool secure_display_active) { void HWCDisplay::SetSecureDisplay(bool secure_display_active) {
if (secure_display_active_ != secure_display_active) {
DLOGI("SecureDisplay state changed from %d to %d Needs Flush!!", secure_display_active_,
secure_display_active);
secure_display_active_ = secure_display_active; secure_display_active_ = secure_display_active;
skip_prepare_ = true;
}
return; return;
} }