From: Robert Beckett <bob.beckett@collabora.com>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>
Cc: "Robert Beckett" <bob.beckett@collabora.com>,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
"Matthew Auld" <matthew.auld@intel.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v5 5/6] drm/i915: allow memory region creators to alloc and free the region
Date: Thu, 28 Apr 2022 20:11:24 +0000 [thread overview]
Message-ID: <20220428201125.412896-6-bob.beckett@collabora.com> (raw)
In-Reply-To: <20220428201125.412896-1-bob.beckett@collabora.com>
add callbacks for alloc and free.
this allows region creators to allocate any extra storage they may
require.
Signed-off-by: Robert Beckett <bob.beckett@collabora.com>
---
drivers/gpu/drm/i915/intel_memory_region.c | 16 +++++++++++++---
drivers/gpu/drm/i915/intel_memory_region.h | 2 ++
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
index e38d2db1c3e3..3da07a712f90 100644
--- a/drivers/gpu/drm/i915/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/intel_memory_region.c
@@ -231,7 +231,10 @@ intel_memory_region_create(struct drm_i915_private *i915,
struct intel_memory_region *mem;
int err;
- mem = kzalloc(sizeof(*mem), GFP_KERNEL);
+ if (ops->alloc)
+ mem = ops->alloc();
+ else
+ mem = kzalloc(sizeof(*mem), GFP_KERNEL);
if (!mem)
return ERR_PTR(-ENOMEM);
@@ -265,7 +268,10 @@ intel_memory_region_create(struct drm_i915_private *i915,
if (mem->ops->release)
mem->ops->release(mem);
err_free:
- kfree(mem);
+ if (mem->ops->free)
+ mem->ops->free(mem);
+ else
+ kfree(mem);
return ERR_PTR(err);
}
@@ -288,7 +294,11 @@ void intel_memory_region_destroy(struct intel_memory_region *mem)
GEM_WARN_ON(!list_empty_careful(&mem->objects.list));
mutex_destroy(&mem->objects.lock);
- if (!ret)
+ if (ret)
+ return;
+ if (mem->ops->free)
+ mem->ops->free(mem);
+ else
kfree(mem);
}
diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
index 3d8378c1b447..048955b5429f 100644
--- a/drivers/gpu/drm/i915/intel_memory_region.h
+++ b/drivers/gpu/drm/i915/intel_memory_region.h
@@ -61,6 +61,8 @@ struct intel_memory_region_ops {
resource_size_t size,
resource_size_t page_size,
unsigned int flags);
+ struct intel_memory_region *(*alloc)(void);
+ void (*free)(struct intel_memory_region *mem);
};
struct intel_memory_region {
--
2.25.1
next prev parent reply other threads:[~2022-04-28 20:12 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-28 20:11 [PATCH v5 0/6] drm/i915: ttm for stolen region Robert Beckett
2022-04-28 20:11 ` [PATCH v5 1/6] drm/i915: instantiate ttm ranger manager for stolen memory Robert Beckett
2022-04-28 20:11 ` [PATCH v5 2/6] drm/i915: sanitize mem_flags for stolen buffers Robert Beckett
2022-04-28 20:11 ` [PATCH v5 3/6] drm/i915: ttm move/clear logic fix Robert Beckett
2022-04-28 20:11 ` [PATCH v5 4/6] drm/i915: ttm backend dont provide mmap_offset for kernel buffers Robert Beckett
2022-04-28 20:11 ` Robert Beckett [this message]
2022-04-28 20:11 ` [PATCH v5 6/6] drm/i915: stolen memory use ttm backend Robert Beckett
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=20220428201125.412896-6-bob.beckett@collabora.com \
--to=bob.beckett@collabora.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.auld@intel.com \
--cc=rodrigo.vivi@intel.com \
--cc=thomas.hellstrom@linux.intel.com \
--cc=tvrtko.ursulin@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;
as well as URLs for NNTP newsgroup(s).