From: Kirill A. Shutemov <[email protected]>

Signed-off-by: Kirill A. Shutemov <kirill.shutemov at linux.intel.com>
Signed-off-by: Alan Cox <alan at linux.intel.com>
---

 drivers/gpu/drm/gma500/framebuffer.c |    3 +--
 drivers/gpu/drm/gma500/psb_drv.h     |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/gma500/framebuffer.c 
b/drivers/gpu/drm/gma500/framebuffer.c
index 4fc0d08..30400b6 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -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) {
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index e59511d..67a863b 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -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 */

Reply via email to