diff options
| author | Ben Widawsky <benjamin.widawsky@intel.com> | 2012-12-18 10:31:24 -0800 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-12-18 22:32:03 +0100 |
| commit | 079a43f67f41274b137d8be1fb6093c8f6b6a762 (patch) | |
| tree | a2496cca57b366619e73a71b7ebdb9022cd20d2f /drivers/gpu | |
| parent | 8782e26c0cf3444a0d11400277bb44de710a0142 (diff) | |
| download | op-kernel-dev-079a43f67f41274b137d8be1fb6093c8f6b6a762.zip op-kernel-dev-079a43f67f41274b137d8be1fb6093c8f6b6a762.tar.gz | |
drm/i915: Missed conversion to gtt_pte_t
commit f61c0609073133375ace61f74b0e4e7cf631406b
Author: Ben Widawsky <ben@bwidawsk.net>
Date: Mon Oct 22 11:44:43 2012 -0700
drm/i915: introduce gtt_pte_t
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index cc1be53..ea646b4 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -282,7 +282,7 @@ void i915_gem_init_ppgtt(struct drm_device *dev) uint32_t pd_offset; struct intel_ring_buffer *ring; struct i915_hw_ppgtt *ppgtt = dev_priv->mm.aliasing_ppgtt; - uint32_t __iomem *pd_addr; + gtt_pte_t __iomem *pd_addr; uint32_t pd_entry; int i; @@ -290,7 +290,7 @@ void i915_gem_init_ppgtt(struct drm_device *dev) return; - pd_addr = dev_priv->mm.gtt->gtt + ppgtt->pd_offset/sizeof(uint32_t); + pd_addr = dev_priv->mm.gtt->gtt + ppgtt->pd_offset/sizeof(gtt_pte_t); for (i = 0; i < ppgtt->num_pd_entries; i++) { dma_addr_t pt_addr; |
