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: [CI 2/5] drm/ttm: return ENOSPC from ttm_bo_mem_space
Date: Wed, 17 Jan 2024 11:52:33 +0100	[thread overview]
Message-ID: <20240117105236.121836-3-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20240117105236.121836-1-thomas.hellstrom@linux.intel.com>

From: Christian König <ckoenig.leichtzumerken@gmail.com>

Only convert it to ENOMEM in ttm_bo_validate.

This allows ttm_bo_validate to distinct between an out of memory
situation and just out of space in a placement domain.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
 drivers/gpu/drm/ttm/ttm_bo.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index edf10618fe2b..8c1eaa74fa21 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -830,7 +830,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
 			goto error;
 	}
 
-	ret = -ENOMEM;
+	ret = -ENOSPC;
 	if (!type_found) {
 		pr_err(TTM_PFX "No compatible memory type found\n");
 		ret = -EINVAL;
@@ -916,6 +916,9 @@ int ttm_bo_validate(struct ttm_buffer_object *bo,
 		return -EINVAL;
 
 	ret = ttm_bo_move_buffer(bo, placement, ctx);
+	/* For backward compatibility with userspace */
+	if (ret == -ENOSPC)
+		return -ENOMEM;
 	if (ret)
 		return ret;
 
-- 
2.43.0


  parent reply	other threads:[~2024-01-17 10:52 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-17 10:52 [CI 0/5] TTM placement changes Thomas Hellström
2024-01-17 10:52 ` [CI 1/5] drm/vmwgfx: remove vmw_vram_gmr_placement Thomas Hellström
2024-01-17 10:52 ` Thomas Hellström [this message]
2024-01-17 10:52 ` [CI 3/5] drm/ttm: replace busy placement with flags v6 Thomas Hellström
2024-01-17 10:52 ` [CI 4/5] drm/ttm: improve idle/busy handling v3 Thomas Hellström
2024-01-17 10:52 ` [CI 5/5] drm/amdgpu: use GTT only as fallback for VRAM|GTT Thomas Hellström
2024-01-17 11:12 ` ✓ CI.Patch_applied: success for TTM placement changes Patchwork
2024-01-17 11:12 ` ✗ CI.checkpatch: warning " Patchwork
2024-01-17 11:13 ` ✓ CI.KUnit: success " Patchwork
2024-01-17 11:20 ` ✓ CI.Build: " Patchwork
2024-01-17 11:21 ` ✓ CI.Hooks: " Patchwork
2024-01-17 11:22 ` ✗ CI.checksparse: warning " Patchwork
2024-01-17 11:47 ` ✗ CI.BAT: failure " 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=20240117105236.121836-3-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