aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2013-04-08 21:43:50 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-04-18 03:43:13 -0400
commitc81dbe056317659ddd7d17779933e5f09d33ffeb (patch)
tree84468962ec6aacf3dcdcc4f87b2965baf044e227
parent1e1bd0fd4ef3f74f05e4c164eb57a3b29c5f6790 (diff)
drm/i915: random checkpatch fixes
There used to be other fixes in this patch but they've slowly disappeared as other parts have been fixed. Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_gem_gtt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 091b2709cdeb..923c70525f16 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -45,8 +45,8 @@ typedef uint32_t gen6_gtt_pte_t;
45#define GEN6_PTE_ADDR_ENCODE(addr) GEN6_GTT_ADDR_ENCODE(addr) 45#define GEN6_PTE_ADDR_ENCODE(addr) GEN6_GTT_ADDR_ENCODE(addr)
46 46
47static inline gen6_gtt_pte_t gen6_pte_encode(struct drm_device *dev, 47static inline gen6_gtt_pte_t gen6_pte_encode(struct drm_device *dev,
48 dma_addr_t addr, 48 dma_addr_t addr,
49 enum i915_cache_level level) 49 enum i915_cache_level level)
50{ 50{
51 gen6_gtt_pte_t pte = GEN6_PTE_VALID; 51 gen6_gtt_pte_t pte = GEN6_PTE_VALID;
52 pte |= GEN6_PTE_ADDR_ENCODE(addr); 52 pte |= GEN6_PTE_ADDR_ENCODE(addr);
@@ -289,7 +289,6 @@ void i915_gem_init_ppgtt(struct drm_device *dev)
289 if (!dev_priv->mm.aliasing_ppgtt) 289 if (!dev_priv->mm.aliasing_ppgtt)
290 return; 290 return;
291 291
292
293 pd_addr = (gen6_gtt_pte_t __iomem *)dev_priv->gtt.gsm + 292 pd_addr = (gen6_gtt_pte_t __iomem *)dev_priv->gtt.gsm +
294 ppgtt->pd_offset / sizeof(gen6_gtt_pte_t); 293 ppgtt->pd_offset / sizeof(gen6_gtt_pte_t);
295 for (i = 0; i < ppgtt->num_pd_entries; i++) { 294 for (i = 0; i < ppgtt->num_pd_entries; i++) {