blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4 from ascent12/refresh 

More accurate refresh rates (mHz)
This commit is contained in:
Drew DeVault 2017-05-13 09:40:10 -04:00 committed by GitHub
parent 537096807e 409065ba2e
commit 66e02e97ec
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backend/drm/drm.c
View File

@ -249,6 +249,20 @@ static struct wlr_output_impl output_impl = {
.destroy = wlr_drm_output_destroy, .destroy = wlr_drm_output_destroy,
}; };
static int32_t calculate_refresh_rate(drmModeModeInfo *mode) {
int32_t refresh = (mode->clock * 1000000LL / mode->htotal +
mode->vtotal / 2) / mode->vtotal;
if (mode->flags & DRM_MODE_FLAG_INTERLACE)
refresh *= 2;
if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
refresh /= 2;
if (mode->vscan > 1)
refresh /= mode->vscan;
return refresh;
}
static void scan_property_ids(int fd, drmModeConnector *conn, static void scan_property_ids(int fd, drmModeConnector *conn,
struct wlr_output_state *output) { struct wlr_output_state *output) {
for (int i = 0; i < conn->count_props; ++i) { for (int i = 0; i < conn->count_props; ++i) {
@ -347,14 +361,12 @@ void wlr_drm_scan_connectors(struct wlr_backend_state *state) {
struct wlr_output_mode *mode = calloc(1, struct wlr_output_mode *mode = calloc(1,
sizeof(struct wlr_output_mode)); sizeof(struct wlr_output_mode));
mode->width = _state->mode.hdisplay; mode->width = _state->mode.hdisplay;
// TODO: Calculate more accurate refresh rate
// TODO: Check that this refresh rate is mHz
mode->height = _state->mode.vdisplay; mode->height = _state->mode.vdisplay;
mode->refresh = calculate_refresh_rate(&_state->mode);
mode->state = _state; mode->state = _state;
wlr_log(L_INFO, " %"PRIu16"@%"PRIu16"@%"PRIu32, wlr_log(L_INFO, " %"PRId32"@%"PRId32"@%"PRId32,
_state->mode.hdisplay, _state->mode.vdisplay, mode->width, mode->height, mode->refresh);
_state->mode.vrefresh);
list_add(wlr_output->modes, mode); list_add(wlr_output->modes, mode);
} }