commit 6d218070f378a8bebdcb66c1baa513144aa895d6
author qctecmdr <qctecmdr@localhost> Tue Jun 16 22:14:10 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jun 16 22:14:10 2020 -0700
tree fcdb8c1e9f66ec763b2d222fb6dbda1dc03c24e1
parent f14e80cf7c07e0698376531b6174aa37ac92517f
parent aab5bbc99823e7fef881a6f45a80a290ea2b30a2

Merge "sdm: power off external display during GVM LPM"

sdm/libs/core/Android.mk

diff --git a/sdm/libs/core/Android.mk b/sdm/libs/core/Android.mk
index f8a58d1..c934de0 100644
--- a/sdm/libs/core/Android.mk
+++ b/sdm/libs/core/Android.mk
@@ -22,6 +22,10 @@
     LOCAL_CFLAGS              += -DPP_DRM_ENABLE
 endif
 
+ifeq ($(ENABLE_HYP),true)
+    LOCAL_CFLAGS += -DHYPERVISOR
+endif
+
 LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
 LOCAL_SRC_FILES               := core_interface.cpp \
                                  core_impl.cpp \

sdm/libs/core/drm/hw_tv_drm.cpp

diff --git a/sdm/libs/core/drm/hw_tv_drm.cpp b/sdm/libs/core/drm/hw_tv_drm.cpp
index 4b2dc89..94a0810 100644
--- a/sdm/libs/core/drm/hw_tv_drm.cpp
+++ b/sdm/libs/core/drm/hw_tv_drm.cpp
@@ -190,6 +190,10 @@
     return kErrorNone;
   }
 
+#ifdef HYPERVISOR
+  teardown = true;
+#endif
+
   if (teardown) {
     // LP connecter prop N/A for External
     drm_atomic_intf_->Perform(DRMOps::CRTC_SET_ACTIVE, token_.crtc_id, 0);