summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorBen Widawsky <benjamin.widawsky@intel.com>2012-12-18 22:31:27 +0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-12-20 19:32:04 +0400
commit1c45140d3da0c98fa7eda2cd10f9805232a5e9ac (patch)
tree4310248376ec589798efbb9eff273a854517edaa /drivers/gpu/drm/i915/i915_drv.h
parent06e5598fce5ce89fe8bf081398296e5b08d993dd (diff)
downloadlinux-1c45140d3da0c98fa7eda2cd10f9805232a5e9ac.tar.xz
drm/i915: Make GSM void
The iomapping of the register region has historically been a uint32_t for the obvious reason that our PTE size was always 4b. In the future however, we cannot make this assumption. By making the type void, it makes the upcoming pointer math we will do much easier, and hopefully gives the compiler opportunities to warn us when we do stupid things. v2: Cast to __iomem, caught by Ville Signed-off-by: Ben Widawsky <ben@bwidawsk.net> [danvet: Fixup __iomem issue for real.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index ae88d87be951..d2b93a4a3d71 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -801,7 +801,7 @@ typedef struct drm_i915_private {
unsigned long stolen_base; /* limited to low memory (32-bit) */
/** "Graphics Stolen Memory" holds the global PTEs */
- uint32_t __iomem *gsm;
+ void __iomem *gsm;
struct io_mapping *gtt_mapping;
phys_addr_t gtt_base_addr;