From 85cd08696f08b0aeccf7ff938d0d4daeac9923fc Mon Sep 17 00:00:00 2001 From: "Zhang, Xiong Y" Date: Sat, 27 Apr 2013 09:53:33 +0000 Subject: [PATCH] --- yaml --- r: 371629 b: refs/heads/master c: 43b27290dd42b40f3f23f49677a7faa5a4eb1eff h: refs/heads/master i: 371627: fc402b01849a55ae7ebe0281e743319b6350e1bd v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 019ff71f4b2f..02b3a0aacc9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 988b36e511fb0a8068f7e7f7f90df06bf5172196 +refs/heads/master: 43b27290dd42b40f3f23f49677a7faa5a4eb1eff diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c b/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c index 50df194914a6..dca614de71b6 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -233,8 +233,7 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt) /* ppgtt PDEs reside in the global gtt pagetable, which has 512*1024 * entries. For aliasing ppgtt support we just steal them at the end for * now. */ - first_pd_entry_in_global_pt = - gtt_total_entries(dev_priv->gtt) - I915_PPGTT_PD_ENTRIES; + first_pd_entry_in_global_pt = gtt_total_entries(dev_priv->gtt); ppgtt->num_pd_entries = I915_PPGTT_PD_ENTRIES; ppgtt->enable = gen6_ppgtt_enable;