From: Daniel Vetter <daniel@ffwll.ch>
To: "Zhang, Xiong Y" <xiong.y.zhang@intel.com>
Cc: "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 2/2] drm/i915: Correct obj->mm_list link to dev_priv->dev_priv->mm.inactive_list
Date: Fri, 5 Jul 2013 21:34:21 +0200 [thread overview]
Message-ID: <20130705193421.GX18285@phenom.ffwll.local> (raw)
In-Reply-To: <8082FF9BCB2B054996454E47167FF4EC0249B6FE@SHSMSX104.ccr.corp.intel.com>
On Fri, Jul 05, 2013 at 03:21:45PM +0000, Zhang, Xiong Y wrote:
> I found this issue when I read code. I don't have testcase.
Ok, merged to -fixes, thanks for the patch.
-Daniel
>
> thanks
> -----Original Message-----
> From: Daniel Vetter [mailto:daniel.vetter@ffwll.ch] On Behalf Of Daniel Vetter
> Sent: Friday, July 05, 2013 9:41 PM
> To: Zhang, Xiong Y
> Cc: intel-gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915: Correct obj->mm_list link to dev_priv->dev_priv->mm.inactive_list
>
> On Fri, Jul 05, 2013 at 06:53:29PM +0800, Xiong Zhang wrote:
> > obj->mm_list link to dev_priv->mm.inactive_list/active_list
> > obj->global_list link to dev_priv->mm.unbound_list/bound_list
> >
> > Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.com>
>
> Oh dear have I screwed this up.
>
> This fixes a regression introduced in
>
> commit 93927ca52a55c23e0a6a305e7e9082e8411ac9fa
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date: Thu Jan 10 18:03:00 2013 +0100
>
> drm/i915: Revert shrinker changes from "Track unbound pages"
>
> Cc: stable@vger.kernel.org
>
> Now the big question is why none of our tests has caught this. Xiong, how have you tracked down this issues? Do you perhaps have a testcase that can readily reproduce this that we could add to intel-gpu-tools?
>
> Thanks, Daniel
>
> > ---
> > drivers/gpu/drm/i915/i915_gem.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_gem.c
> > b/drivers/gpu/drm/i915/i915_gem.c index 44d890b..b6a2402 100644
> > --- a/drivers/gpu/drm/i915/i915_gem.c
> > +++ b/drivers/gpu/drm/i915/i915_gem.c
> > @@ -4637,7 +4637,7 @@ i915_gem_inactive_shrink(struct shrinker *shrinker, struct shrink_control *sc)
> > list_for_each_entry(obj, &dev_priv->mm.unbound_list, global_list)
> > if (obj->pages_pin_count == 0)
> > cnt += obj->base.size >> PAGE_SHIFT;
> > - list_for_each_entry(obj, &dev_priv->mm.inactive_list, global_list)
> > + list_for_each_entry(obj, &dev_priv->mm.inactive_list, mm_list)
> > if (obj->pin_count == 0 && obj->pages_pin_count == 0)
> > cnt += obj->base.size >> PAGE_SHIFT;
> >
> > --
> > 1.7.9.5
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
prev parent reply other threads:[~2013-07-05 19:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-05 10:53 [PATCH 2/2] drm/i915: Correct obj->mm_list link to dev_priv->dev_priv->mm.inactive_list Xiong Zhang
2013-07-05 13:41 ` Daniel Vetter
2013-07-05 15:21 ` Zhang, Xiong Y
2013-07-05 19:34 ` Daniel Vetter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130705193421.GX18285@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=xiong.y.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox