diff options
| author | Naseer Ahmed <naseer@codeaurora.org> | 2017-06-23 18:05:39 -0400 |
|---|---|---|
| committer | Ed Tam <etam@google.com> | 2017-06-23 18:31:16 -0700 |
| commit | 26aafb60e046be29f92ecde9548e5612e8c029eb (patch) | |
| tree | f798c4293a7e5ebc748e7258e97bb94b829d627f | |
| parent | b1c242f15af8b42c4c6cbafda78d22d0360c6dc8 (diff) | |
| download | platform_hardware_qcom_display-oreo-dev.tar.gz platform_hardware_qcom_display-oreo-dev.tar.bz2 platform_hardware_qcom_display-oreo-dev.zip | |
hwc2: Reset layer flags in SetLayerBufferoreo-dev
Bug: 36511863
Test: Verified with demo-noExtensions-debug.apk, YouTube
Change-Id: I0e3fcffebfcc41943b0830abcbb5c32249fe3d6d
| -rw-r--r-- | msm8996/sdm/libs/hwc2/hwc_display.cpp | 1 | ||||
| -rw-r--r-- | msm8996/sdm/libs/hwc2/hwc_layers.cpp | 19 |
2 files changed, 6 insertions, 14 deletions
diff --git a/msm8996/sdm/libs/hwc2/hwc_display.cpp b/msm8996/sdm/libs/hwc2/hwc_display.cpp index 2ebaa017..146d12b1 100644 --- a/msm8996/sdm/libs/hwc2/hwc_display.cpp +++ b/msm8996/sdm/libs/hwc2/hwc_display.cpp @@ -1654,6 +1654,7 @@ std::string HWCDisplay::Dump() { to_string(layer->GetDeviceSelectedCompositionType()).c_str() << std::endl; os << "\tplane_alpha: " << std::to_string(sdm_layer->plane_alpha).c_str() << std::endl; os << "\tformat: " << GetFormatString(sdm_layer->input_buffer->format) << std::endl; + os << "\tsecure: " << sdm_layer->input_buffer->flags.secure << std::endl; os << "\ttransform: rot: " << transform.rotation << " flip_h: " << transform.flip_horizontal << " flip_v: "<< transform.flip_vertical << std::endl; os << "\tbuffer_id: " << std::hex << "0x" << sdm_layer->input_buffer->buffer_id << std::dec diff --git a/msm8996/sdm/libs/hwc2/hwc_layers.cpp b/msm8996/sdm/libs/hwc2/hwc_layers.cpp index bbcd6140..c6ae31b2 100644 --- a/msm8996/sdm/libs/hwc2/hwc_layers.cpp +++ b/msm8996/sdm/libs/hwc2/hwc_layers.cpp @@ -89,21 +89,12 @@ HWC2::Error HWCLayer::SetLayerBuffer(buffer_handle_t buffer, int32_t acquire_fen return HWC2::Error::BadLayer; } -#ifdef USE_GRALLOC1 - // TODO(user): Clean this up - if (handle->buffer_type == BUFFER_TYPE_VIDEO) { -#else - if (handle->bufferType == BUFFER_TYPE_VIDEO) { -#endif - layer_buffer->flags.video = true; - } + layer_buffer->flags.video = (handle->buffer_type == BUFFER_TYPE_VIDEO) ? true : false; // TZ Protected Buffer - L1 - if (handle->flags & private_handle_t::PRIV_FLAGS_SECURE_BUFFER) { - layer_buffer->flags.secure = true; - } - if (handle->flags & private_handle_t::PRIV_FLAGS_SECURE_DISPLAY) { - layer_buffer->flags.secure_display = true; - } + layer_buffer->flags.secure = + (handle->flags & private_handle_t::PRIV_FLAGS_SECURE_BUFFER) ? true: false; + layer_buffer->flags.secure_display = + (handle->flags & private_handle_t::PRIV_FLAGS_SECURE_DISPLAY) ? true : false; layer_buffer->planes[0].fd = ion_fd_; layer_buffer->planes[0].offset = handle->offset; |