Mesa (staging/19.1): iris: close screen fd on iris_destroy_screen

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: cd75223e7d2a0f2f5db1d2d7b6049dee596baf9a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd75223e7d2a0f2f5db1d2d7b6049dee596baf9a

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Tue Sep 17 10:21:24 2019 +0300

iris: close screen fd on iris_destroy_screen

Otherwise it never gets closed, this fixes errors seen with deqp-egl
where we end up opening 1024 files.

Fixes: 2dce0e94 ("iris: Initial commit of a new 'iris' driver for Intel Gen8+ GPUs.")
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 631255387f0469910db99eccbfbaa63345425739)
[Juan A. Suarez: resolve trivial conflicts]
Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>

Conflicts:
	src/gallium/drivers/iris/iris_screen.c

---

 src/gallium/drivers/iris/iris_screen.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c
index 30d32b2ed43..619a39fb655 100644
--- a/src/gallium/drivers/iris/iris_screen.c
+++ b/src/gallium/drivers/iris/iris_screen.c
@@ -476,6 +476,7 @@ iris_destroy_screen(struct pipe_screen *pscreen)
    iris_bo_unreference(screen->workaround_bo);
    u_transfer_helper_destroy(pscreen->transfer_helper);
    iris_bufmgr_destroy(screen->bufmgr);
+   close(screen->fd);
    ralloc_free(screen);
 }