summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher R. Palmer <crpalmer@gmail.com>2016-01-01 16:11:25 -0500
committerChristopher R. Palmer <crpalmer@gmail.com>2016-01-01 16:54:37 -0500
commit767cc4e01cdf6ae1fa290a45b874b179061648c9 (patch)
treea83a5af9d0f43edd4d66a03ac8c3f7b09a60082c
parent2855d50415d3d4af2b21e02362b928cc3c2c76f3 (diff)
downloadandroid_hardware_intel_img_hwcomposer-767cc4e01cdf6ae1fa290a45b874b179061648c9.tar.gz
android_hardware_intel_img_hwcomposer-767cc4e01cdf6ae1fa290a45b874b179061648c9.tar.bz2
android_hardware_intel_img_hwcomposer-767cc4e01cdf6ae1fa290a45b874b179061648c9.zip
Revert "Hwcomposer Moorefield: Return DummyDevice for TERTIARY display"
This reverts commit d1d49956ed8cfe4c2363670a3d019c52a4128f8c. Change-Id: Ie56fcf9d30f9f4cdc0b2cb9e882db47637a13a3b
-rwxr-xr-xmoorefield_hdmi/include/IDisplayDevice.h1
-rwxr-xr-xmoorefield_hdmi/platforms/merrifield_plus/PlatfHwcomposer.cpp2
2 files changed, 0 insertions, 3 deletions
diff --git a/moorefield_hdmi/include/IDisplayDevice.h b/moorefield_hdmi/include/IDisplayDevice.h
index ca42f6e..845b45e 100755
--- a/moorefield_hdmi/include/IDisplayDevice.h
+++ b/moorefield_hdmi/include/IDisplayDevice.h
@@ -55,7 +55,6 @@ 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 77b35cb..311cfca 100755
--- a/moorefield_hdmi/platforms/merrifield_plus/PlatfHwcomposer.cpp
+++ b/moorefield_hdmi/platforms/merrifield_plus/PlatfHwcomposer.cpp
@@ -71,8 +71,6 @@ 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);