summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nouveau/nouveau_screen.c
diff options
context:
space:
mode:
authorMarcin Slusarz <[email protected]>2011-12-02 22:02:51 +0100
committerMarcin Slusarz <[email protected]>2011-12-13 21:06:29 +0100
commit10e931219f0619c01456dd13fea65b8c21f3b87b (patch)
tree8da9e29e0a91bc829cd370d8f933f72033f8e4e4 /src/gallium/drivers/nouveau/nouveau_screen.c
parent642d11da207e9becfa26a9e038db1c7520ec2aee (diff)
nouveau: get rid of winsys object
Its only purpose was to destroy itself.
Diffstat (limited to 'src/gallium/drivers/nouveau/nouveau_screen.c')
-rw-r--r--src/gallium/drivers/nouveau/nouveau_screen.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
index cdc2bffee81..99546a21319 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -22,6 +22,8 @@
#include "state_tracker/drm_driver.h"
#include "util/u_simple_screen.h"
+#include "nouveau_drmif.h"
+
int nouveau_mesa_debug = 0;
static const char *
@@ -234,14 +236,11 @@ nouveau_screen_init(struct nouveau_screen *screen, struct nouveau_device *dev)
void
nouveau_screen_fini(struct nouveau_screen *screen)
{
- struct pipe_winsys *ws = screen->base.winsys;
-
nouveau_mm_destroy(screen->mm_GART);
nouveau_mm_destroy(screen->mm_VRAM);
nouveau_channel_free(&screen->channel);
- if (ws)
- ws->destroy(ws);
+ nouveau_device_close(&screen->device);
}