Merge "drm_hwcomposer: ground work for squashing" into mnc-dr-dev

[android-x86/external-drm_hwcomposer.git] / drmmode.cpp

diff --git a/drmmode.cpp b/drmmode.cpp
index c2def1e..7f8c04d 100644 (file)
--- a/drmmode.cpp
+++ b/drmmode.cpp
@@ -19,7 +19,6 @@
 
 #include <stdint.h>
 #include <string>
-
 #include <xf86drmMode.h>
 
 namespace android {
@@ -37,7 +36,6 @@ DrmMode::DrmMode(drmModeModeInfoPtr m)
       v_sync_end_(m->vsync_end),
       v_total_(m->vtotal),
       v_scan_(m->vscan),
-      v_refresh_(m->vrefresh),
       flags_(m->flags),
       type_(m->type),
       name_(m->name) {
@@ -56,7 +54,6 @@ DrmMode::DrmMode()
       v_sync_end_(0),
       v_total_(0),
       v_scan_(0),
-      v_refresh_(0),
       flags_(0),
       type_(0),
       name_("") {
@@ -71,11 +68,10 @@ bool DrmMode::operator==(const drmModeModeInfo &m) const {
          h_total_ == m.htotal && h_skew_ == m.hskew &&
          v_display_ == m.vdisplay && v_sync_start_ == m.vsync_start &&
          v_sync_end_ == m.vsync_end && v_total_ == m.vtotal &&
-         v_scan_ == m.vscan && v_refresh_ == m.vrefresh && flags_ == m.flags &&
-         type_ == m.type;
+         v_scan_ == m.vscan && flags_ == m.flags && type_ == m.type;
 }
 
-void DrmMode::ToModeModeInfo(drmModeModeInfo *m) const {
+void DrmMode::ToDrmModeModeInfo(drm_mode_modeinfo *m) const {
   m->clock = clock_;
   m->hdisplay = h_display_;
   m->hsync_start = h_sync_start_;
@@ -87,7 +83,6 @@ void DrmMode::ToModeModeInfo(drmModeModeInfo *m) const {
   m->vsync_end = v_sync_end_;
   m->vtotal = v_total_;
   m->vscan = v_scan_;
-  m->vrefresh = v_refresh_;
   m->flags = flags_;
   m->type = type_;
   strncpy(m->name, name_.c_str(), DRM_DISPLAY_MODE_LEN);
@@ -145,8 +140,8 @@ uint32_t DrmMode::v_scan() const {
   return v_scan_;
 }
 
-uint32_t DrmMode::v_refresh() const {
-  return v_refresh_;
+float DrmMode::v_refresh() const {
+  return clock_ / (float)(v_total_ * h_total_) * 1000.0f;
 }
 
 uint32_t DrmMode::flags() const {