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

drm: fix find_crtc_for_connector error return value

Browse source 
The return type is uint32_t so we can't return -1. 0 is a perfectly
fine error guard since DRM object IDs can't have this value.
This commit is contained in:
Simon Ser 2021-07-20 19:40:20 +02:00
parent f021460c90
commit a2ba2b1b5b
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/drm.cpp
View file

@ -39,9 +39,7 @@ static int s_drm_log = 0;
static uint32_t find_crtc_for_encoder(const drmModeRes *resources, static uint32_t find_crtc_for_encoder(const drmModeRes *resources,
const drmModeEncoder *encoder) { const drmModeEncoder *encoder) {
int i; for (int i = 0; i < resources->count_crtcs; i++) {
for (i = 0; i < resources->count_crtcs; i++) {
/* possible_crtcs is a bitmask as described here: /* possible_crtcs is a bitmask as described here:
* https://dvdhrm.wordpress.com/2012/09/13/linux-drm-mode-setting-api * https://dvdhrm.wordpress.com/2012/09/13/linux-drm-mode-setting-api
*/ */
@ -53,14 +51,12 @@ static uint32_t find_crtc_for_encoder(const drmModeRes *resources,
} }
/* no match found */ /* no match found */
return -1; return 0;
} }
static uint32_t find_crtc_for_connector(const struct drm_t *drm, const drmModeRes *resources, static uint32_t find_crtc_for_connector(const struct drm_t *drm, const drmModeRes *resources,
const drmModeConnector *connector) { const drmModeConnector *connector) {
int i; for (int i = 0; i < connector->count_encoders; i++) {
for (i = 0; i < connector->count_encoders; i++) {
const uint32_t encoder_id = connector->encoders[i]; const uint32_t encoder_id = connector->encoders[i];
drmModeEncoder *encoder = drmModeGetEncoder(drm->fd, encoder_id); drmModeEncoder *encoder = drmModeGetEncoder(drm->fd, encoder_id);
@ -75,7 +71,7 @@ static uint32_t find_crtc_for_connector(const struct drm_t *drm, const drmModeRe
} }
/* no match found */ /* no match found */
return -1; return 0;
} }
static int get_resources(int fd, drmModeRes **resources) static int get_resources(int fd, drmModeRes **resources)