[Mesa-dev] [PATCH 42/43] gallium/targets/d3dadapter9: Free card device
Axel Davy
axel.davy at ens.fr
Fri Jan 30 12:34:41 PST 2015
The drm fd wasn't released, causing a crash
for wine tests on nouveau, which seems to have
a bug when a lot of device descriptors are open.
Signed-off-by: Axel Davy <axel.davy at ens.fr>
---
src/gallium/targets/d3dadapter9/drm.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c
index f054654..cb0c48f 100644
--- a/src/gallium/targets/d3dadapter9/drm.c
+++ b/src/gallium/targets/d3dadapter9/drm.c
@@ -74,27 +74,28 @@ struct d3dadapter9drm_context
{
struct d3dadapter9_context base;
struct pipe_loader_device *dev, *swdev;
+ int fd;
};
static void
drm_destroy( struct d3dadapter9_context *ctx )
{
+ struct d3dadapter9drm_context *drm = (struct d3dadapter9drm_context *)ctx;
+
if (ctx->ref)
ctx->ref->destroy(ctx->ref);
/* because ref is a wrapper around hal, freeing ref frees hal too. */
else if (ctx->hal)
ctx->hal->destroy(ctx->hal);
-#if !GALLIUM_STATIC_TARGETS
- {
- struct d3dadapter9drm_context *drm = (struct d3dadapter9drm_context *)ctx;
- if (drm->swdev)
- pipe_loader_release(&drm->swdev, 1);
- if (drm->dev)
- pipe_loader_release(&drm->dev, 1);
- }
+#if !GALLIUM_STATIC_TARGETS
+ if (drm->swdev)
+ pipe_loader_release(&drm->swdev, 1);
+ if (drm->dev)
+ pipe_loader_release(&drm->dev, 1);
#endif
+ close(drm->fd);
FREE(ctx);
}
@@ -235,6 +236,7 @@ drm_create_adapter( int fd,
ctx->base.destroy = drm_destroy;
fd = loader_get_user_preferred_fd(fd, &different_device);
+ ctx->fd = fd;
ctx->base.linear_framebuffer = !!different_device;
#if GALLIUM_STATIC_TARGETS
--
2.1.0
More information about the mesa-dev
mailing list