Mesa (main): zink: remove drm_fd

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: c5960f64b139605dbefa34c2cc2a089ba00ae1e2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c5960f64b139605dbefa34c2cc2a089ba00ae1e2

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Apr 28 16:50:56 2022 -0400

zink: remove drm_fd

no longer used

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16226>

---

 src/gallium/drivers/zink/zink_screen.c | 6 ------
 src/gallium/drivers/zink/zink_screen.h | 1 -
 2 files changed, 7 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 5269ba9a065..007e43422c7 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -1234,9 +1234,6 @@ zink_destroy_screen(struct pipe_screen *pscreen)
    vkDestroyInstance(screen->instance, NULL);
    util_idalloc_mt_fini(&screen->buffer_ids);
 
-   if (screen->drm_fd != -1)
-      close(screen->drm_fd);
-
    slab_destroy_parent(&screen->transfer_pool);
    ralloc_free(screen);
    glsl_type_singleton_decref();
@@ -2247,7 +2244,6 @@ zink_create_screen(struct sw_winsys *winsys, const struct pipe_screen_config *co
 {
    struct zink_screen *ret = zink_internal_create_screen(config);
    if (ret) {
-      ret->drm_fd = -1;
       ret->sw_winsys = winsys;
    }
 
@@ -2259,8 +2255,6 @@ zink_drm_create_screen(int fd, const struct pipe_screen_config *config)
 {
    struct zink_screen *ret = zink_internal_create_screen(config);
 
-   if (ret)
-      ret->drm_fd = os_dupfd_cloexec(fd);
    if (ret && !ret->info.have_KHR_external_memory_fd) {
       debug_printf("ZINK: KHR_external_memory_fd required!\n");
       zink_destroy_screen(&ret->base);
diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h
index 6720d6ecda9..7cac6c893c1 100644
--- a/src/gallium/drivers/zink/zink_screen.h
+++ b/src/gallium/drivers/zink/zink_screen.h
@@ -94,7 +94,6 @@ struct zink_screen {
    simple_mtx_t dt_lock;
 
    bool device_lost;
-   int drm_fd;
    struct sw_winsys winsys;
    struct sw_winsys *sw_winsys; // wrapped
    __DRIkopperLoaderExtension *loader;