Skip to content

Commit 5a894fb

Browse files
committed
[KMS/DRM] Small readability changes.
1 parent 44925aa commit 5a894fb

File tree

1 file changed

+13
-26
lines changed

1 file changed

+13
-26
lines changed

src/video/kmsdrm/SDL_kmsdrmvideo.c

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@
5757

5858
#define KMSDRM_DRI_PATH "/dev/dri/"
5959

60-
61-
6260
static int set_client_caps (int fd)
6361
{
6462
if (KMSDRM_drmSetClientCap(fd, DRM_CLIENT_CAP_ATOMIC, 1)) {
@@ -75,38 +73,27 @@ check_modesetting(int devindex)
7573
{
7674
SDL_bool available = SDL_FALSE;
7775
char device[512];
78-
unsigned int i;
7976
int drm_fd;
8077

8178
SDL_snprintf(device, sizeof (device), "%scard%d", KMSDRM_DRI_PATH, devindex);
82-
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "check_modesetting: probing \"%s\"", device);
8379

8480
drm_fd = open(device, O_RDWR | O_CLOEXEC);
8581
if (drm_fd >= 0) {
8682
if (SDL_KMSDRM_LoadSymbols()) {
87-
drmModeRes *resources = (set_client_caps(drm_fd) < 0) ? NULL : KMSDRM_drmModeGetResources(drm_fd);
83+
drmModeRes *resources = KMSDRM_drmModeGetResources(drm_fd);
8884
if (resources) {
89-
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, "%scard%d connector, encoder and CRTC counts are: %d %d %d",
90-
KMSDRM_DRI_PATH, devindex,
91-
resources->count_connectors, resources->count_encoders, resources->count_crtcs);
92-
93-
if (resources->count_connectors > 0 && resources->count_encoders > 0 && resources->count_crtcs > 0) {
94-
for (i = 0; i < resources->count_connectors; i++) {
95-
drmModeConnector *conn = KMSDRM_drmModeGetConnector(drm_fd, resources->connectors[i]);
96-
97-
if (!conn) {
98-
continue;
99-
}
100-
101-
if (conn->connection == DRM_MODE_CONNECTED && conn->count_modes) {
102-
available = SDL_TRUE;
103-
}
104-
105-
KMSDRM_drmModeFreeConnector(conn);
106-
if (available) {
107-
break;
108-
}
109-
}
85+
86+
SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO,
87+
"%scard%d connector, encoder and CRTC counts are: %d %d %d",
88+
KMSDRM_DRI_PATH, devindex,
89+
resources->count_connectors, resources->count_encoders,
90+
resources->count_crtcs);
91+
92+
if (resources->count_connectors > 0
93+
&& resources->count_encoders > 0
94+
&& resources->count_crtcs > 0)
95+
{
96+
available = SDL_TRUE;
11097
}
11198
KMSDRM_drmModeFreeResources(resources);
11299
}

0 commit comments

Comments
 (0)