summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Tasayco Loarte <victorx.tasayco.loarte@intel.com>2015-11-30 14:31:25 +0100
committerZhengyin Qian <qianzy@google.com>2015-12-03 15:05:37 -0800
commitec73412f0d53f46a50d1ea4ca3ffc07022f91197 (patch)
treeb88d89d35afeb4c221ff93c1d4a700e50fcc9164
parenta47d9a7b7ea142998a482aa2fdce70a5ca4fe152 (diff)
downloadandroid_hardware_intel_img_hwcomposer-ec73412f0d53f46a50d1ea4ca3ffc07022f91197.tar.gz
android_hardware_intel_img_hwcomposer-ec73412f0d53f46a50d1ea4ca3ffc07022f91197.tar.bz2
android_hardware_intel_img_hwcomposer-ec73412f0d53f46a50d1ea4ca3ffc07022f91197.zip
DrmConfig: Change DRM_MODE_ENCODER_MIPI to DRM_MODE_ENCODER_DSI
To be consistent with upstream naming. Change-Id: I69bfcc3cfdbbb222a01f16323e2ea468f5916cc7 Tracked-On: https://jira.ndg.intel.com/browse/MARVIN-1012 Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Victor Tasayco Loarte <victorx.tasayco.loarte@intel.com>
-rw-r--r--merrifield/ips/common/DrmConfig.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/merrifield/ips/common/DrmConfig.cpp b/merrifield/ips/common/DrmConfig.cpp
index 59b1c72..f1c119b 100644
--- a/merrifield/ips/common/DrmConfig.cpp
+++ b/merrifield/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;