Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

drm: stop trying to use previous encoder/CRTC

Browse source 
Just pick one, simplifies our logic. Now that we disable all CRTCs
on startup, we don't risk stepping over another connector's.
This commit is contained in:
Simon Ser 2021-07-20 20:42:15 +02:00
parent c9af23c750
commit 70d3dda4d4
1 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/drm.cpp
View file

@ -441,7 +441,6 @@ int init_drm(struct drm_t *drm, const char *device)
{ {
drmModeRes *resources; drmModeRes *resources;
drmModeConnector *connector = NULL; drmModeConnector *connector = NULL;
drmModeEncoder *encoder = NULL;
int i, ret; int i, ret;
if (device) { if (device) {
@ -529,25 +528,10 @@ int init_drm(struct drm_t *drm, const char *device)
return -1; return -1;
} }
/* find encoder: */ drm->crtc_id = find_crtc_for_connector(drm, resources, connector);
for (i = 0; i < resources->count_encoders; i++) { if (drm->crtc_id == 0) {
encoder = drmModeGetEncoder(drm->fd, resources->encoders[i]); fprintf(stderr, "no crtc found!\n");
if (encoder->encoder_id == connector->encoder_id) return -1;
break;
drmModeFreeEncoder(encoder);
encoder = NULL;
}
if (encoder) {
drm->crtc_id = encoder->crtc_id;
} else {
uint32_t crtc_id = find_crtc_for_connector(drm, resources, connector);
if (crtc_id == 0) {
fprintf(stderr, "no crtc found!\n");
return -1;
}
drm->crtc_id = crtc_id;
} }
for (i = 0; i < resources->count_crtcs; i++) { for (i = 0; i < resources->count_crtcs; i++) {