diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-07-09 13:46:44 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2020-07-09 13:46:44 -0700 |
| commit | 862e83629aa68c3d29ad6bde27473876d8b4c86d (patch) | |
| tree | 71f4ded2f1eb784c481016396f63156e8a76f299 | |
| parent | 072ccf579182603ace8585fa1e3877a4f67f0ee5 (diff) | |
| parent | 4629b4eadcfd2994d566a3999f275a38365431a8 (diff) | |
Merge 4629b4eadcfd2994d566a3999f275a38365431a8 on remote branch
Change-Id: I89c10c355224adf94335d5739a1726ad6f958a0c
| -rw-r--r-- | config/display-product.mk | 12 | ||||
| -rw-r--r-- | gralloc/gr_buf_mgr.cpp | 6 |
2 files changed, 17 insertions, 1 deletions
diff --git a/config/display-product.mk b/config/display-product.mk index fbab0028..3c3c59ba 100644 --- a/config/display-product.mk +++ b/config/display-product.mk @@ -79,6 +79,18 @@ PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_trinket_defau #QDCM calibration xml file base on Rennell FHD+ visionox panel PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_rm69299_amoled_fhd+_video_mode_dsi_visionox_panel.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_rm69299_amoled_fhd+_video_mode_dsi_visionox_panel.xml PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_rm69299_amoled_fhd+_video_mode_dsi_visionox_panel.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_rm69299_amoled_fhd+_cmd_mode_dsi_visionox_panel.xml +#QDCM calibration xml file for sharp 120hz panel etc +PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_sharp_1080p_120hz_dual_dsi_cmd_mode_panel.xml +PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_Dual_s6e3ha3_amoled_cmd_mode_dsi_panel.xml +PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_Dual_nt36850_cmd_mode_dsi_truly_panel_without_DSC.xml +PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_nt36672c_fhd_plus_video_mode_dsi_panel.xml +PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_rm69298_amoled_fhd+_video_mode_dsi_truly_panel.xml +PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_rm69298_amoled_fhd+_cmd_mode_dsi_truly_panel.xml +PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_Sharp_2k_cmd_mode_qsync_dsi_panel.xml +PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_Sharp_2k_video_mode_qsync_dsi_panel.xml +PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_Sharp_fhd_video_mode_qsync_dsi_panel.xml +PRODUCT_COPY_FILES += hardware/qcom/display/config/qdcm_calib_data_default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_Sharp_fhd_cmd_mode_qsync_dsi_panel.xml + PRODUCT_PROPERTY_OVERRIDES += \ persist.demo.hdmirotationlock=false \ diff --git a/gralloc/gr_buf_mgr.cpp b/gralloc/gr_buf_mgr.cpp index a557886c..539bb000 100644 --- a/gralloc/gr_buf_mgr.cpp +++ b/gralloc/gr_buf_mgr.cpp @@ -1111,7 +1111,11 @@ Error BufferManager::GetMetadata(private_handle_t *handle, int64_t metadatatype_ android::gralloc4::encodeDataspace(dataspace, out); break; case (int64_t)StandardMetadataType::INTERLACED: - android::gralloc4::encodeInterlaced(qtigralloc::Interlaced_Qti, out); + if (metadata->interlaced > 0) { + android::gralloc4::encodeInterlaced(qtigralloc::Interlaced_Qti, out); + } else { + android::gralloc4::encodeInterlaced(android::gralloc4::Interlaced_None, out); + } break; case (int64_t)StandardMetadataType::COMPRESSION: if (handle->flags & qtigralloc::PRIV_FLAGS_UBWC_ALIGNED || |