]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
gma500: vram_addr should be __iomem
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Thu, 3 May 2012 14:08:26 +0000 (15:08 +0100)
committerDave Airlie <airlied@redhat.com>
Mon, 7 May 2012 09:58:51 +0000 (10:58 +0100)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/gma500/framebuffer.c
drivers/gpu/drm/gma500/psb_drv.h

index 4fc0d08bd61baf4c3db367de6cb780819e359070..30400b68e4ba448c75b4ccec8fa7b365cd0edc3f 100644 (file)
@@ -455,8 +455,7 @@ static int psbfb_create(struct psb_fbdev *fbdev,
        info->fix.ypanstep = 0;
 
        /* Accessed stolen memory directly */
-       info->screen_base = (char *)dev_priv->vram_addr +
-                                                       backing->offset;
+       info->screen_base = dev_priv->vram_addr + backing->offset;
        info->screen_size = size;
 
        if (dev_priv->gtt.stolen_size) {
index e59511d74934fcfe579944b1fb212aef047157e6..67a863bf803a6f02f64a5e29c3c66a2423e47ab7 100644 (file)
@@ -509,7 +509,7 @@ struct drm_psb_private {
        struct page *scratch_page;
        u32 __iomem *gtt_map;
        uint32_t stolen_base;
-       void *vram_addr;
+       u8 __iomem *vram_addr;
        unsigned long vram_stolen_size;
        int gtt_initialized;
        u16 gmch_ctrl;          /* Saved GTT setup */