mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-17 06:46:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle secondary GPU reset

Browse source 
On a multi-gpu setup, a reset of the secondary GPU was detected
but not properly handled. This fixes that by recreating the mgpu renderer.
This commit is contained in:
Abilio Costa 2024-06-08 18:47:10 +01:00 • committed by Abílio Costa
parent 213bd88b4c
commit 6aca7f9151
6 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/drm/drm.c
View file

@ -666,7 +666,7 @@ static bool drm_connector_state_update_primary_fb(struct wlr_drm_connector *conn
return false;
}
local_buf = drm_surface_blit(&plane->mgpu_surf, source_buf);
local_buf = drm_surface_blit(drm, &plane->mgpu_surf, source_buf);
if (local_buf == NULL) {
return false;
}
@ -1048,7 +1048,7 @@ static bool drm_connector_set_cursor(struct wlr_output *output,
return false;
}
local_buf = drm_surface_blit(&plane->mgpu_surf, buffer);
local_buf = drm_surface_blit(drm, &plane->mgpu_surf, buffer);
if (local_buf == NULL) {
return false;
}

21
backend/drm/renderer.c
View file

@ -12,6 +12,20 @@
#include "render/pixel_format.h"
#include "render/wlr_renderer.h"
static void handle_lost_mgpu_renderer(struct wlr_drm_backend *drm) {
wlr_log(WLR_DEBUG, "Handling lost renderer");
for (size_t i = 0; i < drm->num_planes; ++i) {
struct wlr_drm_plane *plane = &drm->planes[i];
finish_drm_surface(&plane->mgpu_surf);
}
finish_drm_renderer(&drm->mgpu_renderer);
if (!init_drm_renderer(drm, &drm->mgpu_renderer)) {
wlr_log(WLR_ERROR, "Failed to initialize renderer");
return;
}
}
bool init_drm_renderer(struct wlr_drm_backend *drm,
struct wlr_drm_renderer *renderer) {
renderer->wlr_rend = renderer_autocreate_with_drm_fd(drm->fd);
@ -73,8 +87,8 @@ bool init_drm_surface(struct wlr_drm_surface *surf,
return true;
}
struct wlr_buffer *drm_surface_blit(struct wlr_drm_surface *surf,
struct wlr_buffer *buffer) {
struct wlr_buffer *drm_surface_blit(struct wlr_drm_backend *drm,
struct wlr_drm_surface *surf, struct wlr_buffer *buffer) {
struct wlr_renderer *renderer = surf->renderer->wlr_rend;
if (surf->swapchain->width != buffer->width ||
@ -118,6 +132,9 @@ error_dst:
wlr_buffer_unlock(dst);
error_tex:
wlr_texture_destroy(tex);
if (renderer->lost) {
handle_lost_mgpu_renderer(drm);
}
return NULL;
}