2 files changed, 4 insertions, 3 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;
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 912389e38a7d..eac2cec71652 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -290,7 +290,7 @@ void i915_gem_init_ppgtt(struct drm_device *dev)
                 return;
 
 
-        pd_addr = dev_priv->mm.gsm + ppgtt->pd_offset/sizeof(gtt_pte_t);
+        pd_addr = (gtt_pte_t __iomem*)dev_priv->mm.gsm + ppgtt->pd_offset/sizeof(gtt_pte_t);
         for (i = 0; i < ppgtt->num_pd_entries; i++) {
                 dma_addr_t pt_addr;
 
@@ -432,7 +432,8 @@ static void gen6_ggtt_bind_object(struct drm_i915_gem_object *obj,
         struct scatterlist *sg = st->sgl;
         const int first_entry = obj->gtt_space->start >> PAGE_SHIFT;
         const int max_entries = dev_priv->mm.gtt->gtt_total_entries - first_entry;
-        gtt_pte_t __iomem *gtt_entries = dev_priv->mm.gsm + first_entry;
+        gtt_pte_t __iomem *gtt_entries =
+                (gtt_pte_t __iomem *)dev_priv->mm.gsm + first_entry;
         int unused, i = 0;
         unsigned int len, m = 0;
         dma_addr_t addr;