| Message ID | 1367626379-1525-1-git-send-email-ben@bwidawsk.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, May 03, 2013 at 05:12:59PM -0700, Ben Widawsky wrote: > When the recent pde calculation was fixed in: > commit 43b27290dd42b40f3f23f49677a7faa5a4eb1eff > Author: Zhang, Xiong Y <xiong.y.zhang@intel.com> > Date: Sat Apr 27 09:53:33 2013 +0000 > > drm/i915: correct the calculation of first_pd_entry_in_global_pt > > It had whitespace errors which I thought Daniel caught and fixed on > merge, but I still see it here on -nightly. > > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> git seems to be doing something funny when merging dinq and -fixes. It's not really a rerere mismatch, since I've killed that and re-resolved the conflicts. Anyway, I've used your patch to fix up the -nightly merge for now and will use it once I'll do an official backmerge. Thanks, Daniel
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 1718936..09b7310 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -263,7 +263,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); + first_pd_entry_in_global_pt = gtt_total_entries(dev_priv->gtt); if (IS_HASWELL(dev)) { ppgtt->pte_encode = hsw_pte_encode;
When the recent pde calculation was fixed in: commit 43b27290dd42b40f3f23f49677a7faa5a4eb1eff Author: Zhang, Xiong Y <xiong.y.zhang@intel.com> Date: Sat Apr 27 09:53:33 2013 +0000 drm/i915: correct the calculation of first_pd_entry_in_global_pt It had whitespace errors which I thought Daniel caught and fixed on merge, but I still see it here on -nightly. Signed-off-by: Ben Widawsky <ben@bwidawsk.net> --- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)