Use dri card matching current egl context

3 files changed, 63 insertions, 42 deletions

diff --git a/src/egl.c b/src/egl.c
index 884a7a6..5f6da48 100644
--- a/src/egl.c
+++ b/src/egl.c
@@ -355,6 +355,8 @@ static bool gsr_egl_proc_load_egl(gsr_egl *self) {
     self->eglExportDMABUFImageQueryMESA = (FUNC_eglExportDMABUFImageQueryMESA)self->eglGetProcAddress("eglExportDMABUFImageQueryMESA");
     self->eglExportDMABUFImageMESA = (FUNC_eglExportDMABUFImageMESA)self->eglGetProcAddress("eglExportDMABUFImageMESA");
     self->glEGLImageTargetTexture2DOES = (FUNC_glEGLImageTargetTexture2DOES)self->eglGetProcAddress("glEGLImageTargetTexture2DOES");
+    self->eglQueryDisplayAttribEXT = (FUNC_eglQueryDisplayAttribEXT)self->eglGetProcAddress("eglQueryDisplayAttribEXT");
+    self->eglQueryDeviceStringEXT = (FUNC_eglQueryDeviceStringEXT)self->eglGetProcAddress("eglQueryDeviceStringEXT");
 
     if(!self->glEGLImageTargetTexture2DOES) {
         fprintf(stderr, "gsr error: gsr_egl_load failed: could not find glEGLImageTargetTexture2DOES\n");
@@ -521,9 +523,16 @@ bool gsr_egl_load(gsr_egl *self, Display *dpy, bool wayland, bool is_monitor_cap
     if(!gl_get_gpu_info(self, &self->gpu_info))
         goto fail;
 
+    if(self->eglQueryDisplayAttribEXT && self->eglQueryDeviceStringEXT) {
+        intptr_t device = 0;
+        if(self->eglQueryDisplayAttribEXT(self->egl_display, EGL_DEVICE_EXT, &device) && device)
+            self->dri_card_path = self->eglQueryDeviceStringEXT((void*)device, EGL_DRM_DEVICE_FILE_EXT);
+    }
+
     /* Nvfbc requires glx */
     if(!wayland && is_monitor_capture && self->gpu_info.vendor == GSR_GPU_VENDOR_NVIDIA) {
         self->context_type = GSR_GL_CONTEXT_TYPE_GLX;
+        self->dri_card_path = NULL;
         if(!gsr_egl_switch_to_glx_context(self))
             goto fail;
     }
diff --git a/src/main.cpp b/src/main.cpp
index 867e80a..6efa735 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -441,7 +441,7 @@ static AVCodecContext *create_video_codec_context(AVPixelFormat pix_fmt,
         //codec_context->compression_level = 2;
     }
 
-    av_opt_set(codec_context->priv_data, "bsf", "hevc_metadata=colour_primaries=9:transfer_characteristics=16:matrix_coefficients=9", 0);
+    //av_opt_set(codec_context->priv_data, "bsf", "hevc_metadata=colour_primaries=9:transfer_characteristics=16:matrix_coefficients=9", 0);
 
     //codec_context->rc_max_rate = codec_context->bit_rate;
     //codec_context->rc_min_rate = codec_context->bit_rate;
@@ -1376,16 +1376,12 @@ static void list_supported_video_codecs() {
         _exit(1);
     }
 
-    gsr_egl_unload(&egl);
-    if(dpy)
-        XCloseDisplay(dpy);
-
     char card_path[128];
     card_path[0] = '\0';
     if(wayland || egl.gpu_info.vendor != GSR_GPU_VENDOR_NVIDIA) {
         // TODO: Allow specifying another card, and in other places
-        if(!gsr_get_valid_card_path(card_path)) {
-            fprintf(stderr, "Error: no /dev/dri/cardX device found\n");
+        if(!gsr_get_valid_card_path(&egl, card_path)) {
+            fprintf(stderr, "Error: no /dev/dri/cardX device found. If you are using prime-run then run without it\n");
             _exit(2);
         }
     }
@@ -1401,6 +1397,10 @@ static void list_supported_video_codecs() {
         puts("av1");
 
     fflush(stdout);
+
+    gsr_egl_unload(&egl);
+    if(dpy)
+        XCloseDisplay(dpy);
 }
 
 static gsr_capture* create_capture_impl(const char *window_str, const char *screen_region, bool wayland, gsr_gpu_info gpu_inf, gsr_egl &egl, int fps, bool overclock, VideoCodec video_codec, gsr_color_range color_range) {
@@ -1877,8 +1877,8 @@ int main(int argc, char **argv) {
     egl.card_path[0] = '\0';
     if(wayland || egl.gpu_info.vendor != GSR_GPU_VENDOR_NVIDIA) {
         // TODO: Allow specifying another card, and in other places
-        if(!gsr_get_valid_card_path(egl.card_path)) {
-            fprintf(stderr, "Error: no /dev/dri/cardX device found\n");
+        if(!gsr_get_valid_card_path(&egl, egl.card_path)) {
+            fprintf(stderr, "Error: no /dev/dri/cardX device found. If you are using prime-run then run without it\n");
             _exit(2);
         }
     }
diff --git a/src/utils.c b/src/utils.c
index c342f6e..45e58a6 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -370,47 +370,59 @@ bool gl_get_gpu_info(gsr_egl *egl, gsr_gpu_info *info) {
     return supported;
 }
 
-bool gsr_get_valid_card_path(char *output) {
-    for(int i = 0; i < 10; ++i) {
-        drmVersion *ver = NULL;
-        drmModePlaneResPtr planes = NULL;
-        bool found_screen_card = false;
+static bool try_card_has_valid_plane(const char *card_path) {
+    drmVersion *ver = NULL;
+    drmModePlaneResPtr planes = NULL;
+    bool found_screen_card = false;
 
-        sprintf(output, DRM_DEV_NAME, DRM_DIR_NAME, i);
-        int fd = open(output, O_RDONLY);
-        if(fd == -1)
-            continue;
+    int fd = open(card_path, O_RDONLY);
+    if(fd == -1)
+        return false;
 
-        ver = drmGetVersion(fd);
-        if(!ver || strstr(ver->name, "nouveau"))
-            goto next;
+    ver = drmGetVersion(fd);
+    if(!ver || strstr(ver->name, "nouveau"))
+        goto next;
 
-        drmSetClientCap(fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
+    drmSetClientCap(fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
 
-        planes = drmModeGetPlaneResources(fd);
-        if(!planes)
-            goto next;
+    planes = drmModeGetPlaneResources(fd);
+    if(!planes)
+        goto next;
 
-        for(uint32_t j = 0; j < planes->count_planes; ++j) {
-            drmModePlanePtr plane = drmModeGetPlane(fd, planes->planes[j]);
-            if(!plane)
-                continue;
-
-            if(plane->fb_id)
-                found_screen_card = true;
+    for(uint32_t j = 0; j < planes->count_planes; ++j) {
+        drmModePlanePtr plane = drmModeGetPlane(fd, planes->planes[j]);
+        if(!plane)
+            continue;
 
-            drmModeFreePlane(plane);
-            if(found_screen_card)
-                break;
-        }
+        if(plane->fb_id)
+            found_screen_card = true;
 
-        next:
-        if(planes)
-            drmModeFreePlaneResources(planes);
-        if(ver)
-            drmFreeVersion(ver);
-        close(fd);
+        drmModeFreePlane(plane);
         if(found_screen_card)
+            break;
+    }
+
+    next:
+    if(planes)
+        drmModeFreePlaneResources(planes);
+    if(ver)
+        drmFreeVersion(ver);
+    close(fd);
+    if(found_screen_card)
+        return true;
+
+    return false;
+}
+
+bool gsr_get_valid_card_path(gsr_egl *egl, char *output) {
+    if(egl->dri_card_path) {
+        strncpy(output, egl->dri_card_path, 128);
+        return try_card_has_valid_plane(output);
+    }
+
+    for(int i = 0; i < 10; ++i) {
+        snprintf(output, 128, DRM_DEV_NAME, DRM_DIR_NAME, i);
+        if(try_card_has_valid_plane(output))
             return true;
     }
     return false;