brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crtc-mode-xrandr: Take RR_DoubleScan and RR_Interlace flags into account

Browse Source 
Otherwise we often advertise wrongly calculated modes.
Original patch from Jonas Ådahl and the xrandr project.

Closes https://gitlab.gnome.org/GNOME/mutter/-/issues/275

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2190>
This commit is contained in:
Robert Mader 2021-12-30 21:29:25 +01:00 committed by Marge Bot
parent 97dd5d8877
commit 60d7cd82ba
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/backends/x11/meta-gpu-xrandr.c
View File

@ -86,6 +86,24 @@ get_xmode_name (XRRModeInfo *xmode)
return g_strdup_printf ("%dx%d", width, height); return g_strdup_printf ("%dx%d", width, height);
} }
static float
calculate_xrandr_refresh_rate (XRRModeInfo *xmode)
{
float h_total;
float v_total;
h_total = (float) xmode->hTotal;
v_total = (float) xmode->vTotal;
if (xmode->modeFlags & RR_DoubleScan)
v_total *= 2.0;
if (xmode->modeFlags & RR_Interlace)
v_total /= 2.0;
return xmode->dotClock / (h_total * v_total);
}
static gboolean static gboolean
meta_gpu_xrandr_read_current (MetaGpu *gpu, meta_gpu_xrandr_read_current (MetaGpu *gpu,
GError **error) GError **error)
@ -148,8 +166,7 @@ meta_gpu_xrandr_read_current (MetaGpu *gpu,
crtc_mode_info = meta_crtc_mode_info_new (); crtc_mode_info = meta_crtc_mode_info_new ();
crtc_mode_info->width = xmode->width; crtc_mode_info->width = xmode->width;
crtc_mode_info->height = xmode->height; crtc_mode_info->height = xmode->height;
crtc_mode_info->refresh_rate = (xmode->dotClock / crtc_mode_info->refresh_rate = calculate_xrandr_refresh_rate (xmode);
((float)xmode->hTotal * xmode->vTotal));
crtc_mode_info->flags = xmode->modeFlags; crtc_mode_info->flags = xmode->modeFlags;
crtc_mode_name = get_xmode_name (xmode); crtc_mode_name = get_xmode_name (xmode);