diff options
author | Sean Paul <seanpaul@google.com> | 2015-10-28 20:45:42 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-28 20:45:42 +0000 |
commit | 7cd2643b0de900e00e5b0cc0bd6dbbc649840b02 (patch) | |
tree | 0c7513f32eb7ec30265c8271de25c4148d4311a9 | |
parent | 479412cbe6edbc265e4ab419cc9138e5ade6bd84 (diff) | |
parent | ad563d42f18fd4f8f99f489fa1b15fd709450025 (diff) | |
download | drm_hwcomposer-7cd2643b0de900e00e5b0cc0bd6dbbc649840b02.tar.gz |
Merge "drm_hwcomposer: Use mode vrefresh if provided" into mnc-dr-devandroid-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-dev
-rw-r--r-- | drmmode.cpp | 6 | ||||
-rw-r--r-- | drmmode.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drmmode.cpp b/drmmode.cpp index 7f8c04d..2b558c9 100644 --- a/drmmode.cpp +++ b/drmmode.cpp @@ -36,6 +36,7 @@ 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) { @@ -54,6 +55,7 @@ DrmMode::DrmMode() v_sync_end_(0), v_total_(0), v_scan_(0), + v_refresh_(0), flags_(0), type_(0), name_("") { @@ -83,6 +85,7 @@ void DrmMode::ToDrmModeModeInfo(drm_mode_modeinfo *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); @@ -141,7 +144,8 @@ uint32_t DrmMode::v_scan() const { } float DrmMode::v_refresh() const { - return clock_ / (float)(v_total_ * h_total_) * 1000.0f; + return v_refresh_ ? v_refresh_ * 1.0f : + clock_ / (float)(v_total_ * h_total_) * 1000.0f; } uint32_t DrmMode::flags() const { @@ -71,6 +71,7 @@ class DrmMode { uint32_t v_sync_end_; uint32_t v_total_; uint32_t v_scan_; + uint32_t v_refresh_; uint32_t flags_; uint32_t type_; |