mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Report refresh rates in mHz

Browse Source 
We compute the higher resolution from the mode timing parameters.
This commit is contained in:
Kristian Høgsberg
2012-05-10 12:23:53 -04:00
parent 34829dec71
commit c4621b07f6
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-drm.c
+15 -2
View File
@@ -885,7 +885,7 @@ drm_output_switch_mode(struct weston_output *output_base, struct weston_mode *mo
fprintf(stderr, "failed to set mode (%dx%d) %u Hz\n", fprintf(stderr, "failed to set mode (%dx%d) %u Hz\n",
drm_mode->base.width, drm_mode->base.width,
drm_mode->base.height, drm_mode->base.height,
drm_mode->base.refresh); drm_mode->base.refresh / 1000);
ret = -1; ret = -1;
} else { } else {
output->base.current->flags = 0; output->base.current->flags = 0;
@@ -1090,6 +1090,7 @@ static int
drm_output_add_mode(struct drm_output *output, drmModeModeInfo *info) drm_output_add_mode(struct drm_output *output, drmModeModeInfo *info)
{ {
struct drm_mode *mode; struct drm_mode *mode;
uint64_t refresh;
mode = malloc(sizeof *mode); mode = malloc(sizeof *mode);
if (mode == NULL) if (mode == NULL)
@@ -1098,7 +1099,19 @@ drm_output_add_mode(struct drm_output *output, drmModeModeInfo *info)
mode->base.flags = 0; mode->base.flags = 0;
mode->base.width = info->hdisplay; mode->base.width = info->hdisplay;
mode->base.height = info->vdisplay; mode->base.height = info->vdisplay;
mode->base.refresh = info->vrefresh;
/* Calculate higher precision (mHz) refresh rate */
refresh = (info->clock * 1000000LL / info->htotal +
info->vtotal / 2) / info->vtotal;
if (info->flags & DRM_MODE_FLAG_INTERLACE)
refresh *= 2;
if (info->flags & DRM_MODE_FLAG_DBLSCAN)
refresh /= 2;
if (info->vscan > 1)
refresh /= info->vscan;
mode->base.refresh = refresh;
mode->mode_info = *info; mode->mode_info = *info;
wl_list_insert(output->base.mode_list.prev, &mode->base.link); wl_list_insert(output->base.mode_list.prev, &mode->base.link);
src/compositor-x11.c
+1 -1
View File
@@ -383,7 +383,7 @@ x11_compositor_create_output(struct x11_compositor *c, int x, int y,
WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED; WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED;
output->mode.width = width; output->mode.width = width;
output->mode.height = height; output->mode.height = height;
output->mode.refresh = 60; output->mode.refresh = 60000;
wl_list_init(&output->base.mode_list); wl_list_init(&output->base.mode_list);
wl_list_insert(&output->base.mode_list, &output->mode.link); wl_list_insert(&output->base.mode_list, &output->mode.link);