From 767cc4e01cdf6ae1fa290a45b874b179061648c9 Mon Sep 17 00:00:00 2001 From: "Christopher R. Palmer" Date: Fri, 1 Jan 2016 16:11:25 -0500 Subject: Revert "Hwcomposer Moorefield: Return DummyDevice for TERTIARY display" This reverts commit d1d49956ed8cfe4c2363670a3d019c52a4128f8c. Change-Id: Ie56fcf9d30f9f4cdc0b2cb9e882db47637a13a3b --- moorefield_hdmi/include/IDisplayDevice.h | 1 - moorefield_hdmi/platforms/merrifield_plus/PlatfHwcomposer.cpp | 2 -- 2 files changed, 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); -- cgit v1.2.3