gfx: drv: Move stolen vram iounmap() into gtt code

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ä <ville.syrjala@linux.intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

diff --git a/drivers/staging/mrst/drv/psb_fb.c b/drivers/staging/mrst/drv/psb_fb.c
index 24265a6..036e60b 100644 (file)
--- 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 (file)
--- 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);
 }