From 7673a49c8e0d5b524ebf3619dc9fc6ab14c9f7d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Tue, 20 Mar 2012 16:46:22 +0200 Subject: [PATCH] gfx: drv: Move stolen vram iounmap() into gtt code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The stolen memory is ioremap()ed in gtt init. Move the iounmap to the gtt takedown function instead of doing it from the fbdev compatibility code. Signed-off-by: Ville Syrjälä Signed-off-by: Kirill A. Shutemov --- drivers/staging/mrst/drv/psb_fb.c | 1 - drivers/staging/mrst/drv/psb_gtt.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/staging/mrst/drv/psb_fb.c b/drivers/staging/mrst/drv/psb_fb.c index 24265a6..036e60b 100644 --- a/drivers/staging/mrst/drv/psb_fb.c +++ b/drivers/staging/mrst/drv/psb_fb.c @@ -529,7 +529,6 @@ static int psb_fbdev_destroy(struct drm_device * dev, struct psb_fbdev * fbdev) if(fbdev->psb_fb_helper.fbdev) { info = fbdev->psb_fb_helper.fbdev; unregister_framebuffer(info); - iounmap(info->screen_base); framebuffer_release(info); } diff --git a/drivers/staging/mrst/drv/psb_gtt.c b/drivers/staging/mrst/drv/psb_gtt.c index 2025c9e..02a3d89 100644 --- a/drivers/staging/mrst/drv/psb_gtt.c +++ b/drivers/staging/mrst/drv/psb_gtt.c @@ -68,6 +68,10 @@ void psb_gtt_takedown(struct psb_gtt *pg, int free) PSB_WVDC32(pg->pge_ctl, PSB_PGETBL_CTL); (void) PSB_RVDC32(PSB_PGETBL_CTL); } + if (pg->vram_addr) { + iounmap(pg->vram_addr); + pg->vram_addr = NULL; + } if (free) kfree(pg); } -- 2.7.4