summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorBen Widawsky2013-04-09 03:43:50 +0200
committerDaniel Vetter2013-04-18 09:43:13 +0200
commitc81dbe056317659ddd7d17779933e5f09d33ffeb (patch)
tree84468962ec6aacf3dcdcc4f87b2965baf044e227 /drivers/gpu/drm/i915
parentdrm/i915: Map registers before GTT init (diff)
downloadkernel-qcow2-linux-c81dbe056317659ddd7d17779933e5f09d33ffeb.tar.gz
kernel-qcow2-linux-c81dbe056317659ddd7d17779933e5f09d33ffeb.tar.xz
kernel-qcow2-linux-c81dbe056317659ddd7d17779933e5f09d33ffeb.zip
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
-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;
#define GEN6_PTE_ADDR_ENCODE(addr) GEN6_GTT_ADDR_ENCODE(addr)
static inline gen6_gtt_pte_t gen6_pte_encode(struct drm_device *dev,
- dma_addr_t addr,
- enum i915_cache_level level)
+ dma_addr_t addr,
+ enum i915_cache_level level)
{
gen6_gtt_pte_t pte = GEN6_PTE_VALID;
pte |= GEN6_PTE_ADDR_ENCODE(addr);
@@ -289,7 +289,6 @@ void i915_gem_init_ppgtt(struct drm_device *dev)
if (!dev_priv->mm.aliasing_ppgtt)
return;
-
pd_addr = (gen6_gtt_pte_t __iomem *)dev_priv->gtt.gsm +
ppgtt->pd_offset / sizeof(gen6_gtt_pte_t);
for (i = 0; i < ppgtt->num_pd_entries; i++) {