commit 588a175f020449edff480023cbaaf2536fee0065
author Linux Build Service Account <lnxbuild@quicinc.com> Mon Jul 24 16:02:43 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jul 24 16:02:43 2017 -0700
tree b941c42321d077cc1d36247f3b59e59459ec7b1f
parent 6e31a74119fdecc4287f81f04dd5502a31b1df21
parent 88331990e8351364348600fdaa79f260b6d6783e

Merge "sdm: Add defaults if panel dimensions are not specified"

sdm/libs/core/drm/hw_device_drm.cpp

diff --git a/sdm/libs/core/drm/hw_device_drm.cpp b/sdm/libs/core/drm/hw_device_drm.cpp
index 9736ad0..1ed9042 100644
--- a/sdm/libs/core/drm/hw_device_drm.cpp
+++ b/sdm/libs/core/drm/hw_device_drm.cpp
@@ -444,6 +444,13 @@
        topology == DRMTopology::DUAL_LM_DSCMERGE);
   display_attributes_.h_total += display_attributes_.is_device_split ? h_blanking : 0;
 
+  // If driver doesn't return panel width/height information, default to 320 dpi
+  if (INT(mm_width) <= 0 || INT(mm_height) <= 0) {
+    mm_width  = UINT32(((FLOAT(mode.hdisplay) * 25.4f) / 320.0f) + 0.5f);
+    mm_height = UINT32(((FLOAT(mode.vdisplay) * 25.4f) / 320.0f) + 0.5f);
+    DLOGW("Driver doesn't report panel physical width and height - defaulting to 320dpi");
+  }
+
   display_attributes_.x_dpi = (FLOAT(mode.hdisplay) * 25.4f) / FLOAT(mm_width);
   display_attributes_.y_dpi = (FLOAT(mode.vdisplay) * 25.4f) / FLOAT(mm_height);