summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--moorefield_hdmi/common/observers/SoftVsyncObserver.cpp6
-rw-r--r--moorefield_hdmi/ips/common/DrmConfig.cpp4
2 files changed, 3 insertions, 7 deletions
diff --git a/moorefield_hdmi/common/observers/SoftVsyncObserver.cpp b/moorefield_hdmi/common/observers/SoftVsyncObserver.cpp
index e62ed93..0174676 100644
--- a/moorefield_hdmi/common/observers/SoftVsyncObserver.cpp
+++ b/moorefield_hdmi/common/observers/SoftVsyncObserver.cpp
@@ -16,11 +16,7 @@
#include <common/utils/HwcTrace.h>
#include <common/observers/SoftVsyncObserver.h>
#include <IDisplayDevice.h>
-
-extern "C" int clock_nanosleep(clockid_t clock_id, int flags,
- const struct timespec *request,
- struct timespec *remain);
-
+#include <time.h>
namespace android {
namespace intel {
diff --git a/moorefield_hdmi/ips/common/DrmConfig.cpp b/moorefield_hdmi/ips/common/DrmConfig.cpp
index 8575edb..79d3685 100644
--- a/moorefield_hdmi/ips/common/DrmConfig.cpp
+++ b/moorefield_hdmi/ips/common/DrmConfig.cpp
@@ -30,7 +30,7 @@ const char* DrmConfig::getDrmPath()
uint32_t DrmConfig::getDrmConnector(int device)
{
if (device == IDisplayDevice::DEVICE_PRIMARY)
- return DRM_MODE_CONNECTOR_MIPI;
+ return DRM_MODE_CONNECTOR_DSI;
else if (device == IDisplayDevice::DEVICE_EXTERNAL)
return DRM_MODE_CONNECTOR_DVID;
return DRM_MODE_CONNECTOR_Unknown;
@@ -39,7 +39,7 @@ uint32_t DrmConfig::getDrmConnector(int device)
uint32_t DrmConfig::getDrmEncoder(int device)
{
if (device == IDisplayDevice::DEVICE_PRIMARY)
- return DRM_MODE_ENCODER_MIPI;
+ return DRM_MODE_ENCODER_DSI;
else if (device == IDisplayDevice::DEVICE_EXTERNAL)
return DRM_MODE_ENCODER_TMDS;
return DRM_MODE_ENCODER_NONE;