From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Michel Thierry <michel.thierry@intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path
Date: Thu, 25 Jun 2015 18:39:30 +0300 [thread overview]
Message-ID: <87r3ozpzkd.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <1435233578-29520-1-git-send-email-michel.thierry@intel.com>
Michel Thierry <michel.thierry@intel.com> writes:
> If for some reason [1], the page directory/table does not exist, clear_range
> would end up in an infinite while loop.
>
> Introduced by commit 06fda602dbca ("drm/i915: Create page table allocators").
>
> [1] This is already being addressed in one of Mika's patches:
> http://mid.gmane.org/1432314314-23530-17-git-send-email-mika.kuoppala@intel.com
>
We need both.
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> Reported-by: John Harrison <john.c.harrison@intel.com>
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 2279e03..5dbe928 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -517,17 +517,17 @@ static void gen8_ppgtt_clear_range(struct i915_address_space *vm,
> struct page *page_table;
>
> if (WARN_ON(!ppgtt->pdp.page_directory[pdpe]))
> - continue;
> + break;
>
> pd = ppgtt->pdp.page_directory[pdpe];
>
> if (WARN_ON(!pd->page_table[pde]))
> - continue;
> + break;
>
> pt = pd->page_table[pde];
>
> if (WARN_ON(!pt->page))
> - continue;
> + break;
>
> page_table = pt->page;
>
> --
> 2.4.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-06-25 15:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-25 11:59 [PATCH] drm/i915/ppgtt: Break loop in gen8_ppgtt_clear_range failure path Michel Thierry
2015-06-25 15:39 ` Mika Kuoppala [this message]
2015-06-25 16:04 ` Daniel Vetter
2015-06-26 10:38 ` Jani Nikula
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=87r3ozpzkd.fsf@gaia.fi.intel.com \
--to=mika.kuoppala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=michel.thierry@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