dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
	dri-devel@lists.freedesktop.org,
	"Nirmoy Das" <nirmoy.das@intel.com>
Subject: [PATCH v3 06/15] drm/i915/buddy: tweak 2big check
Date: Fri, 11 Feb 2022 11:34:28 +0000	[thread overview]
Message-ID: <20220211113437.874691-7-matthew.auld@intel.com> (raw)
In-Reply-To: <20220211113437.874691-1-matthew.auld@intel.com>

Otherwise we get -EINVAL, instead of the more useful -E2BIG if the
allocation doesn't fit within the pfn range, like with mappable lmem.
The hugepages selftest, for example, needs this to know if a smaller
size is needed.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: Nirmoy Das <nirmoy.das@intel.com>
---
 drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_ttm_buddy_manager.c b/drivers/gpu/drm/i915/i915_ttm_buddy_manager.c
index 0ac6b2463fd5..92d49a3c378c 100644
--- a/drivers/gpu/drm/i915/i915_ttm_buddy_manager.c
+++ b/drivers/gpu/drm/i915/i915_ttm_buddy_manager.c
@@ -82,7 +82,7 @@ static int i915_ttm_buddy_man_alloc(struct ttm_resource_manager *man,
 			lpfn = pages;
 	}
 
-	if (size > mm->size) {
+	if (size > lpfn << PAGE_SHIFT) {
 		err = -E2BIG;
 		goto err_free_res;
 	}
-- 
2.34.1


  parent reply	other threads:[~2022-02-11 11:35 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-11 11:34 [PATCH v3 00/15] Initial support for small BAR recovery Matthew Auld
2022-02-11 11:34 ` [PATCH v3 01/15] drm/i915: add io_size plumbing Matthew Auld
2022-02-11 11:34 ` [PATCH v3 02/15] drm/i915/ttm: require mappable by default Matthew Auld
2022-02-11 11:34 ` [PATCH v3 03/15] drm/i915: add I915_BO_ALLOC_GPU_ONLY Matthew Auld
2022-02-11 11:34 ` [PATCH v3 04/15] drm/i915/buddy: track available visible size Matthew Auld
2022-02-11 11:34 ` [PATCH v3 05/15] drm/i915/buddy: adjust res->start Matthew Auld
2022-02-11 11:34 ` Matthew Auld [this message]
2022-02-11 11:34 ` [PATCH v3 07/15] drm/i915/selftests: mock test io_size Matthew Auld
2022-02-11 11:34 ` [PATCH v3 08/15] drm/i915/ttm: make eviction mappable aware Matthew Auld
2022-02-11 11:34 ` [PATCH v3 09/15] drm/i915/ttm: mappable migration on fault Matthew Auld
2022-02-11 11:34 ` [PATCH v3 10/15] drm/i915/selftests: exercise mmap migration Matthew Auld
2022-02-11 11:34 ` [PATCH v3 11/15] drm/i915/selftests: handle allocation failures Matthew Auld
2022-02-11 11:34 ` [PATCH v3 12/15] drm/i915/create: apply ALLOC_GPU_ONLY by default Matthew Auld
2022-02-11 12:48   ` Thomas Hellström
2022-02-11 11:34 ` [PATCH v3 13/15] drm/i915/uapi: add NEEDS_CPU_ACCESS hint Matthew Auld
2022-02-11 11:34 ` [PATCH v3 14/15] drm/i915/uapi: forbid ALLOC_GPU_ONLY for error capture Matthew Auld
2022-02-11 12:50   ` Thomas Hellström
2022-02-11 11:34 ` [PATCH v3 15/15] drm/i915/lmem: don't treat small BAR as an error Matthew Auld

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=20220211113437.874691-7-matthew.auld@intel.com \
    --to=matthew.auld@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=nirmoy.das@intel.com \
    --cc=thomas.hellstrom@linux.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