hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-26 06:35:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

backend/drm: remove overzealous finish_drm_surface

Browse source 
The previous PR was overzealous in adding a finish_drm_surface call
which was also done by the caller. Remove the call and also move the
comment to the correct code location.
This commit is contained in:
Rouven Czerwinski 2020-01-24 19:53:51 +01:00 committed by Simon Ser
parent f0594fb732
commit 144d2041ad
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
backend/drm/drm.c
View file

@ -613,17 +613,17 @@ static bool drm_connector_init_renderer(struct wlr_drm_connector *conn,
if (!init_drm_plane_surfaces(plane, drm, width, height, format, modifiers) || if (!init_drm_plane_surfaces(plane, drm, width, height, format, modifiers) ||
!drm_connector_pageflip_renderer(conn, mode)) { !drm_connector_pageflip_renderer(conn, mode)) {
// If page-flipping with modifiers enabled doesn't work, retry without
// modifiers
finish_drm_surface(&plane->surf);
finish_drm_surface(&plane->mgpu_surf);
if (!modifiers) { if (!modifiers) {
wlr_log(WLR_ERROR, "Failed to initialize renderer " wlr_log(WLR_ERROR, "Failed to initialize renderer "
"on connector '%s': initial page-flip failed", "on connector '%s': initial page-flip failed",
conn->output.name); conn->output.name);
return false; return false;
} }
// If page-flipping with modifiers enabled doesn't work, retry without
// modifiers
finish_drm_surface(&plane->surf);
finish_drm_surface(&plane->mgpu_surf);
wlr_log(WLR_INFO, "Page-flip failed with primary FB modifiers enabled, " wlr_log(WLR_INFO, "Page-flip failed with primary FB modifiers enabled, "
"retrying without modifiers"); "retrying without modifiers");
modifiers = false; modifiers = false;
@ -636,8 +636,6 @@ static bool drm_connector_init_renderer(struct wlr_drm_connector *conn,
wlr_log(WLR_ERROR, "Failed to initialize renderer " wlr_log(WLR_ERROR, "Failed to initialize renderer "
"on connector '%s': initial page-flip failed", "on connector '%s': initial page-flip failed",
conn->output.name); conn->output.name);
finish_drm_surface(&plane->surf);
finish_drm_surface(&plane->mgpu_surf);
return false; return false;
} }
} }