From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: airlied@linux.ie, dri-devel@lists.freedesktop.org,
linux-acpi@vger.kernel.org
Subject: [PATCH 05/13] gma500: vram_addr should be __iomem
Date: Wed, 02 May 2012 19:13:47 +0100 [thread overview]
Message-ID: <20120502181342.26650.75371.stgit@bluebook> (raw)
In-Reply-To: <20120502181044.26650.40123.stgit@bluebook>
From: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@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 */
next prev parent reply other threads:[~2012-05-02 18:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-02 18:12 [PATCH 00/13] More GMA500 work Alan Cox
2012-05-02 18:12 ` [PATCH 01/13] gma500: address the lid code Alan Cox
2012-05-02 18:13 ` [PATCH 02/13] gma500: psb_gtt_init(): drop unused variable Alan Cox
2012-05-02 18:13 ` [PATCH 03/13] gma500: gtt: fix __iomem sparse warnings Alan Cox
2012-05-02 18:13 ` [PATCH 04/13] gma500: sgx_reg and vdc_reg should be __iomem Alan Cox
2012-05-02 18:13 ` Alan Cox [this message]
2012-05-02 18:14 ` [PATCH 06/13] gma500: framebuffer: mark psb_fb_helper_funcs as static Alan Cox
2012-05-02 18:14 ` [PATCH 07/13] gma500: psb_irq_turn_off_dpst() fix bit operation Alan Cox
2012-05-02 18:14 ` [PATCH 08/13] gma500: lid_state should be __iomem Alan Cox
2012-05-02 18:16 ` [PATCH 09/13] gma500: oaktrail_hdmi_i2c_handler(): base " Alan Cox
2012-05-02 18:16 ` [PATCH 10/13] gma500: cdv_intel_lvds: mark cdv_intel_lvds_enc_funcs as static Alan Cox
2012-05-02 18:16 ` [PATCH 11/13] gma500: fix -Wmissing-include-dirs warnings Alan Cox
2012-05-02 18:17 ` [PATCH 12/13] gma500: mid-bios: rewrite VBT/GCT handling in a cleaner way Alan Cox
2012-05-02 18:17 ` [PATCH 13/13] gma500: mdfld_dsi_dpi_mode_set() do not corrupt DSPSTRIDE Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120502181342.26650.75371.stgit@bluebook \
--to=alan@lxorguk.ukuu.org.uk \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-acpi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).