public/gpu-screen-recorder
1
0
Fork 0
mirror of https://repo.dec05eba.com/gpu-screen-recorder synced 2026-03-31 09:07:13 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test fix for monitor changing after power off/on

Browse Source
This commit is contained in:
dec05eba
2025-03-07 19:29:10 +01:00
parent 7af4f106e7
commit e6f1d47eef
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
kms/server/kms_server.c
View File

@@ -25,7 +25,6 @@
typedef struct { typedef struct {
int drmfd; int drmfd;
drmModePlaneResPtr planes;
} gsr_drm; } gsr_drm;
typedef struct { typedef struct {
@@ -296,14 +295,20 @@ static int kms_get_fb(gsr_drm *drm, gsr_kms_response *response, connector_to_crt
response->err_msg[0] = '\0'; response->err_msg[0] = '\0';
response->num_items = 0; response->num_items = 0;
for(uint32_t i = 0; i < drm->planes->count_planes && response->num_items < GSR_KMS_MAX_ITEMS; ++i) { drmModePlaneResPtr planes = drmModeGetPlaneResources(drm->drmfd);
if(!planes) {
fprintf(stderr, "kms server error: failed to get plane resources, error: %s\n", strerror(errno));
goto done;
}
for(uint32_t i = 0; i < planes->count_planes && response->num_items < GSR_KMS_MAX_ITEMS; ++i) {
drmModePlanePtr plane = NULL; drmModePlanePtr plane = NULL;
drmModeFB2Ptr drmfb = NULL; drmModeFB2Ptr drmfb = NULL;
plane = drmModeGetPlane(drm->drmfd, drm->planes->planes[i]); plane = drmModeGetPlane(drm->drmfd, planes->planes[i]);
if(!plane) { if(!plane) {
response->result = KMS_RESULT_FAILED_TO_GET_PLANE; response->result = KMS_RESULT_FAILED_TO_GET_PLANE;
snprintf(response->err_msg, sizeof(response->err_msg), "failed to get drm plane with id %u, error: %s\n", drm->planes->planes[i], strerror(errno)); snprintf(response->err_msg, sizeof(response->err_msg), "failed to get drm plane with id %u, error: %s\n", planes->planes[i], strerror(errno));
fprintf(stderr, "kms server error: %s\n", response->err_msg); fprintf(stderr, "kms server error: %s\n", response->err_msg);
goto next; goto next;
} }
@@ -389,6 +394,11 @@ static int kms_get_fb(gsr_drm *drm, gsr_kms_response *response, connector_to_crt
drmModeFreePlane(plane); drmModeFreePlane(plane);
} }
done:
if(planes)
drmModeFreePlaneResources(planes);
if(response->num_items > 0) if(response->num_items > 0)
response->result = KMS_RESULT_OK; response->result = KMS_RESULT_OK;
@@ -499,7 +509,6 @@ int main(int argc, char **argv) {
int socket_fd = 0; int socket_fd = 0;
gsr_drm drm; gsr_drm drm;
drm.drmfd = 0; drm.drmfd = 0;
drm.planes = NULL;
if(argc != 3) { if(argc != 3) {
fprintf(stderr, "usage: gsr-kms-server <domain_socket_path> <card_path>\n"); fprintf(stderr, "usage: gsr-kms-server <domain_socket_path> <card_path>\n");
@@ -532,13 +541,6 @@ int main(int argc, char **argv) {
fprintf(stderr, "kms server warning: drmSetClientCap DRM_CLIENT_CAP_ATOMIC failed, error: %s. The wrong monitor may be captured as a result\n", strerror(errno)); fprintf(stderr, "kms server warning: drmSetClientCap DRM_CLIENT_CAP_ATOMIC failed, error: %s. The wrong monitor may be captured as a result\n", strerror(errno));
} }
drm.planes = drmModeGetPlaneResources(drm.drmfd);
if(!drm.planes) {
fprintf(stderr, "kms server error: failed to get plane resources, error: %s\n", strerror(errno));
res = 2;
goto done;
}
connector_to_crtc_map c2crtc_map; connector_to_crtc_map c2crtc_map;
c2crtc_map.num_maps = 0; c2crtc_map.num_maps = 0;
map_crtc_to_connector_ids(&drm, &c2crtc_map); map_crtc_to_connector_ids(&drm, &c2crtc_map);
@@ -681,8 +683,6 @@ int main(int argc, char **argv) {
} }
done: done:
if(drm.planes)
drmModeFreePlaneResources(drm.planes);
if(drm.drmfd > 0) if(drm.drmfd > 0)
close(drm.drmfd); close(drm.drmfd);
if(socket_fd > 0) if(socket_fd > 0)