diff options
| author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2012-05-03 15:08:26 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-07 10:58:51 +0100 |
| commit | 37214ca00e64749e1e65f159aa88f206acfd8e38 (patch) | |
| tree | 135791d16fda776beb8f3c827ea7cb2be389db0a /drivers/gpu | |
| parent | 846a6038d6260153cb16377515e372ed10a2020f (diff) | |
| download | blackbird-op-linux-37214ca00e64749e1e65f159aa88f206acfd8e38.tar.gz blackbird-op-linux-37214ca00e64749e1e65f159aa88f206acfd8e38.zip | |
gma500: vram_addr should be __iomem
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/gma500/framebuffer.c | 3 | ||||
| -rw-r--r-- | 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 4fc0d08bd61b..30400b68e4ba 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 e59511d74934..67a863bf803a 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 */ |
