From 829b62d7e0e0ebe0d8ccccddf47925b9bc581f52 Mon Sep 17 00:00:00 2001
From: Ben Widawsky <ben@bwidawsk.net>
Date: Mon, 8 Apr 2013 18:43:50 -0700
Subject: [PATCH] --- yaml --- r: 371455 b: refs/heads/master c:
 c81dbe056317659ddd7d17779933e5f09d33ffeb h: refs/heads/master i:   371453:
 b666949c7bce932dec2720a2aa606cf4fc709c6b   371451:
 bd1d8c9a1cda91de40ef88c609709600f39db4b3   371447:
 80f35f32aa22d486727d2011e032becf6b12690b   371439:
 ed25a10dc35a9e1c0ae691e782d8d2caedc4ab21   371423:
 1c7f9a5703b2d3e90b395498a5792679a441775b   371391:
 2248b2d06ad4761f439c61e12a5a082e75956fbe   371327:
 6d7635ef66e516a4488d2c2472867346be107699   371199:
 af97cc94528a5064a434df3a2aec5146e455cd7c v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem_gtt.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3ead9f91ba70..08dabd26a6c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e1bd0fd4ef3f74f05e4c164eb57a3b29c5f6790
+refs/heads/master: c81dbe056317659ddd7d17779933e5f09d33ffeb
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c b/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c
index 091b2709cdeb..923c70525f16 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/trunk/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++) {