mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 11:32:04 +00:00
winsys-egl-kms: bypass initial output setup if kms fd passed in
if mutter is handling the output setup, then we shouldn't do it, too. https://bugzilla.gnome.org/show_bug.cgi?id=758073
This commit is contained in:
parent
a583492ea2
commit
1887521587
@ -663,6 +663,14 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display,
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Force a full modeset / drmModeSetCrtc on
|
||||||
|
* the first swap buffers call.
|
||||||
|
*/
|
||||||
|
kms_display->pending_set_crtc = TRUE;
|
||||||
|
|
||||||
|
if (kms_renderer->opened_fd < 0)
|
||||||
|
return TRUE;
|
||||||
|
|
||||||
output0 = find_output (0,
|
output0 = find_output (0,
|
||||||
kms_renderer->fd,
|
kms_renderer->fd,
|
||||||
resources,
|
resources,
|
||||||
@ -736,10 +744,6 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display,
|
|||||||
kms_display->width = output0->mode.hdisplay;
|
kms_display->width = output0->mode.hdisplay;
|
||||||
kms_display->height = output0->mode.vdisplay;
|
kms_display->height = output0->mode.vdisplay;
|
||||||
|
|
||||||
/* We defer setting the crtc modes until the first swap_buffers request of a
|
|
||||||
* CoglOnscreen framebuffer. */
|
|
||||||
kms_display->pending_set_crtc = TRUE;
|
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user