Merge "display: Add new qdcm xml for visionox panel"
diff --git a/Android.bp b/Android.bp
index 5a359d8..d4b6c28 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,7 +5,6 @@
"-Wconversion",
"-Wall",
"-Werror",
- "-std=c++14",
],
shared_libs: [
"liblog",
diff --git a/common.mk b/common.mk
index 6c17458..0a37200 100644
--- a/common.mk
+++ b/common.mk
@@ -3,7 +3,7 @@
#Common C flags
common_flags := -Wno-missing-field-initializers
-common_flags += -Wconversion -Wall -Werror -std=c++14
+common_flags += -Wconversion -Wall -Werror
common_flags += -DUSE_GRALLOC1
ifeq ($(TARGET_IS_HEADLESS), true)
common_flags += -DTARGET_HEADLESS
diff --git a/gpu_tonemapper/Android.mk b/gpu_tonemapper/Android.mk
index 61b134f..fd34da9 100644
--- a/gpu_tonemapper/Android.mk
+++ b/gpu_tonemapper/Android.mk
@@ -17,7 +17,7 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_CFLAGS := $(version_flag) -Wno-missing-field-initializers -Wall \
- -Wno-unused-parameter -std=c++11 -DLOG_TAG=\"GPU_TONEMAPPER\"
+ -Wno-unused-parameter -DLOG_TAG=\"GPU_TONEMAPPER\"
LOCAL_SRC_FILES := TonemapFactory.cpp \
glengine.cpp \
diff --git a/libdebug/Android.mk b/libdebug/Android.mk
index e975a22..3ed3394 100644
--- a/libdebug/Android.mk
+++ b/libdebug/Android.mk
@@ -5,7 +5,7 @@
LOCAL_VENDOR_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libdl
-LOCAL_CFLAGS := -DLOG_TAG=\"SDM\" -Wall -std=c++11 -Werror -fno-operator-names
+LOCAL_CFLAGS := -DLOG_TAG=\"SDM\" -Wall -Werror -fno-operator-names
LOCAL_CLANG := true
LOCAL_SRC_FILES := debug_handler.cpp
LOCAL_COPY_HEADERS_TO := qcom/display
diff --git a/libdrmutils/Android.mk b/libdrmutils/Android.mk
index 97c052b..172233f 100644
--- a/libdrmutils/Android.mk
+++ b/libdrmutils/Android.mk
@@ -8,7 +8,7 @@
$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_HEADER_LIBRARIES := display_headers
LOCAL_SHARED_LIBRARIES := libdrm libdl libdisplaydebug
-LOCAL_CFLAGS := -DLOG_TAG=\"DRMUTILS\" -Wall -std=c++11 -Werror -fno-operator-names
+LOCAL_CFLAGS := -DLOG_TAG=\"DRMUTILS\" -Wall -Werror -fno-operator-names
LOCAL_CLANG := true
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_SRC_FILES := drm_master.cpp drm_res_mgr.cpp drm_lib_loader.cpp
diff --git a/sdm/include/private/hw_info_types.h b/sdm/include/private/hw_info_types.h
index 0aa8cd6..6474ea0 100644
--- a/sdm/include/private/hw_info_types.h
+++ b/sdm/include/private/hw_info_types.h
@@ -183,6 +183,7 @@
kVersionSDM855V1 = SDEVERSION(5, 0, 0),
kVersionSDM855V2 = SDEVERSION(5, 0, 1),
kVersionSM6150V1 = SDEVERSION(5, 3, 0),
+ kVersionSM7150V1 = SDEVERSION(5, 2, 0),
kVersionSM8250V1 = SDEVERSION(6, 0, 0),
kVersionSM7250V1 = SDEVERSION(6, 1, 0),
kVersionSM6250V1 = SDEVERSION(6, 2, 0),
diff --git a/sdm/libs/core/drm/hw_device_drm.cpp b/sdm/libs/core/drm/hw_device_drm.cpp
index 0bf42f8..af4d89a 100644
--- a/sdm/libs/core/drm/hw_device_drm.cpp
+++ b/sdm/libs/core/drm/hw_device_drm.cpp
@@ -1206,15 +1206,16 @@
SetSolidfillStages();
SetQOSData(qos_data);
drm_atomic_intf_->Perform(DRMOps::CRTC_SET_SECURITY_LEVEL, token_.crtc_id, crtc_security_level);
- if (hw_layers->hw_avr_info.update) {
- sde_drm::DRMQsyncMode mode = sde_drm::DRMQsyncMode::NONE;
- if (hw_layers->hw_avr_info.mode == kContinuousMode) {
- mode = sde_drm::DRMQsyncMode::CONTINUOUS;
- } else if (hw_layers->hw_avr_info.mode == kOneShotMode) {
- mode = sde_drm::DRMQsyncMode::ONESHOT;
- }
- drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_QSYNC_MODE, token_.conn_id, mode);
+ }
+
+ if (hw_layers->hw_avr_info.update) {
+ sde_drm::DRMQsyncMode mode = sde_drm::DRMQsyncMode::NONE;
+ if (hw_layers->hw_avr_info.mode == kContinuousMode) {
+ mode = sde_drm::DRMQsyncMode::CONTINUOUS;
+ } else if (hw_layers->hw_avr_info.mode == kOneShotMode) {
+ mode = sde_drm::DRMQsyncMode::ONESHOT;
}
+ drm_atomic_intf_->Perform(DRMOps::CONNECTOR_SET_QSYNC_MODE, token_.conn_id, mode);
}
drm_atomic_intf_->Perform(DRMOps::DPPS_COMMIT_FEATURE, 0 /* argument is not used */);
diff --git a/sdm/libs/hwc2/Android.mk b/sdm/libs/hwc2/Android.mk
index 042b9cd..0ec89da 100644
--- a/sdm/libs/hwc2/Android.mk
+++ b/sdm/libs/hwc2/Android.mk
@@ -14,7 +14,7 @@
LOCAL_HEADER_LIBRARIES := display_headers
LOCAL_CFLAGS := -Wno-missing-field-initializers -Wno-unused-parameter \
- -std=c++11 -fcolor-diagnostics\
+ -fcolor-diagnostics\
-DLOG_TAG=\"SDM\" $(common_flags)
LOCAL_CLANG := true