From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: Matthew Auld <matthew.auld@intel.com>, intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915/migrate: move the sanity check
Date: Fri, 25 Mar 2022 08:17:55 +0100 [thread overview]
Message-ID: <42afeff2-88f3-5900-0daa-92b71b7d9cd3@linux.intel.com> (raw)
In-Reply-To: <20220324172143.377104-2-matthew.auld@intel.com>
On 3/24/22 18:21, Matthew Auld wrote:
> Move the sanity check that both src and dst are never both system
> memory, which should never happen on discrete, and likely means we have
> a bug. The only exception is on integrated where we trigger this path in
> the selftests.
>
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
> Cc: Nirmoy Das <nirmoy.das@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_migrate.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c b/drivers/gpu/drm/i915/gt/intel_migrate.c
> index 20444d6ceb3c..950fd6da146c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_migrate.c
> +++ b/drivers/gpu/drm/i915/gt/intel_migrate.c
> @@ -530,6 +530,7 @@ intel_context_migrate_copy(struct intel_context *ce,
> int err;
>
> GEM_BUG_ON(ce->vm != ce->engine->gt->migrate.context->vm);
> + GEM_BUG_ON(IS_DGFX(ce->engine->i915) && (!src_is_lmem && !dst_is_lmem));
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
> *out = NULL;
>
> GEM_BUG_ON(ce->ring->size < SZ_64K);
> @@ -566,8 +567,6 @@ intel_context_migrate_copy(struct intel_context *ce,
> src_offset = 0;
> dst_offset = CHUNK_SZ;
> if (HAS_64K_PAGES(ce->engine->i915)) {
> - GEM_BUG_ON(!src_is_lmem && !dst_is_lmem);
> -
> src_offset = 0;
> dst_offset = 0;
> if (src_is_lmem)
WARNING: multiple messages have this Message-ID (diff)
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: Matthew Auld <matthew.auld@intel.com>, intel-gfx@lists.freedesktop.org
Cc: Nirmoy Das <nirmoy.das@linux.intel.com>, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 2/2] drm/i915/migrate: move the sanity check
Date: Fri, 25 Mar 2022 08:17:55 +0100 [thread overview]
Message-ID: <42afeff2-88f3-5900-0daa-92b71b7d9cd3@linux.intel.com> (raw)
In-Reply-To: <20220324172143.377104-2-matthew.auld@intel.com>
On 3/24/22 18:21, Matthew Auld wrote:
> Move the sanity check that both src and dst are never both system
> memory, which should never happen on discrete, and likely means we have
> a bug. The only exception is on integrated where we trigger this path in
> the selftests.
>
> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
> Cc: Nirmoy Das <nirmoy.das@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_migrate.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c b/drivers/gpu/drm/i915/gt/intel_migrate.c
> index 20444d6ceb3c..950fd6da146c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_migrate.c
> +++ b/drivers/gpu/drm/i915/gt/intel_migrate.c
> @@ -530,6 +530,7 @@ intel_context_migrate_copy(struct intel_context *ce,
> int err;
>
> GEM_BUG_ON(ce->vm != ce->engine->gt->migrate.context->vm);
> + GEM_BUG_ON(IS_DGFX(ce->engine->i915) && (!src_is_lmem && !dst_is_lmem));
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
> *out = NULL;
>
> GEM_BUG_ON(ce->ring->size < SZ_64K);
> @@ -566,8 +567,6 @@ intel_context_migrate_copy(struct intel_context *ce,
> src_offset = 0;
> dst_offset = CHUNK_SZ;
> if (HAS_64K_PAGES(ce->engine->i915)) {
> - GEM_BUG_ON(!src_is_lmem && !dst_is_lmem);
> -
> src_offset = 0;
> dst_offset = 0;
> if (src_is_lmem)
next prev parent reply other threads:[~2022-03-25 7:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-24 17:21 [Intel-gfx] [PATCH 1/2] drm/i915/ttm: limit where we apply TTM_PL_FLAG_CONTIGUOUS Matthew Auld
2022-03-24 17:21 ` Matthew Auld
2022-03-24 17:21 ` [Intel-gfx] [PATCH 2/2] drm/i915/migrate: move the sanity check Matthew Auld
2022-03-24 17:21 ` Matthew Auld
2022-03-25 7:17 ` Thomas Hellström [this message]
2022-03-25 7:17 ` Thomas Hellström
2022-03-24 17:37 ` [Intel-gfx] ✗ Fi.CI.DOCS: warning for series starting with [1/2] drm/i915/ttm: limit where we apply TTM_PL_FLAG_CONTIGUOUS Patchwork
2022-03-24 18:04 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2022-03-25 7:16 ` [Intel-gfx] [PATCH 1/2] " Thomas Hellström
2022-03-25 7:16 ` Thomas Hellström
2022-03-25 10:03 ` [Intel-gfx] " Das, Nirmoy
2022-03-25 10:03 ` Das, Nirmoy
2022-03-25 10:05 ` [Intel-gfx] " Das, Nirmoy
2022-03-25 10:06 ` Das, Nirmoy
2022-03-25 10:09 ` Das, Nirmoy
2022-03-25 8:53 ` [Intel-gfx] ✗ Fi.CI.DOCS: warning for series starting with [1/2] drm/i915/ttm: limit where we apply TTM_PL_FLAG_CONTIGUOUS (rev2) Patchwork
2022-03-25 9:22 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2022-03-25 9:48 ` Matthew Auld
2022-03-25 15:34 ` Vudum, Lakshminarayana
2022-03-25 15:20 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-03-25 17:39 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-03-28 22:26 ` [Intel-gfx] ✗ Fi.CI.DOCS: warning for series starting with [1/2] drm/i915/ttm: limit where we apply TTM_PL_FLAG_CONTIGUOUS (rev3) Patchwork
2022-03-28 22:48 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-03-29 1:14 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
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=42afeff2-88f3-5900-0daa-92b71b7d9cd3@linux.intel.com \
--to=thomas.hellstrom@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.auld@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.