Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [Intel-xe] [PATCH 6/6] drm/ttm: Don't shadow the operation context
Date: Fri, 16 Jun 2023 11:55:04 +0200	[thread overview]
Message-ID: <20230616095504.17084-7-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20230616095504.17084-1-thomas.hellstrom@linux.intel.com>

ttm_bo_swapout() shadows the ttm operation context which may cause
major confusion in driver callbacks when swapping out !TTM_PL_SYSTEM
memory. Fix this by reusing the operation context argument to
ttm_bo_swapout().

Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
 drivers/gpu/drm/ttm/ttm_bo.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index bd5dae4d1624..615d30c4262d 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1154,7 +1154,6 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx,
 	 * Move to system cached
 	 */
 	if (bo->resource->mem_type != TTM_PL_SYSTEM) {
-		struct ttm_operation_ctx ctx = { false, false };
 		struct ttm_resource *evict_mem;
 		struct ttm_place hop;
 
@@ -1164,7 +1163,7 @@ int ttm_bo_swapout(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx,
 		if (unlikely(ret))
 			goto out;
 
-		ret = ttm_bo_handle_move_mem(bo, evict_mem, true, &ctx, &hop);
+		ret = ttm_bo_handle_move_mem(bo, evict_mem, true, ctx, &hop);
 		if (unlikely(ret != 0)) {
 			WARN(ret == -EMULTIHOP, "Unexpected multihop in swaput - likely driver bug.\n");
 			goto out;
-- 
2.40.1


  parent reply	other threads:[~2023-06-16  9:56 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-16  9:54 [Intel-xe] [PATCH 0/6] drm/xe: Eviction fixes and optimizations Thomas Hellström
2023-06-16  9:54 ` [Intel-xe] [PATCH 1/6] drm/xe/bo: Don't limit the TT manager to half of system memory Thomas Hellström
2023-06-16 15:09   ` Matthew Brost
2023-06-16 22:18     ` Souza, Jose
2023-06-16  9:55 ` [Intel-xe] [PATCH 2/6] drm/xe/bo: Fix swapin when moving to VRAM Thomas Hellström
2023-06-16 15:50   ` Matthew Brost
2023-06-16  9:55 ` [Intel-xe] [PATCH 3/6] drm/xe/bo: Avoid creating a system resource when allocating a fresh VRAM bo Thomas Hellström
2023-06-16 20:32   ` Matthew Brost
2023-06-19  9:51     ` Thomas Hellström
2023-06-16  9:55 ` [Intel-xe] [PATCH 4/6] drm/xe/bo: Gracefully handle errors from ttm_bo_move_accel_cleanup() Thomas Hellström
2023-06-16 20:36   ` Matthew Brost
2023-06-19 11:59     ` Thomas Hellström
2023-06-16  9:55 ` [Intel-xe] [PATCH 5/6] drm/xe/bo: Evict VRAM to TT rather than to system Thomas Hellström
2023-06-16 20:47   ` Matthew Brost
2023-06-19 12:00     ` Thomas Hellström
2023-06-16  9:55 ` Thomas Hellström [this message]
2023-06-16 20:51   ` [Intel-xe] [PATCH 6/6] drm/ttm: Don't shadow the operation context Matthew Brost
2023-06-16 10:09 ` [Intel-xe] ✓ CI.Patch_applied: success for drm/xe: Eviction fixes and optimizations Patchwork
2023-06-16 10:09 ` [Intel-xe] ✓ CI.checkpatch: " Patchwork
2023-06-16 10:10 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-06-16 10:14 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-06-16 10:15 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-06-16 10:16 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-06-16 11:00 ` [Intel-xe] ○ CI.BAT: info " 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=20230616095504.17084-7-thomas.hellstrom@linux.intel.com \
    --to=thomas.hellstrom@linux.intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    /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