| Message ID | 1460476663-24890-4-git-send-email-matthew.auld@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On ti, 2016-04-12 at 16:57 +0100, Matthew Auld wrote: > We need to kunmap pt_vaddr and not pt itself, otherwise we end up > mapping a bunch of pages without ever unmapping them. > It's always a good idea to use 'git blame' to figure out the bug inducing commit, and include that information + CC'ing the author (Mika here): Fixes: d1c54acd67dc ("drm/i915/gtt: Introduce kmap|kunmap for dma page") With that added, Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Mika to comment on too, looks like fairly straightforward error when doing a mass replace. Regards, Joonas > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Signed-off-by: Matthew Auld <matthew.auld@intel.com> > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index 6601b11..7aef7bf 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -746,7 +746,7 @@ static void gen8_ppgtt_clear_pte_range(struct i915_address_space *vm, > num_entries--; > } > > - kunmap_px(ppgtt, pt); > + kunmap_px(ppgtt, pt_vaddr); > > pte = 0; > if (++pde == I915_PDES) {
Joonas Lahtinen <joonas.lahtinen@linux.intel.com> writes: > [ text/plain ] > On ti, 2016-04-12 at 16:57 +0100, Matthew Auld wrote: >> We need to kunmap pt_vaddr and not pt itself, otherwise we end up >> mapping a bunch of pages without ever unmapping them. >> > > It's always a good idea to use 'git blame' to figure out the bug > inducing commit, and include that information + CC'ing the author (Mika > here): > > Fixes: d1c54acd67dc ("drm/i915/gtt: Introduce kmap|kunmap for dma page") > > With that added, > > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > Mika to comment on too, looks like fairly straightforward error when > doing a mass replace. > Fixes tag added and pushed to dinq. Thanks for patch and review. -Mika > Regards, Joonas > >> Cc: Chris Wilson <chris@chris-wilson.co.uk> >> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> >> Signed-off-by: Matthew Auld <matthew.auld@intel.com> >> --- >> drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c >> index 6601b11..7aef7bf 100644 >> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c >> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c >> @@ -746,7 +746,7 @@ static void gen8_ppgtt_clear_pte_range(struct i915_address_space *vm, >> num_entries--; >> } >> >> - kunmap_px(ppgtt, pt); >> + kunmap_px(ppgtt, pt_vaddr); >> >> pte = 0; >> if (++pde == I915_PDES) { > -- > Joonas Lahtinen > Open Source Technology Center > Intel Corporation
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 6601b11..7aef7bf 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -746,7 +746,7 @@ static void gen8_ppgtt_clear_pte_range(struct i915_address_space *vm, num_entries--; } - kunmap_px(ppgtt, pt); + kunmap_px(ppgtt, pt_vaddr); pte = 0; if (++pde == I915_PDES) {
We need to kunmap pt_vaddr and not pt itself, otherwise we end up mapping a bunch of pages without ever unmapping them. Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Matthew Auld <matthew.auld@intel.com> --- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)