drm/i915/gem: Introduce a migrate interface
Subsystems (3)
v2 cover drm/i915/gem: Introduce a migrate interface
We want to be able to explicitly migrate objects between gem memory regions, initially for display and dma-buf, but there might be more use-cases coming up.
Introduce a gem migrate interface, add a selftest and use it for display fb pinning and dma-buf mapping.
This series should make accelerated desktop work on DG1 with DG1-enabled OpenGL.
v2:
- Address review comments by Matthew Auld on patch 1/5. More details on the patch commit message.
- Address a dma-buf locking issue pointed out by Michael Ruhl, and add a selftest to catch that issue moving forward.
- Rebase the dma-buf migration patch on the above-mentioned fix.
Matthew Auld (1):
drm/i915/gem: Introduce a selftest for the gem object migrate
functionality
Thomas Hellström (4):
drm/i915/gem: Implement object migration drm/i915/display: Migrate objects to LMEM if possible for display drm/i915/gem: Fix same-driver-another-instance dma-buf export drm/i915/gem: Migrate to system at dma-buf map time
drivers/gpu/drm/i915/display/intel_display.c | 5 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 36 ++- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 21 -- drivers/gpu/drm/i915/gem/i915_gem_object.c | 97 +++++++ drivers/gpu/drm/i915/gem/i915_gem_object.h | 12 +- .../gpu/drm/i915/gem/i915_gem_object_types.h | 9 + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 69 +++-- drivers/gpu/drm/i915/gem/i915_gem_wait.c | 19 ++ .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 83 +++++- .../drm/i915/gem/selftests/i915_gem_migrate.c | 237 ++++++++++++++++++ .../drm/i915/selftests/i915_live_selftests.h | 1 + 12 files changed, 546 insertions(+), 45 deletions(-) create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
Signature · 6 lines
2.31.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/5 drm/i915/gem: Implement object migration
Introduce an interface to migrate objects between regions. This is primarily intended to migrate objects to LMEM for display and to SYSTEM for dma-buf, but might be reused in one form or another for performande-based migration.
v2:
- Verify that the memory region given as an id really exists. (Reported by Matthew Auld)
- Call i915_gem_object_{init,release}_memory_region() when switching region to handle also switching region lists. (Reported by Matthew Auld)
--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 96 +++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.h | 12 +++ .../gpu/drm/i915/gem/i915_gem_object_types.h | 9 ++ drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 69 +++++++++---- drivers/gpu/drm/i915/gem/i915_gem_wait.c | 19 ++++ 5 files changed, 188 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_object.c +96 -0
@@ -513,6 +513,102 @@ bool i915_gem_object_has_iomem(const struct drm_i915_gem_object *obj)return obj->mem_flags &I915_BO_FLAG_IOMEM ; } +/** +* i915_gem_object_can_migrate - Whether an object likely can be migrated +* +* @obj: The object to migrate +* @id: The region intended to migrate to +* +* Check whether the object backend supports migration to the +* given region. Note that pinning may affect the ability to migrate. +* +* Return: true if migration is possible, false otherwise. +*/ +bool i915_gem_object_can_migrate (struct drm_i915_gem_object *obj, +enum intel_region_id id) +{ +struct drm_i915_private *i915 =to_i915 (obj->base.dev); +unsigned int num_allowed = obj->mm.n_placements; +struct intel_memory_region *mr; +unsigned int i; + +GEM_BUG_ON (id >=INTEL_REGION_UNKNOWN ); +GEM_BUG_ON (obj->mm.madv !=I915_MADV_WILLNEED ); + +if (!obj->ops->migrate) +return false; + + mr = i915->mm.regions[id]; +if (!mr) +return false; + +if (obj->mm.region == mr) +return true; + +if (!i915_gem_object_evictable (obj)) +return false; + +if (!(obj->flags &I915_BO_ALLOC_USER )) +return true; + +if (num_allowed ==0 ) +return false; + +for (i =0 ; i < num_allowed; ++i) { +if (mr == obj->mm.placements[i]) +return true; + } + +return false; +} + +/** +* i915_gem_object_migrate - Migrate an object to the desired region id +* @obj: The object to migrate. +* @ww: An optional struct i915_gem_ww_ctx. If NULL, the backend may +* not be successful in evicting other objects to make room for this object. +* @id: The region id to migrate to. +* +* Attempt to migrate the object to the desired memory region. The +* object backend must support migration and the object may not be +* pinned, (explicitly pinned pages or pinned vmas). The object must +* be locked. +* On successful completion, the object will have pages pointing to +* memory in the new region, but an async migration task may not have +* completed yet, and to accomplish that, i915_gem_object_wait_migration() +* must be called. +* +* Return: 0 on success. Negative error code on failure. In particular may +* return -ENXIO on lack of region space, -EDEADLK for deadlock avoidance +* if @ww is set, -EINTR or -ERESTARTSYS if signal pending, and +* -EBUSY if the object is pinned. +*/ +int i915_gem_object_migrate (struct drm_i915_gem_object *obj, +struct i915_gem_ww_ctx *ww, +enum intel_region_id id) +{ +struct drm_i915_private *i915 =to_i915 (obj->base.dev); +struct intel_memory_region *mr; + +GEM_BUG_ON (id >=INTEL_REGION_UNKNOWN ); +GEM_BUG_ON (obj->mm.madv !=I915_MADV_WILLNEED ); +assert_object_held (obj); + + mr = i915->mm.regions[id]; +GEM_BUG_ON (!mr); + +if (obj->mm.region == mr) +return 0 ; + +if (!i915_gem_object_evictable (obj)) +return -EBUSY ; + +if (!obj->ops->migrate) +return -EOPNOTSUPP ; + +return obj->ops->migrate (obj, mr); +} +void i915_gem_init__objects (struct drm_i915_private *i915) {INIT_WORK (&i915->mm.free_work, __i915_gem_free_work);
drivers/gpu/drm/i915/gem/i915_gem_object.h +12 -0
@@ -17,6 +17,8 @@#include "i915_gem_ww.h" #include "i915_vma_types.h" +enum intel_region_id ; +/* * XXX: There is a prevalence of the assumption that we fit the * object's page count inside a 32bit _signed_ variable. Let's document
@@ -597,6 +599,16 @@ bool i915_gem_object_migratable(struct drm_i915_gem_object *obj);bool i915_gem_object_validates_to_lmem (struct drm_i915_gem_object *obj); +int i915_gem_object_migrate (struct drm_i915_gem_object *obj, +struct i915_gem_ww_ctx *ww, +enum intel_region_id id); + +bool i915_gem_object_can_migrate (struct drm_i915_gem_object *obj, +enum intel_region_id id); + +int i915_gem_object_wait_migration (struct drm_i915_gem_object *obj, +unsigned int flags); +#ifdef CONFIG_MMU_NOTIFIER static inline bool i915_gem_object_is_userptr (struct drm_i915_gem_object *obj)
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +9 -0
@@ -18,6 +18,7 @@struct drm_i915_gem_object ;struct intel_fronbuffer ; +struct intel_memory_region ;/* * struct i915_lut_handle tracks the fast lookups from handle to vma used
@@ -77,6 +78,14 @@ struct drm_i915_gem_object_ops {* delayed_free - Override the default delayed free implementation */ void (*delayed_free)(struct drm_i915_gem_object *obj); + +/** +* migrate - Migrate object to a different region either for +* pinning or for as long as the object lock is held. +*/ +int (*migrate)(struct drm_i915_gem_object *obj, +struct intel_memory_region *mr); +void (*release)(struct drm_i915_gem_object *obj);const struct vm_operations_struct *mmap_ops;
drivers/gpu/drm/i915/gem/i915_gem_ttm.c +52 -17
108 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_wait.c +19 -0
@@ -290,3 +290,22 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file)i915_gem_object_put (obj);return ret; } + +/** +* i915_gem_object_wait_migrate - Sync an accelerated migration operation +* @obj: The migrating object. +* @flags: waiting flags. Currently supports only I915_WAIT_INTERRUPTIBLE. +* +* Wait for any pending async migration operation on the object, +* whether it's explicitly (i915_gem_object_migrate()) or implicitly +* (swapin, initial clearing) initiated. +* +* Return: 0 if successful, -ERESTARTSYS if a signal was hit during waiting. +*/ +int i915_gem_object_wait_migration (struct drm_i915_gem_object *obj, +unsigned int flags) +{ +might_sleep (); +/* NOP for now. */ +return 0 ; +}
Signature · 1 line
2.31.1
Re: [PATCH v2 1/5] drm/i915/gem: Implement object migration
Quoted 46 lines · Thomas Hellström
Introduce an interface to migrate objects between regions. This is primarily intended to migrate objects to LMEM for display and to SYSTEM for dma-buf, but might be reused in one form or another for performande-based migration.
v2:
- Verify that the memory region given as an id really exists. (Reported by Matthew Auld)
- Call i915_gem_object_{init,release}_memory_region() when switching region to handle also switching region lists. (Reported by Matthew Auld)Signed-off-by Thomas Hellström <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 96 +++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.h | 12 +++ .../gpu/drm/i915/gem/i915_gem_object_types.h | 9 ++ drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 69 +++++++++---- drivers/gpu/drm/i915/gem/i915_gem_wait.c | 19 ++++ 5 files changed, 188 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_object.c +18
-0@@ -513,6 +513,102 @@ bool i915_gem_object_has_iomem(const struct drm_i915_gem_object *obj)return obj->mem_flags &I915_BO_FLAG_IOMEM ; } +/** +* i915_gem_object_can_migrate - Whether an object likely can be migrated +* +* @obj: The object to migrate +* @id: The region intended to migrate to +* +* Check whether the object backend supports migration to the +* given region. Note that pinning may affect the ability to migrate. +* +* Return: true if migration is possible, false otherwise. +*/ +bool i915_gem_object_can_migrate (struct drm_i915_gem_object *obj, +enum intel_region_id id) +{ +struct drm_i915_private *i915 =to_i915 (obj->base.dev); +unsigned int num_allowed = obj->mm.n_placements; +struct intel_memory_region *mr; +unsigned int i;
drivers/gpu/drm/i915/gem/i915_gem_object.c bool i915_gem_object_has_iomem(const struct drm_i915_gem_object *obj) · line 543
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +10
-0+ +GEM_BUG_ON (id >=INTEL_REGION_UNKNOWN ); +GEM_BUG_ON (obj->mm.madv !=I915_MADV_WILLNEED ); + +if (!obj->ops->migrate) +return false; + + mr = i915->mm.regions[id]; +if (!mr) +return false;
Hmm. Should probably switch order between these two, otherwise can_migrate will always return false on !TTM
/Thomas
kernel test robot
build botRe: [PATCH v2 1/5] drm/i915/gem: Implement object migration
In reply to Thomas HellströmThank you for the patch! Perhaps something to improve:
Hi "Thomas,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
[cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next drm/drm-next v5.13 next-20210625] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Hellstr-m/drm-i915-gem-Introduce-a-migrate-interface/20210628-171204 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: i386-randconfig-a014-20210628 (attached as .config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce (this is a W=1 build): # https://github.com/0day-ci/linux/commit/e4e5a7f5c031252f26c868a2aa17a031a1558336 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Thomas-Hellstr-m/drm-i915-gem-Introduce-a-migrate-interface/20210628-171204 git checkout e4e5a7f5c031252f26c868a2aa17a031a1558336 # save the attached .config to linux build tree mkdir build_dir make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
drivers/gpu/drm/i915/gem/i915_gem_wait.c:184: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
* Waits for rendering to the object to be completed
>> drivers/gpu/drm/i915/gem/i915_gem_wait.c:307: warning: expecting prototype for i915_gem_object_wait_migrate(). Prototype was for i915_gem_object_wait_migration() instead
vim +307 drivers/gpu/drm/i915/gem/i915_gem_wait.c
293
294 /**
295 * i915_gem_object_wait_migrate - Sync an accelerated migration operation
296 * @obj: The migrating object.
297 * @flags: waiting flags. Currently supports only I915_WAIT_INTERRUPTIBLE.
298 *
299 * Wait for any pending async migration operation on the object,
300 * whether it's explicitly (i915_gem_object_migrate()) or implicitly
301 * (swapin, initial clearing) initiated.
302 *
303 * Return: 0 if successful, -ERESTARTSYS if a signal was hit during waiting.
304 */
305 int i915_gem_object_wait_migration(struct drm_i915_gem_object *obj,
306 unsigned int flags)
> 307 {---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [PATCH v2 1/5] drm/i915/gem: Implement object migration
In reply to Thomas HellströmThank you for the patch! Perhaps something to improve:
Hi "Thomas,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-tip/drm-tip]
[cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next drm/drm-next v5.13 next-20210628] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Thomas-Hellstr-m/drm-i915-gem-Introduce-a-migrate-interface/20210628-171204 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: x86_64-randconfig-a003-20210628 (attached as .config) compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project 4c92e31dd0f1bd152eda883af20ff7fbcaa14945)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# https://github.com/0day-ci/linux/commit/e4e5a7f5c031252f26c868a2aa17a031a1558336
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Hellstr-m/drm-i915-gem-Introduce-a-migrate-interface/20210628-171204 git checkout e4e5a7f5c031252f26c868a2aa17a031a1558336
# save the attached .config to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/gpu/drm/i915/
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
drivers/gpu/drm/i915/gem/i915_gem_wait.c:184: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
* Waits for rendering to the object to be completed
>> drivers/gpu/drm/i915/gem/i915_gem_wait.c:307: warning: expecting prototype for i915_gem_object_wait_migrate(). Prototype was for i915_gem_object_wait_migration() instead
vim +307 drivers/gpu/drm/i915/gem/i915_gem_wait.c
182
183 /**
> 184 * Waits for rendering to the object to be completed
185 * @obj: i915 gem object
186 * @flags: how to wait (under a lock, for all rendering or just for writes etc)
187 * @timeout: how long to wait
188 */
189 int
190 i915_gem_object_wait(struct drm_i915_gem_object *obj,
191 unsigned int flags,
192 long timeout)
193 {
194 might_sleep();
195 GEM_BUG_ON(timeout < 0);
196
197 timeout = i915_gem_object_wait_reservation(obj->base.resv,
198 flags, timeout);
199 return timeout < 0 ? timeout : 0;
200 }
201
202 static inline unsigned long nsecs_to_jiffies_timeout(const u64 n)
203 {
204 /* nsecs_to_jiffies64() does not guard against overflow */
205 if (NSEC_PER_SEC % HZ &&
206 div_u64(n, NSEC_PER_SEC) >= MAX_JIFFY_OFFSET / HZ)
207 return MAX_JIFFY_OFFSET;
208
209 return min_t(u64, MAX_JIFFY_OFFSET, nsecs_to_jiffies64(n) + 1);
210 }
211
212 static unsigned long to_wait_timeout(s64 timeout_ns)
213 {
214 if (timeout_ns < 0)
215 return MAX_SCHEDULE_TIMEOUT;
216
217 if (timeout_ns == 0)
218 return 0;
219
220 return nsecs_to_jiffies_timeout(timeout_ns);
221 }
222
223 /**
224 * i915_gem_wait_ioctl - implements DRM_IOCTL_I915_GEM_WAIT
225 * @dev: drm device pointer
226 * @data: ioctl data blob
227 * @file: drm file pointer
228 *
229 * Returns 0 if successful, else an error is returned with the remaining time in
230 * the timeout parameter.
231 * -ETIME: object is still busy after timeout
232 * -ERESTARTSYS: signal interrupted the wait
233 * -ENONENT: object doesn't exist
234 * Also possible, but rare:
235 * -EAGAIN: incomplete, restart syscall
236 * -ENOMEM: damn
237 * -ENODEV: Internal IRQ fail
238 * -E?: The add request failed
239 *
240 * The wait ioctl with a timeout of 0 reimplements the busy ioctl. With any
241 * non-zero timeout parameter the wait ioctl will wait for the given number of
242 * nanoseconds on an object becoming unbusy. Since the wait itself does so
243 * without holding struct_mutex the object may become re-busied before this
244 * function completes. A similar but shorter * race condition exists in the busy
245 * ioctl
246 */
247 int
248 i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
249 {
250 struct drm_i915_gem_wait *args = data;
251 struct drm_i915_gem_object *obj;
252 ktime_t start;
253 long ret;
254
255 if (args->flags != 0)
256 return -EINVAL;
257
258 obj = i915_gem_object_lookup(file, args->bo_handle);
259 if (!obj)
260 return -ENOENT;
261
262 start = ktime_get();
263
264 ret = i915_gem_object_wait(obj,
265 I915_WAIT_INTERRUPTIBLE |
266 I915_WAIT_PRIORITY |
267 I915_WAIT_ALL,
268 to_wait_timeout(args->timeout_ns));
269
270 if (args->timeout_ns > 0) {
271 args->timeout_ns -= ktime_to_ns(ktime_sub(ktime_get(), start));
272 if (args->timeout_ns < 0)
273 args->timeout_ns = 0;
274
275 /*
276 * Apparently ktime isn't accurate enough and occasionally has a
277 * bit of mismatch in the jiffies<->nsecs<->ktime loop. So patch
278 * things up to make the test happy. We allow up to 1 jiffy.
279 *
280 * This is a regression from the timespec->ktime conversion.
281 */
282 if (ret == -ETIME && !nsecs_to_jiffies(args->timeout_ns))
283 args->timeout_ns = 0;
284
285 /* Asked to wait beyond the jiffie/scheduler precision? */
286 if (ret == -ETIME && args->timeout_ns)
287 ret = -EAGAIN;
288 }
289
290 i915_gem_object_put(obj);
291 return ret;
292 }
293
294 /**
295 * i915_gem_object_wait_migrate - Sync an accelerated migration operation
296 * @obj: The migrating object.
297 * @flags: waiting flags. Currently supports only I915_WAIT_INTERRUPTIBLE.
298 *
299 * Wait for any pending async migration operation on the object,
300 * whether it's explicitly (i915_gem_object_migrate()) or implicitly
301 * (swapin, initial clearing) initiated.
302 *
303 * Return: 0 if successful, -ERESTARTSYS if a signal was hit during waiting.
304 */
305 int i915_gem_object_wait_migration(struct drm_i915_gem_object *obj,
306 unsigned int flags)
> 307 {---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v2 2/5 drm/i915/gem: Introduce a selftest for the gem object migrate functionality
In reply to Thomas HellströmFrom: Matthew Auld <[email protected]>
A selftest for the gem object migrate functionality. Slightly adapted from the original by Matthew to the new interface and new fill blit code.
--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 + .../drm/i915/gem/selftests/i915_gem_migrate.c | 237 ++++++++++++++++++ .../drm/i915/selftests/i915_live_selftests.h | 1 + 3 files changed, 239 insertions(+) create mode 100644 drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
drivers/gpu/drm/i915/gem/i915_gem_object.c +1 -0
@@ -649,6 +649,7 @@ static const struct drm_gem_object_funcs i915_gem_object_funcs = {#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST )#include "selftests/huge_gem_object.c" #include "selftests/huge_pages.c" +#include "selftests/i915_gem_migrate.c" #include "selftests/i915_gem_object.c" #include "selftests/i915_gem_coherency.c" #endif
drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c new file +237 -0
237 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/i915_live_selftests.h +1 -0
@@ -40,6 +40,7 @@ selftest(hugepages, i915_gem_huge_page_live_selftests) selftest(gem_contexts, i915_gem_context_live_selftests) selftest(gem_execbuf, i915_gem_execbuffer_live_selftests) selftest(client, i915_gem_client_blt_live_selftests) +selftest(gem_migrate, i915_gem_migrate_live_selftests) selftest(reset, intel_reset_live_selftests) selftest(memory_region, intel_memory_region_live_selftests)selftest (hangcheck, intel_hangcheck_live_selftests)
Signature · 6 lines
2.31.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/5 drm/i915/display: Migrate objects to LMEM if possible for display
In reply to Thomas HellströmObjects intended to be used as display framebuffers must reside in LMEM for discrete. If they happen to not do that, migrate them to LMEM before pinning.
--- drivers/gpu/drm/i915/display/intel_display.c | 5 ++++- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 21 -------------------- drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 -- 4 files changed, 5 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +4 -1
@@ -1331,6 +1331,9 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb, ret =i915_gem_object_lock (obj, &ww);if (!ret && phys_cursor) ret =i915_gem_object_attach_phys (obj, alignment); +else if (!ret &&HAS_LMEM (dev_priv)) + ret =i915_gem_object_migrate (obj, &ww,INTEL_REGION_LMEM ); +/* TODO: Do we need to sync when migration becomes async? */ if (!ret) ret =i915_gem_object_pin_pages (obj);if (ret)
@@ -11778,7 +11781,7 @@ intel_user_framebuffer_create(struct drm_device *dev,/* object is backed with LMEM for discrete */ i915 =to_i915 (obj->base.dev); -if (HAS_LMEM (i915) && !i915_gem_object_validates_to_lmem (obj)) { +if (HAS_LMEM (i915) && !i915_gem_object_can_migrate (obj,INTEL_REGION_LMEM )) {/* object is "remote", not in local memory */ i915_gem_object_put (obj);return ERR_PTR (-EREMOTE );
drivers/gpu/drm/i915/gem/i915_gem_domain.c +1 -1
@@ -375,7 +375,7 @@ i915_gem_object_pin_to_display_plane(struct drm_i915_gem_object *obj,struct i915_vma *vma;int ret; -/* Frame buffer must be in LMEM (no migration yet) */ +/* Frame buffer must be in LMEM */ if (HAS_LMEM (i915) && !i915_gem_object_is_lmem (obj))return ERR_PTR (-EINVAL );
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +0 -21
@@ -23,27 +23,6 @@ i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj,return io_mapping_map_wc (&obj->mm.region->iomap, offset, size); } -/** -* i915_gem_object_validates_to_lmem - Whether the object is resident in -* lmem when pages are present. -* @obj: The object to check. -* -* Migratable objects residency may change from under us if the object is -* not pinned or locked. This function is intended to be used to check whether -* the object can only reside in lmem when pages are present. -* -* Return: Whether the object is always resident in lmem when pages are -* present. -*/ -bool i915_gem_object_validates_to_lmem (struct drm_i915_gem_object *obj) -{ -struct intel_memory_region *mr =READ_ONCE (obj->mm.region); - -return !i915_gem_object_migratable (obj) && - mr && (mr->type ==INTEL_MEMORY_LOCAL || - mr->type ==INTEL_MEMORY_STOLEN_LOCAL ); -} -/** * i915_gem_object_is_lmem - Whether the object is resident in * lmem
drivers/gpu/drm/i915/gem/i915_gem_object.h +0 -2
@@ -597,8 +597,6 @@ bool i915_gem_object_evictable(struct drm_i915_gem_object *obj);bool i915_gem_object_migratable (struct drm_i915_gem_object *obj); -bool i915_gem_object_validates_to_lmem (struct drm_i915_gem_object *obj); -int i915_gem_object_migrate (struct drm_i915_gem_object *obj,struct i915_gem_ww_ctx *ww,enum intel_region_id id);
Signature · 6 lines
2.31.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/5 drm/i915/gem: Fix same-driver-another-instance dma-buf export
In reply to Thomas HellströmIf our exported dma-bufs are imported by another instance of our driver, that instance will typically have the imported dma-bufs locked during map_attachment(). But the exporter also locks the same reservation object in the map_dma_buf() callback, which leads to recursive locking.
Add a live selftest to catch this case, and as a workaround until we fully support dynamic import and export, declare the exporter dynamic by providing NOP pin() and unpin() functions. This means our map_dma_buf() callback will *always* get called locked, and by pinning unconditionally in i915_gem_map_dma_buf() we make sure we don't need to use the move_notify() functionality which is not yet implemented.
--- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 31 ++++++- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 81 ++++++++++++++++++- 2 files changed, 108 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +29 -2
@@ -12,6 +12,8 @@#include "i915_gem_object.h" #include "i915_scatterlist.h" +I915_SELFTEST_DECLARE(static bool force_different_devices;) + static struct drm_i915_gem_object *dma_buf_to_obj(struct dma_buf *buf) {return to_intel_bo (buf->priv);
@@ -25,7 +27,9 @@ static struct sg_table *i915_gem_map_dma_buf(struct dma_buf_attachment *attachmestruct scatterlist *src, *dst;int ret, i; - ret =i915_gem_object_pin_pages_unlocked (obj); +assert_object_held (obj); + + ret =i915_gem_object_pin_pages (obj);if (ret) goto err;
@@ -168,6 +172,26 @@ static int i915_gem_end_cpu_access(struct dma_buf *dma_buf, enum dma_data_directreturn err; } +/* +* As a workaround until we fully support dynamic import and export, +* declare the exporter dynamic by providing NOP pin() and unpin() functions. +* This means our i915_gem_map_dma_buf() callback will *always* get called +* locked, and by pinning unconditionally in i915_gem_map_dma_buf() we make +* sure we don't need to use the move_notify() functionality which is +* not yet implemented. Typically for the same-driver-another-instance case, +* i915_gem_map_dma_buf() will be called at importer attach time and the +* mapped sg_list will be cached by the dma-buf core for the +* duration of the attachment. +*/ +static int i915_gem_dmabuf_pin (struct dma_buf_attachment *attach) +{ +return 0 ; +} + +static void i915_gem_dmabuf_unpin (struct dma_buf_attachment *attach) +{ +} +static const struct dma_buf_ops i915_dmabuf_ops = { .map_dma_buf = i915_gem_map_dma_buf, .unmap_dma_buf = i915_gem_unmap_dma_buf,
@@ -177,6 +201,8 @@ static const struct dma_buf_ops i915_dmabuf_ops = { .vunmap = i915_gem_dmabuf_vunmap, .begin_cpu_access = i915_gem_begin_cpu_access, .end_cpu_access = i915_gem_end_cpu_access, + .pin = i915_gem_dmabuf_pin, + .unpin = i915_gem_dmabuf_unpin, };struct dma_buf *i915_gem_prime_export (struct drm_gem_object *gem_obj,int flags)
@@ -241,7 +267,8 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,if (dma_buf->ops == &i915_dmabuf_ops) { obj =dma_buf_to_obj (dma_buf);/* is it from our device? */ -if (obj->base.dev == dev) { +if (obj->base.dev == dev && + !I915_SELFTEST_ONLY (force_different_devices)) {/* * Importing dmabuf exported from out own gem increases * refcount on gem itself instead of f_count of dmabuf.
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +79 -2
106 lines not on this page · raw message
Signature · 6 lines
2.31.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/5 drm/i915/gem: Migrate to system at dma-buf map time
In reply to Thomas HellströmUntil we support p2p dma or as a complement to that, migrate data to system memory at dma-buf map time if possible.
v2:
- Rebase on dynamic exporter. Update the igt_dmabuf_import_same_driver selftest to migrate if we are LMEM capable.
--- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 7 ++++++- drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +6 -1
@@ -29,7 +29,12 @@ static struct sg_table *i915_gem_map_dma_buf(struct dma_buf_attachment *attachmeassert_object_held (obj); - ret =i915_gem_object_pin_pages (obj); +if (!i915_gem_object_can_migrate (obj,INTEL_REGION_SMEM )) +return ERR_PTR (-EOPNOTSUPP ); + + ret =i915_gem_object_migrate (obj,NULL ,INTEL_REGION_SMEM ); +if (!ret) + ret =i915_gem_object_pin_pages (obj);if (ret) goto err;
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +3 -1
@@ -94,7 +94,9 @@ static int igt_dmabuf_import_same_driver(void *arg)int err; force_different_devices = true; - obj =i915_gem_object_create_shmem (i915,PAGE_SIZE ); + obj =i915_gem_object_create_lmem (i915,PAGE_SIZE ,0 ); +if (IS_ERR (obj)) + obj =i915_gem_object_create_shmem (i915,PAGE_SIZE );if (IS_ERR (obj)) goto out_ret;
Signature · 1 line
2.31.1