Skip to content

Commit

Permalink
gma500: vram_addr should be __iomem
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kirill A. Shutemov authored and Dave Airlie committed May 7, 2012
1 parent 846a603 commit 37214ca
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/gma500/framebuffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/gma500/psb_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 37214ca

Please sign in to comment.