summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordhacker29 <dhackerdvm@gmail.com>2015-11-06 21:33:59 -0500
committerdhacker29 <dhackerdvm@gmail.com>2015-11-06 21:33:59 -0500
commitd1d49956ed8cfe4c2363670a3d019c52a4128f8c (patch)
treeba646bf98401c8d31632f545f41d96f4b103658d
parent47bcb651180100c5f01c2d0d7c0ce023b970c247 (diff)
downloadandroid_hardware_intel_img_hwcomposer-d1d49956ed8cfe4c2363670a3d019c52a4128f8c.tar.gz
android_hardware_intel_img_hwcomposer-d1d49956ed8cfe4c2363670a3d019c52a4128f8c.tar.bz2
android_hardware_intel_img_hwcomposer-d1d49956ed8cfe4c2363670a3d019c52a4128f8c.zip
Hwcomposer Moorefield: Return DummyDevice for TERTIARY display
HWC_DISPLAY_TERTIARY was added by caf, we don't use it so just return the DummyDevice Change-Id: I170f8bcd3ffc1bf069aecb7b0bf06b4aa9a29d17
-rwxr-xr-xmoorefield_hdmi/include/IDisplayDevice.h1
-rwxr-xr-xmoorefield_hdmi/platforms/merrifield_plus/PlatfHwcomposer.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/moorefield_hdmi/include/IDisplayDevice.h b/moorefield_hdmi/include/IDisplayDevice.h
index 845b45e..ca42f6e 100755
--- a/moorefield_hdmi/include/IDisplayDevice.h
+++ b/moorefield_hdmi/include/IDisplayDevice.h
@@ -55,6 +55,7 @@ public:
enum {
DEVICE_PRIMARY = HWC_DISPLAY_PRIMARY,
DEVICE_EXTERNAL = HWC_DISPLAY_EXTERNAL,
+ DEVICE_TERTIARY = HWC_DISPLAY_TERTIARY,
DEVICE_VIRTUAL = HWC_DISPLAY_VIRTUAL,
DEVICE_COUNT,
};
diff --git a/moorefield_hdmi/platforms/merrifield_plus/PlatfHwcomposer.cpp b/moorefield_hdmi/platforms/merrifield_plus/PlatfHwcomposer.cpp
index 311cfca..77b35cb 100755
--- a/moorefield_hdmi/platforms/merrifield_plus/PlatfHwcomposer.cpp
+++ b/moorefield_hdmi/platforms/merrifield_plus/PlatfHwcomposer.cpp
@@ -71,6 +71,8 @@ IDisplayDevice* PlatfHwcomposer::createDisplayDevice(int disp,
return new PlatfExternalDevice((uint32_t)disp, *this, dpm);
#endif
+ case IDisplayDevice::DEVICE_TERTIARY:
+ return new DummyDevice((uint32_t)disp, *this);
case IDisplayDevice::DEVICE_VIRTUAL:
return new DummyDevice((uint32_t)disp, *this);