intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 6/7] drm/i915: move engine scratch to LMEM
Date: Tue, 26 Jan 2021 09:46:11 +0000	[thread overview]
Message-ID: <20210126094612.163290-6-matthew.auld@intel.com> (raw)
In-Reply-To: <20210126094612.163290-1-matthew.auld@intel.com>

Prefer allocating the engine scratch from LMEM on dgfx.

v2: flatten the chain

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_gt.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
index d8e1ab412634..2e46709e04c7 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -4,6 +4,8 @@
  */
 
 #include "debugfs_gt.h"
+
+#include "gem/i915_gem_lmem.h"
 #include "i915_drv.h"
 #include "intel_context.h"
 #include "intel_gt.h"
@@ -344,11 +346,13 @@ static int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)
 	struct i915_vma *vma;
 	int ret;
 
-	obj = i915_gem_object_create_stolen(i915, size);
+	obj = i915_gem_object_create_lmem(i915, size, I915_BO_ALLOC_VOLATILE);
+	if (IS_ERR(obj))
+		obj = i915_gem_object_create_stolen(i915, size);
 	if (IS_ERR(obj))
 		obj = i915_gem_object_create_internal(i915, size);
 	if (IS_ERR(obj)) {
-		DRM_ERROR("Failed to allocate scratch page\n");
+		drm_err(&i915->drm, "Failed to allocate scratch page\n");
 		return PTR_ERR(obj);
 	}
 
-- 
2.26.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2021-01-26  9:46 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-26  9:46 [Intel-gfx] [PATCH 1/7] drm/i915: setup the LMEM region Matthew Auld
2021-01-26  9:46 ` [Intel-gfx] [PATCH 2/7] drm/i915: reserve stolen for " Matthew Auld
2021-01-26 10:27   ` Chris Wilson
2021-01-26 10:38     ` Matthew Auld
2021-01-26  9:46 ` [Intel-gfx] [PATCH 3/7] drm/i915: introduce mem->reserved Matthew Auld
2021-01-26  9:46 ` [Intel-gfx] [PATCH 4/7] drm/i915/dg1: Reserve first 1MB of local memory Matthew Auld
2021-01-26  9:46 ` [Intel-gfx] [PATCH 5/7] drm/i915: allocate context from LMEM Matthew Auld
2021-01-26  9:46 ` Matthew Auld [this message]
2021-01-26  9:46 ` [Intel-gfx] [PATCH 7/7] drm/i915: allocate cmd ring in lmem Matthew Auld
2021-01-26 10:09 ` [Intel-gfx] [PATCH 1/7] drm/i915: setup the LMEM region Tvrtko Ursulin
2021-01-26 10:38   ` Matthew Auld
2021-01-26 10:46     ` Chris Wilson
2021-01-26 10:20 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/7] " Patchwork
2021-01-26 10:21 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-01-26 10:51 ` [Intel-gfx] ✗ Fi.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=20210126094612.163290-6-matthew.auld@intel.com \
    --to=matthew.auld@intel.com \
    --cc=intel-gfx@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;
as well as URLs for NNTP newsgroup(s).