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

compositor-drm: move refresh rate computation

Browse Source 
Move it into to a new function. Following patches want to compute it
elsewhere as well.

No functional changes.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Ian Ray <ian.ray@ge.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Pekka Paalanen
2017-11-10 15:31:39 +02:00
parent 46e4f97ab6
commit dc14fd4cd7
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-drm.c
+20 -13
View File
@@ -3699,6 +3699,25 @@ destroy_sprites(struct drm_backend *b)
drm_plane_destroy(plane); drm_plane_destroy(plane);
} }
static uint32_t
drm_refresh_rate_mHz(const drmModeModeInfo *info)
{
uint64_t refresh;
/* 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;
return refresh;
}
/** /**
* Add a mode to output's mode list * Add a mode to output's mode list
* *
@@ -3713,7 +3732,6 @@ static struct drm_mode *
drm_output_add_mode(struct drm_output *output, const drmModeModeInfo *info) drm_output_add_mode(struct drm_output *output, const 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)
@@ -3723,18 +3741,7 @@ drm_output_add_mode(struct drm_output *output, const drmModeModeInfo *info)
mode->base.width = info->hdisplay; mode->base.width = info->hdisplay;
mode->base.height = info->vdisplay; mode->base.height = info->vdisplay;
/* Calculate higher precision (mHz) refresh rate */ mode->base.refresh = drm_refresh_rate_mHz(info);
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;
mode->blob_id = 0; mode->blob_id = 0;