summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Tasayco Loarte <victorx.tasayco.loarte@intel.com>2016-07-08 18:00:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-08 18:00:09 +0000
commitae5896850b00dc1b8b8c0fa4dc67ef44f19f5ba3 (patch)
treef838cfeacf6127193d9589844f651f69fc7f1a30
parent9192c237dd988b01ddef696523951cdd13bf38da (diff)
parent59b023a4d99f1794155346ddb00d80e05ee55c0f (diff)
downloadhwcomposer-ae5896850b00dc1b8b8c0fa4dc67ef44f19f5ba3.tar.gz
Merge \\\"gfx: support external display\\\" into cw-e-dev am: e3e49cc873 am: 56b8c3132c
am: 59b023a4d9 Change-Id: Ica96bad83af2ddcc740e85a8f9e47f0080787f4e
-rw-r--r--merrifield/common/base/Hwcomposer.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/merrifield/common/base/Hwcomposer.cpp b/merrifield/common/base/Hwcomposer.cpp
index 6f1698a..e4d9ad8 100644
--- a/merrifield/common/base/Hwcomposer.cpp
+++ b/merrifield/common/base/Hwcomposer.cpp
@@ -81,8 +81,9 @@ bool Hwcomposer::prepare(size_t numDisplays,
VTRACE("device %d doesn't exist", i);
continue;
}
- if (device->getType() != IDisplayDevice::DEVICE_PRIMARY)
- continue;
+
+ if (device->getType() == IDisplayDevice::DEVICE_VIRTUAL)
+ continue;
device->prePrepare(displays[i]);
}
@@ -94,8 +95,8 @@ bool Hwcomposer::prepare(size_t numDisplays,
continue;
}
- if (device->getType() != IDisplayDevice::DEVICE_PRIMARY)
- continue;
+ if (device->getType() == IDisplayDevice::DEVICE_VIRTUAL)
+ continue;
ret = device->prepare(displays[i]);
if (ret == false) {
@@ -137,8 +138,8 @@ bool Hwcomposer::commit(size_t numDisplays,
continue;
}
- if (device->getType() != IDisplayDevice::DEVICE_PRIMARY)
- continue;
+ if (device->getType() == IDisplayDevice::DEVICE_VIRTUAL)
+ continue;
ret = device->commit(displays[i], mDisplayContext);
if (ret == false) {