Introduce memory region concept (including device local memory)
Subsystems (5)
v3 cover Introduce memory region concept (including device local memory)
In preparation for upcoming devices with device local memory, introduce the concept of different memory regions, and a simple buddy allocator to manage them in i915.
One of the concerns raised from v1 was around not using enough of TTM, which is a fair criticism, so trying to get better alignment here is something we are investigating, though currently that is still WIP so in the meantime v3 still continues to push more of the low-level details forward, but not yet the TTM interactions.
Sidenote:
Daniel raised a fair point with the whole mmap_offset uAPI and whether we can just get away with using gtt_mmap, it looks like it should work and would simplify a few things and possibly allow us to drop a couple patches. Thoughts?
Abdiel Janulgue (11):
drm/i915: Add memory region information to device_info drm/i915: setup io-mapping for LMEM
drm/i915/lmem: support kernel mapping
drm/i915: enumerate and init each supported region drm/i915: Allow i915 to manage the vma offset nodes instead of drm
core
drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET drm/i915/lmem: add helper to get CPU accessible offset drm/i915: Add cpu and lmem fault handlers
drm/i915: cpu-map based dumb buffers
drm/i915: Introduce GEM_OBJECT_SETPARAM with I915_PARAM_MEMORY_REGION drm/i915/query: Expose memory regions through the query uAPI
CQ Tang (1):
drm/i915: check for missing aperture in insert_mappable_node
Daniele Ceraolo Spurio (4):
drm/i915: define HAS_MAPPABLE_APERTURE
drm/i915: do not map aperture if it is not available. drm/i915: set num_fence_regs to 0 if there is no aperture drm/i915: error capture with no ggtt slot
Matthew Auld (20):
drm/i915: buddy allocator
drm/i915: introduce intel_memory_region drm/i915/region: support basic eviction drm/i915/region: support continuous allocations drm/i915/region: support volatile objects
drm/i915: support creating LMEM objects drm/i915/blt: don't assume pinned intel_context drm/i915/blt: bump size restriction
drm/i915/blt: support copying objects drm/i915/selftests: move gpu-write-dw into utils drm/i915/selftests: add write-dword test for LMEM drm/i915/selftest: extend coverage to include LMEM huge-pages drm/i915/lmem: support CPU relocations drm/i915/lmem: support pread
drm/i915/lmem: support pwrite
drm/i915: treat shmem as a region
drm/i915: treat stolen as a region drm/i915/selftests: check for missing aperture drm/i915: support basic object migration
HAX drm/i915: add the fake lmem region
Michal Wajdeczko (1):
drm/i915: Don't try to place HWS in non-existing mappable region
arch/x86/kernel/early-quirks.c | 26 + drivers/gpu/drm/i915/Makefile | 5 + .../gpu/drm/i915/gem/i915_gem_client_blt.c | 34 +- drivers/gpu/drm/i915/gem/i915_gem_context.c | 17 + drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 + .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 55 +- drivers/gpu/drm/i915/gem/i915_gem_internal.c | 21 +- drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 4 + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 315 +++++++ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 37 + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 376 +++++++- drivers/gpu/drm/i915/gem/i915_gem_object.c | 271 ++++++ drivers/gpu/drm/i915/gem/i915_gem_object.h | 29 +- .../gpu/drm/i915/gem/i915_gem_object_blt.c | 349 +++++++- .../gpu/drm/i915/gem/i915_gem_object_blt.h | 18 +- .../gpu/drm/i915/gem/i915_gem_object_types.h | 48 +- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 28 +- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_region.c | 165 ++++ drivers/gpu/drm/i915/gem/i915_gem_region.h | 29 + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 71 +- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 71 +- drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 3 +- .../drm/i915/gem/selftests/huge_gem_object.c | 4 +- .../gpu/drm/i915/gem/selftests/huge_pages.c | 331 ++++--- .../i915/gem/selftests/i915_gem_client_blt.c | 16 +- .../i915/gem/selftests/i915_gem_coherency.c | 5 +- .../drm/i915/gem/selftests/i915_gem_context.c | 134 +-- .../drm/i915/gem/selftests/i915_gem_mman.c | 15 +- .../i915/gem/selftests/i915_gem_object_blt.c | 128 ++- .../drm/i915/gem/selftests/igt_gem_utils.c | 135 +++ .../drm/i915/gem/selftests/igt_gem_utils.h | 16 + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 5 +- drivers/gpu/drm/i915/gt/intel_reset.c | 13 +- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 2 +- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 14 +- drivers/gpu/drm/i915/i915_buddy.c | 433 ++++++++++ drivers/gpu/drm/i915/i915_buddy.h | 128 +++ drivers/gpu/drm/i915/i915_drv.c | 28 +- drivers/gpu/drm/i915/i915_drv.h | 20 +- drivers/gpu/drm/i915/i915_gem.c | 41 +- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 6 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 121 ++- drivers/gpu/drm/i915/i915_getparam.c | 1 + drivers/gpu/drm/i915/i915_globals.c | 1 + drivers/gpu/drm/i915/i915_globals.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 64 +- drivers/gpu/drm/i915/i915_pci.c | 29 +- drivers/gpu/drm/i915/i915_query.c | 57 ++ drivers/gpu/drm/i915/i915_vma.c | 21 +- drivers/gpu/drm/i915/intel_device_info.h | 2 + drivers/gpu/drm/i915/intel_memory_region.c | 240 +++++ drivers/gpu/drm/i915/intel_memory_region.h | 116 +++ drivers/gpu/drm/i915/intel_region_lmem.c | 141 +++ drivers/gpu/drm/i915/intel_region_lmem.h | 16 + drivers/gpu/drm/i915/selftests/i915_buddy.c | 719 +++++++++++++++ drivers/gpu/drm/i915/selftests/i915_gem.c | 3 + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 8 +- .../drm/i915/selftests/i915_live_selftests.h | 1 + .../drm/i915/selftests/i915_mock_selftests.h | 2 + .../drm/i915/selftests/intel_memory_region.c | 817 ++++++++++++++++++ .../gpu/drm/i915/selftests/mock_gem_device.c | 9 +- drivers/gpu/drm/i915/selftests/mock_region.c | 64 ++ drivers/gpu/drm/i915/selftests/mock_region.h | 16 + include/drm/i915_drm.h | 3 + include/uapi/drm/i915_drm.h | 93 ++ 67 files changed, 5524 insertions(+), 477 deletions(-) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_lmem.c create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_lmem.h create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_region.c create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_region.h create mode 100644 drivers/gpu/drm/i915/i915_buddy.c create mode 100644 drivers/gpu/drm/i915/i915_buddy.h create mode 100644 drivers/gpu/drm/i915/intel_memory_region.c create mode 100644 drivers/gpu/drm/i915/intel_memory_region.h create mode 100644 drivers/gpu/drm/i915/intel_region_lmem.c create mode 100644 drivers/gpu/drm/i915/intel_region_lmem.h create mode 100644 drivers/gpu/drm/i915/selftests/i915_buddy.c create mode 100644 drivers/gpu/drm/i915/selftests/intel_memory_region.c create mode 100644 drivers/gpu/drm/i915/selftests/mock_region.c create mode 100644 drivers/gpu/drm/i915/selftests/mock_region.h
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 1/37 drm/i915: buddy allocator
Simple buddy allocator. We want to allocate properly aligned power-of-two blocks to promote usage of huge-pages for the GTT, so 64K, 2M and possibly even 1G. While we do support allocating stuff at a specific offset, it is more intended for preallocating portions of the address space, say for an initial framebuffer, for other uses drm_mm is probably a much better fit. Anyway, hopefully this can all be thrown away if we eventually move to having the core MM manage device memory.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_buddy.c | 433 +++++++++++ drivers/gpu/drm/i915/i915_buddy.h | 126 +++ drivers/gpu/drm/i915/i915_globals.c | 1 + drivers/gpu/drm/i915/i915_globals.h | 1 + drivers/gpu/drm/i915/selftests/i915_buddy.c | 719 ++++++++++++++++++ .../drm/i915/selftests/i915_mock_selftests.h | 1 + 7 files changed, 1282 insertions(+) create mode 100644 drivers/gpu/drm/i915/i915_buddy.c create mode 100644 drivers/gpu/drm/i915/i915_buddy.h create mode 100644 drivers/gpu/drm/i915/selftests/i915_buddy.c
drivers/gpu/drm/i915/Makefile +1 -0
@@ -126,6 +126,7 @@ gem-y += \ i915-y += \ $(gem-y) \ i915_active.o \ + i915_buddy.o \ i915_cmd_parser.o \ i915_gem_evict.o \ i915_gem_fence_reg.o \
drivers/gpu/drm/i915/i915_buddy.c new file +433 -0
433 lines not on this page · raw message
drivers/gpu/drm/i915/i915_buddy.h new file +126 -0
126 lines not on this page · raw message
drivers/gpu/drm/i915/i915_globals.c +1 -0
@@ -62,6 +62,7 @@ static void __i915_globals_cleanup(void)static __initconst int (*const initfn[])(void ) = { i915_global_active_init, + i915_global_buddy_init, i915_global_context_init, i915_global_gem_context_init, i915_global_objects_init,
drivers/gpu/drm/i915/i915_globals.h +1 -0
@@ -27,6 +27,7 @@ void i915_globals_exit(void);/* constructors */ int i915_global_active_init (void ); +int i915_global_buddy_init (void );int i915_global_context_init (void );int i915_global_gem_context_init (void );int i915_global_objects_init (void );
drivers/gpu/drm/i915/selftests/i915_buddy.c new file +719 -0
719 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/i915_mock_selftests.h +1 -0
@@ -25,3 +25,4 @@ selftest(evict, i915_gem_evict_mock_selftests) selftest(gtt, i915_gem_gtt_mock_selftests) selftest(hugepages, i915_gem_huge_page_mock_selftests) selftest(contexts, i915_gem_context_mock_selftests) +selftest (buddy, i915_buddy_mock_selftests)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 2/37 drm/i915: introduce intel_memory_region
In reply to Matthew AuldSupport memory regions, as defined by a given (start, end), and allow creating GEM objects which are backed by said region. The immediate goal here is to have something to represent our device memory, but later on we also want to represent every memory domain with a region, so stolen, shmem, and of course device. At some point we are probably going to want use a common struct here, such that we are better aligned with say TTM.
--- drivers/gpu/drm/i915/Makefile | 2 + .../gpu/drm/i915/gem/i915_gem_object_types.h | 9 + drivers/gpu/drm/i915/gem/i915_gem_region.c | 129 +++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_region.h | 27 +++ .../gpu/drm/i915/gem/selftests/huge_pages.c | 78 ++++++++ drivers/gpu/drm/i915/i915_buddy.h | 2 + drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_memory_region.c | 175 ++++++++++++++++++ drivers/gpu/drm/i915/intel_memory_region.h | 107 +++++++++++ .../drm/i915/selftests/i915_mock_selftests.h | 1 + .../drm/i915/selftests/intel_memory_region.c | 114 ++++++++++++ .../gpu/drm/i915/selftests/mock_gem_device.c | 1 + drivers/gpu/drm/i915/selftests/mock_region.c | 60 ++++++ drivers/gpu/drm/i915/selftests/mock_region.h | 16 ++ 14 files changed, 722 insertions(+) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_region.c create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_region.h create mode 100644 drivers/gpu/drm/i915/intel_memory_region.c create mode 100644 drivers/gpu/drm/i915/intel_memory_region.h create mode 100644 drivers/gpu/drm/i915/selftests/intel_memory_region.c create mode 100644 drivers/gpu/drm/i915/selftests/mock_region.c create mode 100644 drivers/gpu/drm/i915/selftests/mock_region.h
drivers/gpu/drm/i915/Makefile +2 -0
@@ -50,6 +50,7 @@ i915-y += i915_drv.o \ i915_utils.o \ intel_csr.o \ intel_device_info.o \ + intel_memory_region.o \ intel_pch.o \ intel_pm.o \ intel_runtime_pm.o \
@@ -115,6 +116,7 @@ gem-y += \ gem/i915_gem_pages.o \ gem/i915_gem_phys.o \ gem/i915_gem_pm.o \ + gem/i915_gem_region.o \ gem/i915_gem_shmem.o \ gem/i915_gem_shrinker.o \ gem/i915_gem_stolen.o \
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +9 -0
@@ -160,6 +160,15 @@ struct drm_i915_gem_object {struct mutex lock;/* protects the pages and their use */ atomic_t pages_pin_count; +/** +* Memory region for this object. +*/ +struct intel_memory_region *region; +/** +* List of memory region blocks allocated for this object. +*/ +struct list_head blocks; +struct sg_table *pages;void *mapping;
drivers/gpu/drm/i915/gem/i915_gem_region.c new file +129 -0
129 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_region.h new file +27 -0
@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2019 Intel Corporation +*/ + +#ifndef __I915_GEM_REGION_H__ +#define __I915_GEM_REGION_H__ + +#include <linux/types.h> + +struct intel_memory_region ; +struct drm_i915_gem_object ; +struct sg_table ; + +int i915_gem_object_get_pages_buddy (struct drm_i915_gem_object *obj); +void i915_gem_object_put_pages_buddy (struct drm_i915_gem_object *obj, +struct sg_table *pages); + +void i915_gem_object_init_memory_region (struct drm_i915_gem_object *obj, +struct intel_memory_region *mem); + +struct drm_i915_gem_object * +i915_gem_object_create_region (struct intel_memory_region *mem, +resource_size_t size, +unsigned int flags); + +#endif
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +78 -0
102 lines not on this page · raw message
drivers/gpu/drm/i915/i915_buddy.h +2 -0
@@ -22,6 +22,8 @@ struct i915_buddy_block {struct i915_buddy_block *right;struct i915_buddy_block *parent; +void *private;/* owned by creator */ +/* * While the block is allocated by the user through i915_buddy_alloc*, * the user has ownership of the link, for example to maintain within
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -83,6 +83,7 @@#include "intel_device_info.h" #include "intel_pch.h" #include "intel_runtime_pm.h" +#include "intel_memory_region.h" #include "intel_uncore.h" #include "intel_wakeref.h" #include "intel_wopcm.h"
drivers/gpu/drm/i915/intel_memory_region.c new file +175 -0
175 lines not on this page · raw message
drivers/gpu/drm/i915/intel_memory_region.h new file +107 -0
107 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/i915_mock_selftests.h +1 -0
@@ -26,3 +26,4 @@ selftest(gtt, i915_gem_gtt_mock_selftests) selftest(hugepages, i915_gem_huge_page_mock_selftests) selftest(contexts, i915_gem_context_mock_selftests) selftest(buddy, i915_buddy_mock_selftests) +selftest (memory_region, intel_memory_region_mock_selftests)
drivers/gpu/drm/i915/selftests/intel_memory_region.c new file +114 -0
114 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/mock_gem_device.c +1 -0
@@ -32,6 +32,7 @@#include "mock_gem_device.h" #include "mock_gtt.h" #include "mock_uncore.h" +#include "mock_region.h" #include "gem/selftests/mock_context.h" #include "gem/selftests/mock_gem_object.h"
drivers/gpu/drm/i915/selftests/mock_region.c new file +60 -0
60 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/mock_region.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2019 Intel Corporation +*/ + +#ifndef __MOCK_REGION_H +#define __MOCK_REGION_H + +struct intel_memory_region * +mock_region_create (struct drm_i915_private *i915, +resource_size_t start, +resource_size_t size, +resource_size_t min_page_size, +resource_size_t io_start); + +#endif /* !__MOCK_REGION_H */
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 02/37] drm/i915: introduce intel_memory_region
Quoting Matthew Auld (2019-08-09 23:26:08)
Quoted 8 lines
drivers/gpu/drm/i915/intel_memory_region.c new file +2
-0@@ -0,0 +1,175 @@ +// SPDX-License-Identifier: MIT +/*
drivers/gpu/drm/i915/intel_memory_region.c line 12
Quoted 10 lines
drivers/gpu/drm/i915/intel_memory_region.c new file +10
-0+* Copyright © 2019 Intel Corporation +*/ + +#include "intel_memory_region.h" +#include "i915_drv.h" + +const u32 intel_region_map[] = { + [INTEL_MEMORY_SMEM ] =BIT (INTEL_SMEM +INTEL_MEMORY_TYPE_SHIFT ) |BIT (0 ), + [INTEL_MEMORY_LMEM ] =BIT (INTEL_LMEM +INTEL_MEMORY_TYPE_SHIFT ) |BIT (0 ), + [INTEL_MEMORY_STOLEN ] =BIT (INTEL_STOLEN +INTEL_MEMORY_TYPE_SHIFT ) |BIT (0 ),
This table isn't used? So the meaning of BIT(0) is impenetrable. Should we defer adding the region_map until it is used?
-Chris
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 3/37 drm/i915/region: support basic eviction
In reply to Matthew AuldSupport basic eviction for regions.
--- .../gpu/drm/i915/gem/i915_gem_object_types.h | 7 ++ drivers/gpu/drm/i915/gem/i915_gem_region.c | 11 +++ drivers/gpu/drm/i915/gem/i915_gem_region.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 17 +++++ drivers/gpu/drm/i915/intel_memory_region.c | 73 +++++++++++++++++- drivers/gpu/drm/i915/intel_memory_region.h | 5 ++ .../drm/i915/selftests/intel_memory_region.c | 76 +++++++++++++++++++ drivers/gpu/drm/i915/selftests/mock_region.c | 1 + 8 files changed, 187 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +7 -0
@@ -168,6 +168,13 @@ struct drm_i915_gem_object {* List of memory region blocks allocated for this object. */ struct list_head blocks; +/** +* Element within memory_region->objects or +* memory_region->purgeable if the object is marked as +* DONTNEED. Access is protected by memory_region->obj_lock. +*/ +struct list_head region_link; +struct list_head tmp_link;struct sg_table *pages;void *mapping;
drivers/gpu/drm/i915/gem/i915_gem_region.c +11 -0
@@ -102,6 +102,17 @@ void i915_gem_object_init_memory_region(struct drm_i915_gem_object *obj, {INIT_LIST_HEAD (&obj->mm.blocks); obj->mm.region= mem; + +mutex_lock (&mem->obj_lock); +list_add (&obj->mm.region_link, &mem->objects); +mutex_unlock (&mem->obj_lock); +} + +void i915_gem_object_release_memory_region (struct drm_i915_gem_object *obj) +{ +mutex_lock (&obj->mm.region->obj_lock); +list_del (&obj->mm.region_link); +mutex_unlock (&obj->mm.region->obj_lock); } struct drm_i915_gem_object *
drivers/gpu/drm/i915/gem/i915_gem_region.h +1 -0
@@ -18,6 +18,7 @@ void i915_gem_object_put_pages_buddy(struct drm_i915_gem_object *obj,void i915_gem_object_init_memory_region (struct drm_i915_gem_object *obj,struct intel_memory_region *mem); +void i915_gem_object_release_memory_region (struct drm_i915_gem_object *obj);struct drm_i915_gem_object * i915_gem_object_create_region(struct intel_memory_region *mem,
drivers/gpu/drm/i915/i915_gem.c +17 -0
@@ -1105,6 +1105,23 @@ i915_gem_madvise_ioctl(struct drm_device *dev, void *data, !i915_gem_object_has_pages(obj))i915_gem_object_truncate (obj); +if (obj->mm.region) { +mutex_lock (&obj->mm.region->obj_lock); + +switch (obj->mm.madv) { +case I915_MADV_WILLNEED : +list_move (&obj->mm.region_link, + &obj->mm.region->objects); +break ; +default : +list_move (&obj->mm.region_link, + &obj->mm.region->purgeable); +break ; + } + +mutex_unlock (&obj->mm.region->obj_lock); + } + args->retained = obj->mm.madv != __I915_MADV_PURGED;mutex_unlock (&obj->mm.lock);
drivers/gpu/drm/i915/intel_memory_region.c +69 -4
97 lines not on this page · raw message
drivers/gpu/drm/i915/intel_memory_region.h +5 -0
@@ -78,6 +78,11 @@ struct intel_memory_region {unsigned int type;unsigned int instance;unsigned int id; + +/* Protects access to objects and purgeable */ +struct mutex obj_lock; +struct list_head objects; +struct list_head purgeable; };int intel_memory_region_init_buddy (struct intel_memory_region *mem);
drivers/gpu/drm/i915/selftests/intel_memory_region.c +76 -0
86 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/mock_region.c +1 -0
@@ -11,6 +11,7 @@static const struct drm_i915_gem_object_ops mock_region_obj_ops = { .get_pages = i915_gem_object_get_pages_buddy, .put_pages = i915_gem_object_put_pages_buddy, + .release = i915_gem_object_release_memory_region, }; static struct drm_i915_gem_object *
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 03/37] drm/i915/region: support basic eviction
Quoting Matthew Auld (2019-08-09 23:26:09)
Quoted 16 lines
drivers/gpu/drm/i915/i915_gem.c +8
-0@@ -1105,6 +1105,23 @@ i915_gem_madvise_ioctl(struct drm_device *dev, void *data, !i915_gem_object_has_pages(obj))i915_gem_object_truncate (obj); +if (obj->mm.region) { +mutex_lock (&obj->mm.region->obj_lock); + +switch (obj->mm.madv) { +case I915_MADV_WILLNEED : +list_move (&obj->mm.region_link, + &obj->mm.region->objects); +break ;
drivers/gpu/drm/i915/i915_gem.c i915_gem_madvise_ioctl(struct drm_device *dev, void *data, · line 1125
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem.c +9
-0+default : +list_move (&obj->mm.region_link, + &obj->mm.region->purgeable); +break ; + } + +mutex_unlock (&obj->mm.region->obj_lock); + } + args->retained = obj->mm.madv != __I915_MADV_PURGED;
Little bit of an impedance mismatch, I hope this turns out fine when everything is a memory region.
Quoted 26 lines
drivers/gpu/drm/i915/i915_gem.c +0
-0mutex_unlock (&obj->mm.lock);drivers/gpu/drm/i915/intel_memory_region.c +16
-0@@ -12,6 +12,51 @@ const u32 intel_region_map[] = { [INTEL_MEMORY_STOLEN] = BIT(INTEL_STOLEN + INTEL_MEMORY_TYPE_SHIFT) | BIT(0), }; +static int +intel_memory_region_evict (struct intel_memory_region *mem, +resource_size_t target, +unsigned int flags) +{ +struct drm_i915_gem_object *obj; +resource_size_t found; +int err; + + err =0 ; + found =0 ; + +mutex_lock (&mem->obj_lock); +list_for_each_entry (obj, &mem->purgeable, mm.region_link) { +if (!i915_gem_object_has_pages (obj)) +continue ;
drivers/gpu/drm/i915/intel_memory_region.c const u32 intel_region_map[] = { · line 40
Quoted 10 lines
drivers/gpu/drm/i915/intel_memory_region.c +10
-0+ +if (READ_ONCE (obj->pin_global)) +continue ; + +if (atomic_read (&obj->bind_count)) +continue ; + +mutex_unlock (&mem->obj_lock); + +__i915_gem_object_put_pages (obj,I915_MM_SHRINKER );
So we don't really care about the object being bound then? As all we care about is the page's pin_count.
So instead of obj->pin_global, obj->bind_bound, you just want
if (atomic_read(&obj->pages.pin_count))
continue;
as the quick check to see if it is worth preceding.
drivers/gpu/drm/i915/intel_memory_region.c const u32 intel_region_map[] = { · line 47
Quoted 6 lines
drivers/gpu/drm/i915/intel_memory_region.c +6
-0+mutex_lock_nested (&obj->mm.lock,I915_MM_SHRINKER ); +if (!i915_gem_object_has_pages (obj)) { + obj->mm.madv = __I915_MADV_PURGED; + found += obj->base.size; + } +mutex_unlock (&obj->mm.lock);
The locking here accomplishes what? You just want a boolean from put_pages().
drivers/gpu/drm/i915/intel_memory_region.c const u32 intel_region_map[] = { · line 58
Quoted 11 lines
drivers/gpu/drm/i915/intel_memory_region.c +11
-0+ +if (found >= target) +return 0 ; + +mutex_lock (&mem->obj_lock); + } + + err = -ENOSPC ; +mutex_unlock (&mem->obj_lock); +return err; +}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 03/37] drm/i915/region: support basic eviction
Quoted 99 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Chris Wilson
Sent: Saturday, August 10, 2019 3:19 AM
To: Auld, Matthew <[email protected]>; intel- [email protected]
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH v3 03/37] drm/i915/region: support basic evictionQuoting Matthew Auld (2019-08-09 23:26:09)
drivers/gpu/drm/i915/i915_gem.c i915_gem_madvise_ioctl(struct drm_device
Quoted 6 lines
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_gem.cindex6ff01a404346..8735dea74809100644drivers/gpu/drm/i915/i915_gem.c +0
-0@@ -1105,6 +1105,23 @@ i915_gem_madvise_ioctl(struct drm_device*dev, void *data,
Quoted 11 lines
drivers/gpu/drm/i915/i915_gem.c +8
-0!i915_gem_object_has_pages(obj))i915_gem_object_truncate (obj); +if (obj->mm.region) { +mutex_lock (&obj->mm.region->obj_lock); + +switch (obj->mm.madv) { +case I915_MADV_WILLNEED : +list_move (&obj->mm.region_link, + &obj->mm.region->objects); +break ;drivers/gpu/drm/i915/i915_gem.c i915_gem_madvise_ioctl(struct drm_device *dev, void *data, · line 1125
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem.c +9
-0+default : +list_move (&obj->mm.region_link, + &obj->mm.region->purgeable); +break ; + } + +mutex_unlock (&obj->mm.region->obj_lock); + } + args->retained = obj->mm.madv != __I915_MADV_PURGED;Little bit of an impedance mismatch, I hope this turns out fine when everything is a memory region.
Quoted 26 lines
drivers/gpu/drm/i915/i915_gem.c +0
-0mutex_unlock (&obj->mm.lock);drivers/gpu/drm/i915/intel_memory_region.c +15
-0@@ -12,6 +12,51 @@ const u32 intel_region_map[] = { [INTEL_MEMORY_STOLEN ] =BIT (INTEL_STOLEN + INTEL_MEMORY_TYPE_SHIFT) | BIT(0), }; +static int +intel_memory_region_evict (struct intel_memory_region *mem, +resource_size_t target, +unsigned int flags) { +struct drm_i915_gem_object *obj; +resource_size_t found; +int err; + + err =0 ; + found =0 ; + +mutex_lock (&mem->obj_lock); +list_for_each_entry (obj, &mem->purgeable, mm.region_link) { +if (!i915_gem_object_has_pages (obj)) +continue ;drivers/gpu/drm/i915/intel_memory_region.c const u32 intel_region_map[] = { · line 39
Quoted 10 lines
drivers/gpu/drm/i915/intel_memory_region.c +10
-0+ +if (READ_ONCE (obj->pin_global)) +continue ; + +if (atomic_read (&obj->bind_count)) +continue ; + +mutex_unlock (&mem->obj_lock); + +__i915_gem_object_put_pages (obj,I915_MM_SHRINKER );So we don't really care about the object being bound then? As all we care about is the page's
pin_count.So instead of
obj->pin_global,obj->bind_bound, you just wantif (
atomic_read(&obj->pages.pin_count))continue;as the quick check to see if it is worth preceding.
drivers/gpu/drm/i915/intel_memory_region.c const u32 intel_region_map[] = { · line 47
Quoted 6 lines
drivers/gpu/drm/i915/intel_memory_region.c +6
-0+mutex_lock_nested (&obj->mm.lock,I915_MM_SHRINKER ); +if (!i915_gem_object_has_pages (obj)) { + obj->mm.madv = __I915_MADV_PURGED; + found += obj->base.size; + } +mutex_unlock (&obj->mm.lock);
Quoted 2 lines
The locking here accomplishes what? You just want a boolean from
put_pages().
I have the same question. But looked the i915_gem_shrink() function, it has similar code. Do we prevent any race condition here? I want to use this function for swapping so hope to understand more.
--CQ
Quoted 16 lines
drivers/gpu/drm/i915/intel_memory_region.c const u32 intel_region_map[] = { · line 58
Quoted 12 lines
drivers/gpu/drm/i915/intel_memory_region.c +11
-0+ +if (found >= target) +return 0 ; + +mutex_lock (&mem->obj_lock); + } + + err = -ENOSPC ; +mutex_unlock (&mem->obj_lock); +return err; +}_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/37 drm/i915/region: support continuous allocations
In reply to Matthew AuldSome objects may need to be allocated as a continuous block, thinking ahead the various kernel io_mapping interfaces seem to expect it.
--- .../gpu/drm/i915/gem/i915_gem_object_types.h | 4 + drivers/gpu/drm/i915/gem/i915_gem_region.c | 10 +- drivers/gpu/drm/i915/gem/i915_gem_region.h | 3 +- .../drm/i915/selftests/intel_memory_region.c | 152 +++++++++++++++++- drivers/gpu/drm/i915/selftests/mock_region.c | 5 +- 5 files changed, 166 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +4 -0
@@ -116,6 +116,10 @@ struct drm_i915_gem_object { I915_SELFTEST_DECLARE(struct list_head st_link); +unsigned long flags; +#define I915_BO_ALLOC_CONTIGUOUS BIT(0) +#define I915_BO_ALLOC_FLAGS (I915_BO_ALLOC_CONTIGUOUS) +/* * Is the object to be mapped as read-only to the GPU * Only honoured if hardware has relevant pte bit
drivers/gpu/drm/i915/gem/i915_gem_region.c +9 -1
@@ -42,6 +42,9 @@ i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj)return -ENOMEM ; } +if (obj->flags &I915_BO_ALLOC_CONTIGUOUS ) + flags =I915_ALLOC_CONTIGUOUS ; + ret =__intel_memory_region_get_pages_buddy (mem, size, flags, blocks);if (ret) goto err_free_sg;
@@ -98,10 +101,12 @@ i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj) }void i915_gem_object_init_memory_region (struct drm_i915_gem_object *obj, -struct intel_memory_region *mem) +struct intel_memory_region *mem, +unsigned long flags) {INIT_LIST_HEAD (&obj->mm.blocks); obj->mm.region= mem; + obj->flags = flags;mutex_lock (&mem->obj_lock);list_add (&obj->mm.region_link, &mem->objects);
@@ -125,6 +130,9 @@ i915_gem_object_create_region(struct intel_memory_region *mem,if (!mem)return ERR_PTR (-ENODEV ); +if (flags & ~I915_BO_ALLOC_FLAGS ) +return ERR_PTR (-EINVAL ); + size =round_up (size, mem->min_page_size);GEM_BUG_ON (!size);
drivers/gpu/drm/i915/gem/i915_gem_region.h +2 -1
@@ -17,7 +17,8 @@ void i915_gem_object_put_pages_buddy(struct drm_i915_gem_object *obj, struct sg_table *pages);void i915_gem_object_init_memory_region (struct drm_i915_gem_object *obj, -struct intel_memory_region *mem); +struct intel_memory_region *mem, +unsigned long flags);void i915_gem_object_release_memory_region (struct drm_i915_gem_object *obj); struct drm_i915_gem_object *
drivers/gpu/drm/i915/selftests/intel_memory_region.c +147 -5
188 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/mock_region.c +4 -1
@@ -23,6 +23,9 @@ mock_object_create(struct intel_memory_region *mem,struct drm_i915_gem_object *obj;unsigned int cache_level; +if (flags &I915_BO_ALLOC_CONTIGUOUS ) + size =roundup_pow_of_two (size); +if (size >BIT (mem->mm.max_order) * mem->mm.chunk_size)return ERR_PTR (-E2BIG );
@@ -38,7 +41,7 @@ mock_object_create(struct intel_memory_region *mem, cache_level =HAS_LLC (i915) ?I915_CACHE_LLC :I915_CACHE_NONE ;i915_gem_object_set_cache_coherency (obj, cache_level); -i915_gem_object_init_memory_region (obj, mem); +i915_gem_object_init_memory_region (obj, mem, flags);return obj; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 04/37] drm/i915/region: support continuous allocations
Quoting Matthew Auld (2019-08-09 23:26:10)
Quoted 2 lines
Some objects may need to be allocated as a continuous block, thinking ahead the various kernel
io_mappinginterfaces seem to expect it.
But we could always use scattergather over top...
Quoted 15 lines
drivers/gpu/drm/i915/gem/i915_gem_region.c +3
-1@@ -98,10 +101,12 @@ i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj) }void i915_gem_object_init_memory_region (struct drm_i915_gem_object *obj, -struct intel_memory_region *mem) +struct intel_memory_region *mem, +unsigned long flags) {INIT_LIST_HEAD (&obj->mm.blocks); obj->mm.region= mem; + obj->flags = flags;mutex_lock (&mem->obj_lock);list_add (&obj->mm.region_link, &mem->objects);
drivers/gpu/drm/i915/gem/i915_gem_region.c i915_gem_object_create_region(struct intel_memory_region *mem, · line 134
Quoted 5 lines
drivers/gpu/drm/i915/gem/i915_gem_region.c +2
-0@@ -125,6 +130,9 @@ i915_gem_object_create_region(struct intel_memory_region *mem,if (!mem)return ERR_PTR (-ENODEV ); +if (flags & ~I915_BO_ALLOC_FLAGS ) +return ERR_PTR (-EINVAL );
This is a programmer error not a user.
drivers/gpu/drm/i915/gem/i915_gem_region.c i915_gem_object_create_region(struct intel_memory_region *mem, · line 136
Quoted 2 lines
drivers/gpu/drm/i915/gem/i915_gem_region.c +1
-0+ size =round_up (size, mem->min_page_size);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 04/37] drm/i915/region: support continuous allocations
In reply to Matthew AuldQuoted 2 lines · Matthew Auld
Some objects may need to be allocated as a continuous block, thinking ahead the various kernel
io_mappinginterfaces seem to expect it.
Not really, we can vmalloc for iomappings too.
-Daniel
Quoted 305 lines
Signed-off-by Matthew Auld <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Abdiel Janulgue <[email protected]>--- .../gpu/drm/i915/gem/i915_gem_object_types.h | 4 + drivers/gpu/drm/i915/gem/i915_gem_region.c | 10 +- drivers/gpu/drm/i915/gem/i915_gem_region.h | 3 +- .../drm/i915/selftests/intel_memory_region.c | 152 +++++++++++++++++- drivers/gpu/drm/i915/selftests/mock_region.c | 5 +- 5 files changed, 166 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_object_types.h +4
-0@@ -116,6 +116,10 @@ struct drm_i915_gem_object { I915_SELFTEST_DECLARE(struct list_head st_link); +unsigned long flags; +#define I915_BO_ALLOC_CONTIGUOUS BIT(0) +#define I915_BO_ALLOC_FLAGS (I915_BO_ALLOC_CONTIGUOUS) +/* * Is the object to be mapped as read-only to the GPU * Only honoured if hardware has relevant pte bit drivers/gpu/drm/i915/gem/i915_gem_region.c +9
-1@@ -42,6 +42,9 @@ i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj)return -ENOMEM ; } +if (obj->flags &I915_BO_ALLOC_CONTIGUOUS ) + flags =I915_ALLOC_CONTIGUOUS ; + ret =__intel_memory_region_get_pages_buddy (mem, size, flags, blocks);if (ret) goto err_free_sg;@@ -98,10 +101,12 @@ i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj) }void i915_gem_object_init_memory_region (struct drm_i915_gem_object *obj, -struct intel_memory_region *mem) +struct intel_memory_region *mem, +unsigned long flags) {INIT_LIST_HEAD (&obj->mm.blocks); obj->mm.region= mem; + obj->flags = flags;mutex_lock (&mem->obj_lock);list_add (&obj->mm.region_link, &mem->objects);@@ -125,6 +130,9 @@ i915_gem_object_create_region(struct intel_memory_region *mem,if (!mem)return ERR_PTR (-ENODEV ); +if (flags & ~I915_BO_ALLOC_FLAGS ) +return ERR_PTR (-EINVAL ); + size =round_up (size, mem->min_page_size);GEM_BUG_ON (!size);drivers/gpu/drm/i915/gem/i915_gem_region.h +2
-1@@ -17,7 +17,8 @@ void i915_gem_object_put_pages_buddy(struct drm_i915_gem_object *obj, struct sg_table *pages);void i915_gem_object_init_memory_region (struct drm_i915_gem_object *obj, -struct intel_memory_region *mem); +struct intel_memory_region *mem, +unsigned long flags);void i915_gem_object_release_memory_region (struct drm_i915_gem_object *obj); struct drm_i915_gem_object *drivers/gpu/drm/i915/selftests/intel_memory_region.c +147
-5@@ -81,17 +81,17 @@ static int igt_mock_fill(void *arg)static void igt_mark_evictable (struct drm_i915_gem_object *obj) { -i915_gem_object_unpin_pages (obj); +if (i915_gem_object_has_pinned_pages (obj)) +i915_gem_object_unpin_pages (obj); obj->mm.madv =I915_MADV_DONTNEED ;list_move (&obj->mm.region_link, &obj->mm.region->purgeable); } -static int igt_mock_shrink (void *arg) +static int igt_frag_region (struct intel_memory_region *mem, +struct list_head *objects) { -struct intel_memory_region *mem = arg;struct drm_i915_gem_object *obj;unsigned long n_objects; -LIST_HEAD (objects);resource_size_t target;resource_size_t total;int err =0 ;@@ -109,7 +109,7 @@ static int igt_mock_shrink(void *arg) goto err_close_objects; } -list_add (&obj->st_link, &objects); +list_add (&obj->st_link, objects); err =i915_gem_object_pin_pages (obj);if (err)@@ -123,6 +123,39 @@ static int igt_mock_shrink(void *arg)igt_mark_evictable (obj); } +return 0 ; + +err_close_objects: +close_objects (objects); +return err; +} + +static void igt_defrag_region (struct list_head *objects) +{ +struct drm_i915_gem_object *obj; + +list_for_each_entry (obj, objects, st_link) { +if (obj->mm.madv ==I915_MADV_WILLNEED ) +igt_mark_evictable (obj); + } +} + +static int igt_mock_shrink (void *arg) +{ +struct intel_memory_region *mem = arg; +struct drm_i915_gem_object *obj; +LIST_HEAD (objects); +resource_size_t target; +resource_size_t total; +int err; + + err =igt_frag_region (mem, &objects); +if (err) +return err; + + total =resource_size (&mem->region); + target = mem->mm.chunk_size; +while (target <= total /2 ) { obj =i915_gem_object_create_region (mem, target,0 );if (IS_ERR (obj)) {@@ -154,11 +187,120 @@ static int igt_mock_shrink(void *arg)return err; } +static int igt_mock_continuous (void *arg) +{ +struct intel_memory_region *mem = arg; +struct drm_i915_gem_object *obj; +LIST_HEAD (objects); +resource_size_t target; +resource_size_t total; +int err; + + err =igt_frag_region (mem, &objects); +if (err) +return err; + + total =resource_size (&mem->region); + target = total /2 ; + +/* +* Sanity check that we can allocate all of the available fragmented +* space. +*/ + obj =i915_gem_object_create_region (mem, target,0 ); +if (IS_ERR (obj)) { + err =PTR_ERR (obj); + goto err_close_objects; + } + +list_add (&obj->st_link, &objects); + + err =i915_gem_object_pin_pages (obj); +if (err) { +pr_err ("failed to allocate available space\n" ); + goto err_close_objects; + } + +igt_mark_evictable (obj); + +/* Try the smallest possible size -- should succeed */ + obj =i915_gem_object_create_region (mem, mem->mm.chunk_size, +I915_BO_ALLOC_CONTIGUOUS ); +if (IS_ERR (obj)) { + err =PTR_ERR (obj); + goto err_close_objects; + } + +list_add (&obj->st_link, &objects); + + err =i915_gem_object_pin_pages (obj); +if (err) { +pr_err ("failed to allocate smallest possible size\n" ); + goto err_close_objects; + } + +igt_mark_evictable (obj); + +if (obj->mm.pages->nents !=1 ) { +pr_err ("[1]object spans multiple sg entries\n" ); + err = -EINVAL ; + goto err_close_objects; + } + +/* +* Even though there is enough free space for the allocation, we +* shouldn't be able to allocate it, given that it is fragmented, and +* non-continuous. +*/ + obj =i915_gem_object_create_region (mem, target,I915_BO_ALLOC_CONTIGUOUS ); +if (IS_ERR (obj)) { + err =PTR_ERR (obj); + goto err_close_objects; + } + +list_add (&obj->st_link, &objects); + + err =i915_gem_object_pin_pages (obj); +if (!err) { +pr_err ("expected allocation to fail\n" ); + err = -EINVAL ; + goto err_close_objects; + } + +igt_defrag_region (&objects); + +/* Should now succeed */ + obj =i915_gem_object_create_region (mem, target,I915_BO_ALLOC_CONTIGUOUS ); +if (IS_ERR (obj)) { + err =PTR_ERR (obj); + goto err_close_objects; + } + +list_add (&obj->st_link, &objects); + + err =i915_gem_object_pin_pages (obj); +if (err) { +pr_err ("failed to allocate from defraged area\n" ); + goto err_close_objects; + } + +if (obj->mm.pages->nents !=1 ) { +pr_err ("object spans multiple sg entries\n" ); + err = -EINVAL ; + } + +err_close_objects: +close_objects (&objects); + +return err; +} +int intel_memory_region_mock_selftests (void ) {static const struct i915_subtest tests[] = {SUBTEST (igt_mock_fill),SUBTEST (igt_mock_shrink), +SUBTEST (igt_mock_continuous), };struct intel_memory_region *mem;struct drm_i915_private *i915;drivers/gpu/drm/i915/selftests/mock_region.c +4
-1@@ -23,6 +23,9 @@ mock_object_create(struct intel_memory_region *mem,struct drm_i915_gem_object *obj;unsigned int cache_level; +if (flags &I915_BO_ALLOC_CONTIGUOUS ) + size =roundup_pow_of_two (size); +if (size >BIT (mem->mm.max_order) * mem->mm.chunk_size)return ERR_PTR (-E2BIG );@@ -38,7 +41,7 @@ mock_object_create(struct intel_memory_region *mem, cache_level =HAS_LLC (i915) ?I915_CACHE_LLC :I915_CACHE_NONE ;i915_gem_object_set_cache_coherency (obj, cache_level); -i915_gem_object_init_memory_region (obj, mem); +i915_gem_object_init_memory_region (obj, mem, flags);return obj; }Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 5/37 drm/i915/region: support volatile objects
In reply to Matthew AuldVolatile objects are marked as DONTNEED while pinned, therefore once unpinned the backing store can be discarded.
--- drivers/gpu/drm/i915/gem/i915_gem_internal.c | 17 +++--- drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 ++ .../gpu/drm/i915/gem/i915_gem_object_types.h | 3 +- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 6 ++ drivers/gpu/drm/i915/gem/i915_gem_region.c | 7 ++- .../gpu/drm/i915/gem/selftests/huge_pages.c | 12 ++-- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 5 +- .../drm/i915/selftests/intel_memory_region.c | 56 +++++++++++++++++++ 8 files changed, 91 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_internal.c +9 -8
@@ -117,13 +117,6 @@ static int i915_gem_object_get_pages_internal(struct drm_i915_gem_object *obj) goto err; } -/* Mark the pages as dontneed whilst they are still pinned. As soon -* as they are unpinned they are allowed to be reaped by the shrinker, -* and the caller is expected to repopulate - the contents of this -* object are only valid whilst active and pinned. -*/ - obj->mm.madv =I915_MADV_DONTNEED ; -__i915_gem_object_set_pages (obj, st, sg_page_sizes);return 0 ;
@@ -143,7 +136,6 @@ static void i915_gem_object_put_pages_internal(struct drm_i915_gem_object *obj,internal_free_pages (pages); obj->mm.dirty = false; - obj->mm.madv =I915_MADV_WILLNEED ; }static const struct drm_i915_gem_object_ops i915_gem_object_internal_ops = {
@@ -188,6 +180,15 @@ i915_gem_object_create_internal(struct drm_i915_private *i915,drm_gem_private_object_init (&i915->drm, &obj->base, size);i915_gem_object_init (obj, &i915_gem_object_internal_ops); +/* +* Mark the object as volatile, such that the pages are marked as +* dontneed whilst they are still pinned. As soon as they are unpinned +* they are allowed to be reaped by the shrinker, and the caller is +* expected to repopulate - the contents of this object are only valid +* whilst active and pinned. +*/ + obj->flags =I915_BO_ALLOC_VOLATILE ; + obj->read_domains =I915_GEM_DOMAIN_CPU ; obj->write_domain =I915_GEM_DOMAIN_CPU ;
drivers/gpu/drm/i915/gem/i915_gem_object.h +6 -0
@@ -122,6 +122,12 @@ i915_gem_object_lock_fence(struct drm_i915_gem_object *obj);void i915_gem_object_unlock_fence (struct drm_i915_gem_object *obj,struct dma_fence *fence); +static inline bool +i915_gem_object_is_volatile (const struct drm_i915_gem_object *obj) +{ +return obj->flags &I915_BO_ALLOC_VOLATILE ; +} +static inline void i915_gem_object_set_readonly (struct drm_i915_gem_object *obj) {
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +2 -1
@@ -118,7 +118,8 @@ struct drm_i915_gem_object {unsigned long flags;#define I915_BO_ALLOC_CONTIGUOUS BIT(0) -#define I915_BO_ALLOC_FLAGS (I915_BO_ALLOC_CONTIGUOUS) +#define I915_BO_ALLOC_VOLATILE BIT(1) +#define I915_BO_ALLOC_FLAGS (I915_BO_ALLOC_CONTIGUOUS | I915_BO_ALLOC_VOLATILE)/* * Is the object to be mapped as read-only to the GPU
drivers/gpu/drm/i915/gem/i915_gem_pages.c +6 -0
@@ -18,6 +18,9 @@ void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj,lockdep_assert_held (&obj->mm.lock); +if (i915_gem_object_is_volatile (obj)) + obj->mm.madv =I915_MADV_DONTNEED ; +/* Make the pages coherent with the GPU (flushing any swapin). */ if (obj->cache_dirty) { obj->write_domain =0 ;
@@ -159,6 +162,9 @@ __i915_gem_object_unset_pages(struct drm_i915_gem_object *obj)if (IS_ERR_OR_NULL (pages))return pages; +if (i915_gem_object_is_volatile (obj)) + obj->mm.madv =I915_MADV_WILLNEED ; +i915_gem_object_make_unshrinkable (obj);if (obj->mm.mapping) {
drivers/gpu/drm/i915/gem/i915_gem_region.c +6 -1
@@ -109,7 +109,12 @@ void i915_gem_object_init_memory_region(struct drm_i915_gem_object *obj, obj->flags = flags;mutex_lock (&mem->obj_lock); -list_add (&obj->mm.region_link, &mem->objects); + +if (obj->flags &I915_BO_ALLOC_VOLATILE ) +list_add (&obj->mm.region_link, &mem->purgeable); +else +list_add (&obj->mm.region_link, &mem->objects); +mutex_unlock (&mem->obj_lock); }
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +4 -8
@@ -115,8 +115,6 @@ static int get_huge_pages(struct drm_i915_gem_object *obj)if (i915_gem_gtt_prepare_pages (obj, st)) goto err; - obj->mm.madv =I915_MADV_DONTNEED ; -GEM_BUG_ON (sg_page_sizes != obj->mm.page_mask);__i915_gem_object_set_pages (obj, st, sg_page_sizes);
@@ -137,7 +135,6 @@ static void put_huge_pages(struct drm_i915_gem_object *obj,huge_pages_free_pages (pages); obj->mm.dirty = false; - obj->mm.madv =I915_MADV_WILLNEED ; }static const struct drm_i915_gem_object_ops huge_page_ops = {
@@ -170,6 +167,8 @@ huge_pages_object(struct drm_i915_private *i915,drm_gem_private_object_init (&i915->drm, &obj->base, size);i915_gem_object_init (obj, &huge_page_ops); + obj->flags =I915_BO_ALLOC_VOLATILE ; + obj->write_domain =I915_GEM_DOMAIN_CPU ; obj->read_domains =I915_GEM_DOMAIN_CPU ; obj->cache_level =I915_CACHE_NONE ;
@@ -229,8 +228,6 @@ static int fake_get_huge_pages(struct drm_i915_gem_object *obj)i915_sg_trim (st); - obj->mm.madv =I915_MADV_DONTNEED ; -__i915_gem_object_set_pages (obj, st, sg_page_sizes);return 0 ;
@@ -263,8 +260,6 @@ static int fake_get_huge_pages_single(struct drm_i915_gem_object *obj)sg_dma_len (sg) = obj->base.size;sg_dma_address (sg) = page_size; - obj->mm.madv =I915_MADV_DONTNEED ; -__i915_gem_object_set_pages (obj, st, sg->length);return 0 ;
@@ -283,7 +278,6 @@ static void fake_put_huge_pages(struct drm_i915_gem_object *obj, {fake_free_huge_pages (obj, pages); obj->mm.dirty = false; - obj->mm.madv =I915_MADV_WILLNEED ; }static const struct drm_i915_gem_object_ops fake_ops = {
@@ -323,6 +317,8 @@ fake_huge_pages_object(struct drm_i915_private *i915, u64 size, bool single)else i915_gem_object_init (obj, &fake_ops); + obj->flags =I915_BO_ALLOC_VOLATILE ; + obj->write_domain =I915_GEM_DOMAIN_CPU ; obj->read_domains =I915_GEM_DOMAIN_CPU ; obj->cache_level =I915_CACHE_NONE ;
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +2 -3
@@ -88,8 +88,6 @@ static int fake_get_pages(struct drm_i915_gem_object *obj) }GEM_BUG_ON (rem); - obj->mm.madv =I915_MADV_DONTNEED ; -__i915_gem_object_set_pages (obj, pages, sg_page_sizes);return 0 ;
@@ -101,7 +99,6 @@ static void fake_put_pages(struct drm_i915_gem_object *obj, {fake_free_pages (obj, pages); obj->mm.dirty = false; - obj->mm.madv =I915_MADV_WILLNEED ; }static const struct drm_i915_gem_object_ops fake_ops = {
@@ -128,6 +125,8 @@ fake_dma_object(struct drm_i915_private *i915, u64 size)drm_gem_private_object_init (&i915->drm, &obj->base, size);i915_gem_object_init (obj, &fake_ops); + obj->flags =I915_BO_ALLOC_VOLATILE ; + obj->write_domain =I915_GEM_DOMAIN_CPU ; obj->read_domains =I915_GEM_DOMAIN_CPU ; obj->cache_level =I915_CACHE_NONE ;
drivers/gpu/drm/i915/selftests/intel_memory_region.c +56 -0
68 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Intel-gfx] [PATCH v3 05/37] drm/i915/region: support volatile objects
Quoting Matthew Auld (2019-08-09 23:26:11)
Quoted 7 lines
Volatile objects are marked as DONTNEED while pinned, therefore once unpinned the backing store can be discarded.
Signed-off-by Matthew Auld <[email protected]>Signed-off-by CQ Tang <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Abdiel Janulgue <[email protected]>
I think that's quite a nice generalisation.
-Chris
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 05/37] drm/i915/region: support volatile objects
In reply to Matthew AuldQuoting Matthew Auld (2019-08-09 23:26:11)
Quoted 2 lines
Volatile objects are marked as DONTNEED while pinned, therefore once unpinned the backing store can be discarded.
Do we also have the concept of non-volatile backing store, e.g. shmemfs (non-volatile) vs stolen (volatile)?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 6/37 drm/i915: Add memory region information to device_info
In reply to Matthew AuldFrom: Abdiel Janulgue <[email protected]>
Exposes available regions for the platform. Shared memory will always be available.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_device_info.h | 2 ++ 2 files changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2212,6 +2212,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_IPC (dev_priv) (INTEL_INFO(dev_priv)->display.has_ipc) +#define HAS_REGION (i915, i) (INTEL_INFO(i915)->memory_regions & (i)) +#define HAS_GT_UC (dev_priv) (INTEL_INFO(dev_priv)->has_gt_uc)/* Having GuC is not the same as using GuC */
drivers/gpu/drm/i915/intel_device_info.h +2 -0
@@ -159,6 +159,8 @@ struct intel_device_info {unsigned int page_sizes;/* page sizes supported by the HW */ +u32 memory_regions;/* regions supported by the HW */ +u32 display_mmio_offset;u8 num_pipes;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 06/37] drm/i915: Add memory region information to device_info
Quoting Matthew Auld (2019-08-09 23:26:12)
Quoted 30 lines
From: Abdiel Janulgue <[email protected]>
Exposes available regions for the platform. Shared memory will always be available.
Signed-off-by Abdiel Janulgue <[email protected]>Signed-off-by Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_device_info.h | 2 ++ 2 files changed, 4 insertions(+)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -2212,6 +2212,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_IPC (dev_priv) (INTEL_INFO(dev_priv)->display.has_ipc) +#define HAS_REGION (i915, i) (INTEL_INFO(i915)->memory_regions & (i)) +#define HAS_GT_UC (dev_priv) (INTEL_INFO(dev_priv)->has_gt_uc)/* Having GuC is not the same as using GuC */ drivers/gpu/drm/i915/intel_device_info.h +0
-0
drivers/gpu/drm/i915/intel_device_info.h struct intel_device_info { · line 166
Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.h +2
-0@@ -159,6 +159,8 @@ struct intel_device_info {unsigned int page_sizes;/* page sizes supported by the HW */ +u32 memory_regions;/* regions supported by the HW */ +u32 display_mmio_offset;u8 num_pipes;
If shared memory is always available, why is it absent?
Do you plan to distinguish scrubbed and zeroed system pages, private pools to the process etc?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 7/37 drm/i915: support creating LMEM objects
In reply to Matthew AuldWe currently define LMEM, or local memory, as just another memory region, like system memory or stolen, which we can expose to userspace and can be mapped to the CPU via some BAR.
--- drivers/gpu/drm/i915/Makefile | 2 + drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 31 ++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 23 +++++++++ drivers/gpu/drm/i915/i915_drv.h | 5 ++ drivers/gpu/drm/i915/intel_region_lmem.c | 48 +++++++++++++++++++ drivers/gpu/drm/i915/intel_region_lmem.h | 11 +++++ .../drm/i915/selftests/i915_live_selftests.h | 1 + .../drm/i915/selftests/intel_memory_region.c | 45 +++++++++++++++++ 8 files changed, 166 insertions(+) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_lmem.c create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_lmem.h create mode 100644 drivers/gpu/drm/i915/intel_region_lmem.c create mode 100644 drivers/gpu/drm/i915/intel_region_lmem.h
drivers/gpu/drm/i915/Makefile +2 -0
@@ -112,6 +112,7 @@ gem-y += \ gem/i915_gem_internal.o \ gem/i915_gem_object.o \ gem/i915_gem_object_blt.o \ + gem/i915_gem_lmem.o \ gem/i915_gem_mman.o \ gem/i915_gem_pages.o \ gem/i915_gem_phys.o \
@@ -140,6 +141,7 @@ i915-y += \ i915_scheduler.o \ i915_trace_points.o \ i915_vma.o \ + intel_region_lmem.o \ intel_wopcm.o # general-purpose microcontroller (GuC) support
drivers/gpu/drm/i915/gem/i915_gem_lmem.c new file +31 -0
@@ -0,0 +1,31 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2019 Intel Corporation +*/ + +#include "intel_memory_region.h" +#include "gem/i915_gem_region.h" +#include "gem/i915_gem_lmem.h" +#include "i915_drv.h" + +const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = { + .get_pages = i915_gem_object_get_pages_buddy, + .put_pages = i915_gem_object_put_pages_buddy, + .release = i915_gem_object_release_memory_region, +}; + +bool i915_gem_object_is_lmem (struct drm_i915_gem_object *obj) +{ +struct intel_memory_region *region = obj->mm.region; + +return region && region->type ==INTEL_LMEM ; +} + +struct drm_i915_gem_object * +i915_gem_object_create_lmem (struct drm_i915_private *i915, +resource_size_t size, +unsigned int flags) +{ +return i915_gem_object_create_region (i915->regions[INTEL_MEMORY_LMEM ], + size, flags); +}
drivers/gpu/drm/i915/gem/i915_gem_lmem.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2019 Intel Corporation +*/ + +#ifndef __I915_GEM_LMEM_H +#define __I915_GEM_LMEM_H + +#include <linux/types.h> + +struct drm_i915_private ; +struct drm_i915_gem_object ; + +extern const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops; + +bool i915_gem_object_is_lmem (struct drm_i915_gem_object *obj); + +struct drm_i915_gem_object * +i915_gem_object_create_lmem (struct drm_i915_private *i915, +resource_size_t size, +unsigned int flags); + +#endif /* !__I915_GEM_LMEM_H */
drivers/gpu/drm/i915/i915_drv.h +5 -0
@@ -98,6 +98,8 @@#include "i915_vma.h" #include "i915_irq.h" +#include "intel_region_lmem.h" +#include "intel_gvt.h" /* General customization:
@@ -1369,6 +1371,8 @@ struct drm_i915_private {*/ resource_size_t stolen_usable_size;/* Total size minus reserved ranges */ +struct intel_memory_region *regions[INTEL_MEMORY_UKNOWN ]; +struct intel_uncore uncore;struct i915_virtual_gpu vgpu;
@@ -2213,6 +2217,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_IPC (dev_priv) (INTEL_INFO(dev_priv)->display.has_ipc)#define HAS_REGION (i915, i) (INTEL_INFO(i915)->memory_regions & (i)) +#define HAS_LMEM (i915) HAS_REGION(i915, REGION_LMEM)#define HAS_GT_UC (dev_priv) (INTEL_INFO(dev_priv)->has_gt_uc)
drivers/gpu/drm/i915/intel_region_lmem.c new file +48 -0
48 lines not on this page · raw message
drivers/gpu/drm/i915/intel_region_lmem.h new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2019 Intel Corporation +*/ + +#ifndef __INTEL_REGION_LMEM_H +#define __INTEL_REGION_LMEM_H + +extern const struct intel_memory_region_ops intel_region_lmem_ops; + +#endif /* !__INTEL_REGION_LMEM_H */
drivers/gpu/drm/i915/selftests/i915_live_selftests.h +1 -0
@@ -30,6 +30,7 @@ selftest(gem_contexts, i915_gem_context_live_selftests) selftest(blt, i915_gem_object_blt_live_selftests) selftest(client, i915_gem_client_blt_live_selftests) selftest(reset, intel_reset_live_selftests) +selftest(memory_region, intel_memory_region_live_selftests) selftest(hangcheck, intel_hangcheck_live_selftests) selftest(execlists, intel_execlists_live_selftests)selftest (guc, intel_guc_live_selftest)
drivers/gpu/drm/i915/selftests/intel_memory_region.c +45 -0
62 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 07/37] drm/i915: support creating LMEM objects
Quoting Matthew Auld (2019-08-09 23:26:13)
drivers/gpu/drm/i915/i915_drv.h struct drm_i915_private { · line 1374
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -1369,6 +1371,8 @@ struct drm_i915_private {*/ resource_size_t stolen_usable_size;/* Total size minus reserved ranges */ +struct intel_memory_region *regions[INTEL_MEMORY_UKNOWN ];
If there was ever an object to put inside i915_mm, this is sorely the one!
Quoted 29 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0struct intel_uncore uncore;struct i915_virtual_gpu vgpu;@@ -2213,6 +2217,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_IPC (dev_priv) (INTEL_INFO(dev_priv)->display.has_ipc)#define HAS_REGION (i915, i) (INTEL_INFO(i915)->memory_regions & (i)) +#define HAS_LMEM (i915) HAS_REGION(i915, REGION_LMEM)#define HAS_GT_UC (dev_priv) (INTEL_INFO(dev_priv)->has_gt_uc)drivers/gpu/drm/i915/intel_region_lmem.c new file +12
-0@@ -0,0 +1,48 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2019 Intel Corporation +*/ + +#include "i915_drv.h" +#include "intel_memory_region.h" +#include "gem/i915_gem_lmem.h" +#include "gem/i915_gem_region.h" +#include "intel_region_lmem.h" + +static struct drm_i915_gem_object *
drivers/gpu/drm/i915/intel_region_lmem.c line 22
Quoted 10 lines
drivers/gpu/drm/i915/intel_region_lmem.c new file +10
-0+lmem_create_object(struct intel_memory_region *mem, + resource_size_t size, + unsigned int flags) +{ + struct drm_i915_private *i915 = mem->i915; +struct drm_i915_gem_object *obj; +unsigned int cache_level; + +if (flags &I915_BO_ALLOC_CONTIGUOUS ) + size =roundup_pow_of_two (size);
? I would say that is not your decision to make. The flag says that the allocation should one contiguous block.
drivers/gpu/drm/i915/intel_region_lmem.c line 34
Quoted 12 lines
drivers/gpu/drm/i915/intel_region_lmem.c new file +12
-0+ +if (size >BIT (mem->mm.max_order) * mem->mm.chunk_size) +return ERR_PTR (-E2BIG ); + + obj =i915_gem_object_alloc (); +if (!obj) +return ERR_PTR (-ENOMEM ); + +drm_gem_private_object_init (&i915->drm, &obj->base, size); +i915_gem_object_init (obj, &i915_gem_lmem_obj_ops); + + obj->read_domains =I915_GEM_DOMAIN_CPU |I915_GEM_DOMAIN_GTT ;
Is it really? Device local memory starts off inside the CPU cache?
drivers/gpu/drm/i915/intel_region_lmem.c line 36
Quoted 1 line
drivers/gpu/drm/i915/intel_region_lmem.c new file +1
-0+ cache_level =HAS_LLC (i915) ?I915_CACHE_LLC :I915_CACHE_NONE ;
This seems to be a false generalisation. You should be asking the memory region?
Besides, the current thinking is not to mark any object as cacheable until the user commands it.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 8/37 drm/i915: setup io-mapping for LMEM
In reply to Matthew AuldFrom: Abdiel Janulgue <[email protected]>
--- drivers/gpu/drm/i915/intel_region_lmem.c | 28 ++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_region_lmem.c +26 -2
@@ -41,8 +41,32 @@ lmem_create_object(struct intel_memory_region *mem,return obj; } +static void +region_lmem_release (struct intel_memory_region *mem) +{ +io_mapping_fini (&mem->iomap); +intel_memory_region_release_buddy (mem); +} + +static int +region_lmem_init (struct intel_memory_region *mem) +{ +int ret; + +if (!io_mapping_init_wc (&mem->iomap, + mem->io_start, +resource_size (&mem->region))) +return -EIO ; + + ret =intel_memory_region_init_buddy (mem); +if (ret) +io_mapping_fini (&mem->iomap); + +return ret; +} +const struct intel_memory_region_ops intel_region_lmem_ops = { - .init = intel_memory_region_init_buddy, - .release = intel_memory_region_release_buddy, + .init = region_lmem_init, + .release = region_lmem_release, .create_object = lmem_create_object, };
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 9/37 drm/i915/lmem: support kernel mapping
In reply to Matthew AuldFrom: Abdiel Janulgue <[email protected]>
We can create LMEM objects, but we also need to support mapping them into kernel space for internal use.
--- drivers/gpu/drm/i915/gem/i915_gem_internal.c | 4 +- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 36 +++++++++ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 8 ++ drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 ++ .../gpu/drm/i915/gem/i915_gem_object_types.h | 3 +- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 20 ++++- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +- .../drm/i915/gem/selftests/huge_gem_object.c | 4 +- .../drm/i915/selftests/intel_memory_region.c | 76 +++++++++++++++++++ 9 files changed, 152 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_internal.c +3 -1
@@ -140,7 +140,9 @@ static void i915_gem_object_put_pages_internal(struct drm_i915_gem_object *obj,static const struct drm_i915_gem_object_ops i915_gem_object_internal_ops = { .flags =I915_GEM_OBJECT_HAS_STRUCT_PAGE | -I915_GEM_OBJECT_IS_SHRINKABLE , +I915_GEM_OBJECT_IS_SHRINKABLE | +I915_GEM_OBJECT_IS_MAPPABLE , + .get_pages = i915_gem_object_get_pages_internal, .put_pages = i915_gem_object_put_pages_internal, };
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +36 -0
@@ -9,11 +9,47 @@#include "i915_drv.h" const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = { + .flags =I915_GEM_OBJECT_IS_MAPPABLE , + .get_pages = i915_gem_object_get_pages_buddy, .put_pages = i915_gem_object_put_pages_buddy, .release = i915_gem_object_release_memory_region, }; +/* XXX: Time to vfunc your life up? */ +void __iomem *i915_gem_object_lmem_io_map_page (struct drm_i915_gem_object *obj, +unsigned long n) +{ +resource_size_t offset; + + offset =i915_gem_object_get_dma_address (obj, n); + +return io_mapping_map_wc (&obj->mm.region->iomap, offset,PAGE_SIZE ); +} + +void __iomem *i915_gem_object_lmem_io_map_page_atomic (struct drm_i915_gem_object *obj, +unsigned long n) +{ +resource_size_t offset; + + offset =i915_gem_object_get_dma_address (obj, n); + +return io_mapping_map_atomic_wc (&obj->mm.region->iomap, offset); +} + +void __iomem *i915_gem_object_lmem_io_map (struct drm_i915_gem_object *obj, +unsigned long n, +unsigned long size) +{ +resource_size_t offset; + +GEM_BUG_ON (!(obj->flags &I915_BO_ALLOC_CONTIGUOUS )); + + offset =i915_gem_object_get_dma_address (obj, n); + +return io_mapping_map_wc (&obj->mm.region->iomap, offset, size); +} +bool i915_gem_object_is_lmem (struct drm_i915_gem_object *obj) {struct intel_memory_region *region = obj->mm.region;
drivers/gpu/drm/i915/gem/i915_gem_lmem.h +8 -0
@@ -13,6 +13,14 @@ struct drm_i915_gem_object;extern const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops; +void __iomem *i915_gem_object_lmem_io_map (struct drm_i915_gem_object *obj, +unsigned long n,unsigned long size); +void __iomem *i915_gem_object_lmem_io_map_page (struct drm_i915_gem_object *obj, +unsigned long n); +void __iomem * +i915_gem_object_lmem_io_map_page_atomic (struct drm_i915_gem_object *obj, +unsigned long n); +bool i915_gem_object_is_lmem (struct drm_i915_gem_object *obj); struct drm_i915_gem_object *
drivers/gpu/drm/i915/gem/i915_gem_object.h +6 -0
@@ -158,6 +158,12 @@ i915_gem_object_is_proxy(const struct drm_i915_gem_object *obj)return obj->ops->flags &I915_GEM_OBJECT_IS_PROXY ; } +static inline bool +i915_gem_object_is_mappable (const struct drm_i915_gem_object *obj) +{ +return obj->ops->flags &I915_GEM_OBJECT_IS_MAPPABLE ; +} +static inline bool i915_gem_object_needs_async_cancel (const struct drm_i915_gem_object *obj) {
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +2 -1
@@ -31,7 +31,8 @@ struct drm_i915_gem_object_ops {#define I915_GEM_OBJECT_HAS_STRUCT_PAGE BIT(0)#define I915_GEM_OBJECT_IS_SHRINKABLE BIT(1)#define I915_GEM_OBJECT_IS_PROXY BIT(2) -#define I915_GEM_OBJECT_ASYNC_CANCEL BIT(3) +#define I915_GEM_OBJECT_IS_MAPPABLE BIT(3) +#define I915_GEM_OBJECT_ASYNC_CANCEL BIT(4)/* Interface between the GEM object and its backing storage. * get_pages() is called once prior to the use of the associated set
drivers/gpu/drm/i915/gem/i915_gem_pages.c +16 -4
@@ -7,6 +7,7 @@#include "i915_drv.h" #include "i915_gem_object.h" #include "i915_scatterlist.h" +#include "i915_gem_lmem.h" void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj, struct sg_table *pages,
@@ -171,7 +172,9 @@ __i915_gem_object_unset_pages(struct drm_i915_gem_object *obj)void *ptr; ptr =page_mask_bits (obj->mm.mapping); -if (is_vmalloc_addr (ptr)) +if (i915_gem_object_is_lmem (obj)) +io_mapping_unmap (ptr); +else if (is_vmalloc_addr (ptr))vunmap (ptr);else kunmap (kmap_to_page (ptr));
@@ -230,7 +233,7 @@ int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj, }/* The 'mapping' part of i915_gem_object_pin_map() below */ -static void *i915_gem_object_map (const struct drm_i915_gem_object *obj, +static void *i915_gem_object_map (struct drm_i915_gem_object *obj,enum i915_map_type type) {unsigned long n_pages = obj->base.size >>PAGE_SHIFT ;
@@ -243,6 +246,13 @@ static void *i915_gem_object_map(const struct drm_i915_gem_object *obj,pgprot_t pgprot;void *addr; +if (i915_gem_object_is_lmem (obj)) { +if (type !=I915_MAP_WC ) +return NULL ; + +return i915_gem_object_lmem_io_map (obj,0 , obj->base.size); + } +/* A single page can always be kmapped */ if (n_pages ==1 && type ==I915_MAP_WB )return kmap (sg_page (sgt->sgl));
@@ -288,7 +298,7 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj,void *ptr;int err; -if (unlikely (!i915_gem_object_has_struct_page (obj))) +if (unlikely (!i915_gem_object_is_mappable (obj)))return ERR_PTR (-ENXIO ); err =mutex_lock_interruptible (&obj->mm.lock);
@@ -320,7 +330,9 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj, goto err_unpin; } -if (is_vmalloc_addr (ptr)) +if (i915_gem_object_is_lmem (obj)) +io_mapping_unmap (ptr); +else if (is_vmalloc_addr (ptr))vunmap (ptr);else kunmap (kmap_to_page (ptr));
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +2 -1
@@ -422,7 +422,8 @@ static void shmem_release(struct drm_i915_gem_object *obj)const struct drm_i915_gem_object_ops i915_gem_shmem_ops = { .flags =I915_GEM_OBJECT_HAS_STRUCT_PAGE | -I915_GEM_OBJECT_IS_SHRINKABLE , +I915_GEM_OBJECT_IS_SHRINKABLE | +I915_GEM_OBJECT_IS_MAPPABLE , .get_pages = shmem_get_pages, .put_pages = shmem_put_pages,
drivers/gpu/drm/i915/gem/selftests/huge_gem_object.c +3 -1
@@ -86,7 +86,9 @@ static void huge_put_pages(struct drm_i915_gem_object *obj,static const struct drm_i915_gem_object_ops huge_ops = { .flags =I915_GEM_OBJECT_HAS_STRUCT_PAGE | -I915_GEM_OBJECT_IS_SHRINKABLE , +I915_GEM_OBJECT_IS_SHRINKABLE | +I915_GEM_OBJECT_IS_MAPPABLE , + .get_pages = huge_get_pages, .put_pages = huge_put_pages, };
drivers/gpu/drm/i915/selftests/intel_memory_region.c +76 -0
96 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 10/37 drm/i915/blt: don't assume pinned intel_context
In reply to Matthew AuldCurrently we just pass in bcs0->engine_context so it matters not, but in the future we may want to pass in something that is not a kernel_context, so try to be a bit more generic.
--- drivers/gpu/drm/i915/gem/i915_gem_client_blt.c | 3 ++- drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_client_blt.c +2 -1
@@ -4,6 +4,7 @@*/ #include "i915_drv.h" +#include "gt/intel_context.h" #include "i915_gem_client_blt.h" #include "i915_gem_object_blt.h"
@@ -175,7 +176,7 @@ static void clear_pages_worker(struct work_struct *work)if (unlikely (err)) goto out_unlock; - rq =i915_request_create (w->ce); + rq =intel_context_create_request (w->ce);if (IS_ERR (rq)) { err =PTR_ERR (rq); goto out_unpin;
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +2 -1
@@ -4,6 +4,7 @@*/ #include "i915_drv.h" +#include "gt/intel_context.h" #include "i915_gem_clflush.h" #include "i915_gem_object_blt.h"
@@ -64,7 +65,7 @@ int i915_gem_object_fill_blt(struct drm_i915_gem_object *obj,i915_gem_object_unlock (obj); } - rq =i915_request_create (ce); + rq =intel_context_create_request (ce);if (IS_ERR (rq)) { err =PTR_ERR (rq); goto out_unpin;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 11/37 drm/i915/blt: bump size restriction
In reply to Matthew Auld--- .../gpu/drm/i915/gem/i915_gem_client_blt.c | 31 +++- .../gpu/drm/i915/gem/i915_gem_object_blt.c | 139 ++++++++++++++---- .../gpu/drm/i915/gem/i915_gem_object_blt.h | 9 +- .../i915/gem/selftests/i915_gem_client_blt.c | 16 +- .../i915/gem/selftests/i915_gem_object_blt.c | 22 ++- 5 files changed, 170 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_client_blt.c +29 -2
@@ -5,6 +5,8 @@#include "i915_drv.h" #include "gt/intel_context.h" +#include "gt/intel_engine_pm.h" +#include "gt/intel_engine_pool.h" #include "i915_gem_client_blt.h" #include "i915_gem_object_blt.h"
@@ -156,7 +158,9 @@ static void clear_pages_worker(struct work_struct *work)struct drm_i915_private *i915 = w->ce->engine->i915;struct drm_i915_gem_object *obj = w->sleeve->vma->obj;struct i915_vma *vma = w->sleeve->vma; +struct intel_engine_pool_node *pool;struct i915_request *rq; +struct i915_vma *batch;int err = w->dma.error;if (unlikely (err))
@@ -176,10 +180,17 @@ static void clear_pages_worker(struct work_struct *work)if (unlikely (err)) goto out_unlock; +intel_engine_pm_get (w->ce->engine); + batch =intel_emit_vma_fill_blt (&pool, w->ce, vma, w->value); +if (IS_ERR (batch)) { + err =PTR_ERR (batch); + goto out_unpin; + } + rq =intel_context_create_request (w->ce);if (IS_ERR (rq)) { err =PTR_ERR (rq); - goto out_unpin; + goto out_batch; }/* There's no way the fence has signalled */
@@ -187,6 +198,16 @@ static void clear_pages_worker(struct work_struct *work) clear_pages_dma_fence_cb)) GEM_BUG_ON(1); +i915_vma_lock (batch); + err =i915_vma_move_to_active (batch, rq,0 ); +i915_vma_unlock (batch); +if (unlikely (err)) + goto out_request; + + err =intel_engine_pool_mark_active (pool, rq); +if (unlikely (err)) + goto out_request; +if (w->ce->engine->emit_init_breadcrumb) { err = w->ce->engine->emit_init_breadcrumb (rq);if (unlikely (err))
@@ -202,7 +223,9 @@ static void clear_pages_worker(struct work_struct *work)if (err) goto out_request; - err =intel_emit_vma_fill_blt (rq, vma, w->value); + err = w->ce->engine->emit_bb_start (rq, + batch->node.start, batch->node.size, +0 ); out_request:if (unlikely (err)) {i915_request_skip (rq, err);
@@ -210,7 +233,11 @@ static void clear_pages_worker(struct work_struct *work) }i915_request_add (rq); +out_batch: +i915_vma_unpin (batch); +intel_engine_pool_put (pool); out_unpin: +intel_engine_pm_put (w->ce->engine);i915_vma_unpin (vma); out_unlock:mutex_unlock (&i915->drm.struct_mutex);
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +108 -31
182 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_object_blt.h +5 -4
@@ -9,13 +9,14 @@#include <linux/types.h> struct drm_i915_gem_object ; +struct intel_engine_pool_node ;struct intel_context ; -struct i915_request ;struct i915_vma ; -int intel_emit_vma_fill_blt (struct i915_request *rq, -struct i915_vma *vma, -u32 value); +struct i915_vma *intel_emit_vma_fill_blt (struct intel_engine_pool_node **p, +struct intel_context *ce, +struct i915_vma *vma, +u32 value); int i915_gem_object_fill_blt(struct drm_i915_gem_object *obj, struct intel_context *ce,
drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c +11 -5
@@ -9,6 +9,7 @@#include "selftests/igt_flush_test.h" #include "selftests/mock_drm.h" +#include "huge_gem_object.h" #include "mock_context.h" static int igt_client_fill (void *arg)
@@ -24,15 +25,19 @@ static int igt_client_fill(void *arg)prandom_seed_state (&prng, i915_selftest.random_seed); do { - u32 sz = prandom_u32_state(&prng) % SZ_32M; + const u32 max_block_size = S16_MAX * PAGE_SIZE; + u32 sz = min_t(u64, ce->vm->total >> 4, prandom_u32_state(&prng)); + u32 phys_sz = sz % (max_block_size + 1); u32 val = prandom_u32_state(&prng); u32 i; sz = round_up(sz, PAGE_SIZE); + phys_sz = round_up(phys_sz, PAGE_SIZE); - pr_debug("%s with sz=%x, val=%x\n", __func__, sz, val); + pr_debug("%s with phys_sz= %x, sz=%x, val=%x\n", __func__, + phys_sz, sz, val); - obj = i915_gem_object_create_internal(i915, sz); + obj = huge_gem_object(i915, phys_sz, sz); if (IS_ERR(obj)) { err = PTR_ERR(obj); goto err_flush;
@@ -54,7 +59,8 @@ static int igt_client_fill(void *arg)* values after we do the set_to_cpu_domain and pick it up as a * test failure. */ -memset32 (vaddr, val ^0xdeadbeaf , obj->base.size /sizeof (u32)); +memset32 (vaddr, val ^0xdeadbeaf , +huge_gem_object_phys_size (obj) /sizeof (u32));if (!(obj->cache_coherent &I915_BO_CACHE_COHERENT_FOR_WRITE )) obj->cache_dirty = true;
@@ -71,7 +77,7 @@ static int igt_client_fill(void *arg)if (err) goto err_unpin; -for (i =0 ; i < obj->base.size /sizeof (u32); ++i) { +for (i =0 ; i <huge_gem_object_phys_size (obj) /sizeof (u32); ++i) {if (vaddr[i] != val) {pr_err ("vaddr[%u]=%x, expected=%x\n" , i, vaddr[i], val);
drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c +17 -5
@@ -9,6 +9,7 @@#include "selftests/igt_flush_test.h" #include "selftests/mock_drm.h" +#include "huge_gem_object.h" #include "mock_context.h" static int igt_fill_blt (void *arg)
@@ -23,16 +24,26 @@ static int igt_fill_blt(void *arg)prandom_seed_state (&prng, i915_selftest.random_seed); +/* +* XXX: needs some threads to scale all these tests, also maybe throw +* in submission from higher priority context to see if we are +* preempted for very large objects... +*/ + do { - u32 sz = prandom_u32_state(&prng) % SZ_32M; + const u32 max_block_size = S16_MAX * PAGE_SIZE; + u32 sz = min_t(u64, ce->vm->total >> 4, prandom_u32_state(&prng)); + u32 phys_sz = sz % (max_block_size + 1); u32 val = prandom_u32_state(&prng); u32 i; sz = round_up(sz, PAGE_SIZE); + phys_sz = round_up(phys_sz, PAGE_SIZE); - pr_debug("%s with sz=%x, val=%x\n", __func__, sz, val); + pr_debug("%s with phys_sz= %x, sz=%x, val=%x\n", __func__, + phys_sz, sz, val); - obj = i915_gem_object_create_internal(i915, sz); + obj = huge_gem_object(i915, phys_sz, sz); if (IS_ERR(obj)) { err = PTR_ERR(obj); goto err_flush;
@@ -48,7 +59,8 @@ static int igt_fill_blt(void *arg)* Make sure the potentially async clflush does its job, if * required. */ -memset32 (vaddr, val ^0xdeadbeaf , obj->base.size /sizeof (u32)); +memset32 (vaddr, val ^0xdeadbeaf , +huge_gem_object_phys_size (obj) /sizeof (u32));if (!(obj->cache_coherent &I915_BO_CACHE_COHERENT_FOR_WRITE )) obj->cache_dirty = true;
@@ -65,7 +77,7 @@ static int igt_fill_blt(void *arg)if (err) goto err_unpin; -for (i =0 ; i < obj->base.size /sizeof (u32); ++i) { +for (i =0 ; i <huge_gem_object_phys_size (obj) /sizeof (u32); ++i) {if (vaddr[i] != val) {pr_err ("vaddr[%u]=%x, expected=%x\n" , i, vaddr[i], val);
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 12/37 drm/i915/blt: support copying objects
In reply to Matthew AuldWe can already clear an object with the blt, so try to do the same to support copying from one object backing store to another. Really this is just object -> object, which is not that useful yet, what we really want is two backing stores, but that will require some vma rework first, otherwise we are stuck with "tmp" objects.
--- .../gpu/drm/i915/gem/i915_gem_object_blt.c | 207 ++++++++++++++++++ .../gpu/drm/i915/gem/i915_gem_object_blt.h | 9 + .../i915/gem/selftests/i915_gem_object_blt.c | 106 +++++++++ drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 5 +- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 2 +- 5 files changed, 326 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +207 -0
@@ -175,6 +175,213 @@ int i915_gem_object_fill_blt(struct drm_i915_gem_object *obj,return err; } +struct i915_vma *intel_emit_vma_copy_blt (struct intel_engine_pool_node **p, +struct intel_context *ce, +struct i915_vma *src, +struct i915_vma *dst) +{ +struct drm_i915_private *i915 = ce->vm->i915; +const u32 block_size =S16_MAX *PAGE_SIZE ; +struct intel_engine_pool_node *pool; +struct i915_vma *batch; +u64 src_offset, dst_offset; +u64 count; +u64 rem; +u32 size; +u32 *cmd; +int err; + +GEM_BUG_ON (src->size != dst->size); + + count =div_u64 (dst->size, block_size); + size = (1 +11 * count) *sizeof (u32); + size =round_up (size,PAGE_SIZE ); + pool =intel_engine_pool_get (&ce->engine->pool, size); +if (IS_ERR (pool)) +return ERR_CAST (pool); + + cmd =i915_gem_object_pin_map (pool->obj,I915_MAP_WC ); +if (IS_ERR (cmd)) { + err =PTR_ERR (cmd); + goto out_put; + } + + rem = src->size; + src_offset = src->node.start; + dst_offset = dst->node.start; + +do { +u32 size =min_t (u64, rem, block_size); + +GEM_BUG_ON (size >>PAGE_SHIFT >S16_MAX ); + +if (INTEL_GEN (i915) >=9 ) { + *cmd++ =GEN9_XY_FAST_COPY_BLT_CMD | (10 -2 ); + *cmd++ =BLT_DEPTH_32 |PAGE_SIZE ; + *cmd++ =0 ; + *cmd++ = size >>PAGE_SHIFT <<16 |PAGE_SIZE /4 ; + *cmd++ =lower_32_bits (dst_offset); + *cmd++ =upper_32_bits (dst_offset); + *cmd++ =0 ; + *cmd++ =PAGE_SIZE ; + *cmd++ =lower_32_bits (src_offset); + *cmd++ =upper_32_bits (src_offset); + }else if (INTEL_GEN (i915) >=8 ) { + *cmd++ =XY_SRC_COPY_BLT_CMD |BLT_WRITE_RGBA | (10 -2 ); + *cmd++ =BLT_DEPTH_32 |BLT_ROP_SRC_COPY |PAGE_SIZE ; + *cmd++ =0 ; + *cmd++ = size >>PAGE_SHIFT <<16 |PAGE_SIZE /4 ; + *cmd++ =lower_32_bits (dst_offset); + *cmd++ =upper_32_bits (dst_offset); + *cmd++ =0 ; + *cmd++ =PAGE_SIZE ; + *cmd++ =lower_32_bits (src_offset); + *cmd++ =upper_32_bits (src_offset); + }else { + *cmd++ =SRC_COPY_BLT_CMD |BLT_WRITE_RGBA | (6 -2 ); + *cmd++ =BLT_DEPTH_32 |BLT_ROP_SRC_COPY |PAGE_SIZE ; + *cmd++ = size >>PAGE_SHIFT <<16 |PAGE_SIZE ; + *cmd++ = dst_offset; + *cmd++ =PAGE_SIZE ; + *cmd++ = src_offset; + } + +/* Allow ourselves to be preempted in between blocks. */ + *cmd++ =MI_ARB_CHECK ; + + src_offset += size; + dst_offset += size; + rem -= size; + }while (rem); + + *cmd =MI_BATCH_BUFFER_END ; +intel_gt_chipset_flush (ce->vm->gt); + +i915_gem_object_unpin_map (pool->obj); + + batch =i915_vma_instance (pool->obj, ce->vm,NULL ); +if (IS_ERR (batch)) { + err =PTR_ERR (batch); + goto out_put; + } + + err =i915_vma_pin (batch,0 ,0 ,PIN_USER ); +if (unlikely (err)) + goto out_put; + + *p = pool; +return batch; + +out_put: +intel_engine_pool_put (pool); +return ERR_PTR (err); +} + +int i915_gem_object_copy_blt (struct drm_i915_gem_object *src, +struct drm_i915_gem_object *dst, +struct intel_context *ce) +{ +struct drm_gem_object *objs[] = { &src->base, &dst->base }; +struct i915_address_space *vm = ce->vm; +struct intel_engine_pool_node *pool; +struct ww_acquire_ctx acquire; +struct i915_vma *vma_src, *vma_dst; +struct i915_vma *batch; +struct i915_request *rq; +int err; + + vma_src =i915_vma_instance (src, vm,NULL ); +if (IS_ERR (vma_src)) +return PTR_ERR (vma_src); + + err =i915_vma_pin (vma_src,0 ,0 ,PIN_USER ); +if (unlikely (err)) +return err; + + vma_dst =i915_vma_instance (dst, vm,NULL ); +if (IS_ERR (vma_dst)) + goto out_unpin_src; + + err =i915_vma_pin (vma_dst,0 ,0 ,PIN_USER ); +if (unlikely (err)) + goto out_unpin_src; + +intel_engine_pm_get (ce->engine); + batch =intel_emit_vma_copy_blt (&pool, ce, vma_src, vma_dst); +if (IS_ERR (batch)) { + err =PTR_ERR (batch); + goto out_unpin_dst; + } + + rq =intel_context_create_request (ce); +if (IS_ERR (rq)) { + err =PTR_ERR (rq); + goto out_batch; + } + +i915_vma_lock (batch); + err =i915_vma_move_to_active (batch, rq,0 ); +i915_vma_unlock (batch); +if (unlikely (err)) + goto out_request; + + err =intel_engine_pool_mark_active (pool, rq); +if (unlikely (err)) + goto out_request; + + err =drm_gem_lock_reservations (objs,ARRAY_SIZE (objs), &acquire); +if (unlikely (err)) + goto out_request; + +if (src->cache_dirty & ~src->cache_coherent) +i915_gem_clflush_object (src,0 ); + +if (dst->cache_dirty & ~dst->cache_coherent) +i915_gem_clflush_object (dst,0 ); + + err =i915_request_await_object (rq, src, false); +if (unlikely (err)) + goto out_unlock; + + err =i915_vma_move_to_active (vma_src, rq,0 ); +if (unlikely (err)) + goto out_unlock; + + err =i915_request_await_object (rq, dst, true); +if (unlikely (err)) + goto out_unlock; + + err =i915_vma_move_to_active (vma_dst, rq,EXEC_OBJECT_WRITE ); +if (unlikely (err)) + goto out_unlock; + +if (ce->engine->emit_init_breadcrumb) { + err = ce->engine->emit_init_breadcrumb (rq); +if (unlikely (err)) + goto out_unlock; + } + + err = ce->engine->emit_bb_start (rq, + batch->node.start, batch->node.size, +0 ); +out_unlock: +drm_gem_unlock_reservations (objs,ARRAY_SIZE (objs), &acquire); +out_request: +if (unlikely (err)) +i915_request_skip (rq, err); + +i915_request_add (rq); +out_batch: +i915_vma_unpin (batch); +intel_engine_pool_put (pool); +out_unpin_dst: +i915_vma_unpin (vma_dst); +intel_engine_pm_put (ce->engine); +out_unpin_src: +i915_vma_unpin (vma_src); +return err; +} +#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST )#include "selftests/i915_gem_object_blt.c" #endif
drivers/gpu/drm/i915/gem/i915_gem_object_blt.h +9 -0
@@ -22,4 +22,13 @@ int i915_gem_object_fill_blt(struct drm_i915_gem_object *obj,struct intel_context *ce, u32 value); +struct i915_vma *intel_emit_vma_copy_blt (struct intel_engine_pool_node **p, +struct intel_context *ce, +struct i915_vma *src, +struct i915_vma *dst); + +int i915_gem_object_copy_blt (struct drm_i915_gem_object *src, +struct drm_i915_gem_object *dst, +struct intel_context *ce); +#endif
drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c +106 -0
116 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_gpu_commands.h +3 -2
@@ -188,8 +188,9 @@#define COLOR_BLT_CMD (2<<29 | 0x40<<22 | (5-2))#define XY_COLOR_BLT_CMD (2 << 29 | 0x50 << 22) -#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)|4) -#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22)|6) +#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22)) +#define GEN9_XY_FAST_COPY_BLT_CMD ((2<<29)|(0x42<<22)) +#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22))#define XY_MONO_SRC_COPY_IMM_BLT ((2<<29)|(0x71<<22)|5)#define BLT_WRITE_A (2<<20)#define BLT_WRITE_RGB (1<<20)
drivers/gpu/drm/i915/gt/intel_ringbuffer.c +1 -1
@@ -1136,7 +1136,7 @@ i830_emit_bb_start(struct i915_request *rq,* stable batch scratch bo area (so that the CS never * stumbles over its tlb invalidation bug) ... */ - *cs++ =SRC_COPY_BLT_CMD |BLT_WRITE_RGBA ; + *cs++ =SRC_COPY_BLT_CMD |BLT_WRITE_RGBA | (6 -2 ); *cs++ =BLT_DEPTH_32 |BLT_ROP_SRC_COPY |4096 ; *cs++ =DIV_ROUND_UP (len,4096 ) <<16 |4096 ; *cs++ = cs_offset;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 12/37] drm/i915/blt: support copying objects
Quoting Matthew Auld (2019-08-09 23:26:18)
Quoted 169 lines
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +169
-0+struct i915_vma *intel_emit_vma_copy_blt (struct intel_engine_pool_node **p, +struct intel_context *ce, +struct i915_vma *src, +struct i915_vma *dst) +{ +struct drm_i915_private *i915 = ce->vm->i915; +const u32 block_size =S16_MAX *PAGE_SIZE ; +struct intel_engine_pool_node *pool; +struct i915_vma *batch; +u64 src_offset, dst_offset; +u64 count; +u64 rem; +u32 size; +u32 *cmd; +int err; + +GEM_BUG_ON (src->size != dst->size); + + count =div_u64 (dst->size, block_size); + size = (1 +11 * count) *sizeof (u32); + size =round_up (size,PAGE_SIZE ); + pool =intel_engine_pool_get (&ce->engine->pool, size); +if (IS_ERR (pool)) +return ERR_CAST (pool); + + cmd =i915_gem_object_pin_map (pool->obj,I915_MAP_WC ); +if (IS_ERR (cmd)) { + err =PTR_ERR (cmd); + goto out_put; + } + + rem = src->size; + src_offset = src->node.start; + dst_offset = dst->node.start; + +do { +u32 size =min_t (u64, rem, block_size); + +GEM_BUG_ON (size >>PAGE_SHIFT >S16_MAX ); + +if (INTEL_GEN (i915) >=9 ) { + *cmd++ =GEN9_XY_FAST_COPY_BLT_CMD | (10 -2 ); + *cmd++ =BLT_DEPTH_32 |PAGE_SIZE ; + *cmd++ =0 ; + *cmd++ = size >>PAGE_SHIFT <<16 |PAGE_SIZE /4 ; + *cmd++ =lower_32_bits (dst_offset); + *cmd++ =upper_32_bits (dst_offset); + *cmd++ =0 ; + *cmd++ =PAGE_SIZE ; + *cmd++ =lower_32_bits (src_offset); + *cmd++ =upper_32_bits (src_offset); + }else if (INTEL_GEN (i915) >=8 ) { + *cmd++ =XY_SRC_COPY_BLT_CMD |BLT_WRITE_RGBA | (10 -2 ); + *cmd++ =BLT_DEPTH_32 |BLT_ROP_SRC_COPY |PAGE_SIZE ; + *cmd++ =0 ; + *cmd++ = size >>PAGE_SHIFT <<16 |PAGE_SIZE /4 ; + *cmd++ =lower_32_bits (dst_offset); + *cmd++ =upper_32_bits (dst_offset); + *cmd++ =0 ; + *cmd++ =PAGE_SIZE ; + *cmd++ =lower_32_bits (src_offset); + *cmd++ =upper_32_bits (src_offset); + }else { + *cmd++ =SRC_COPY_BLT_CMD |BLT_WRITE_RGBA | (6 -2 ); + *cmd++ =BLT_DEPTH_32 |BLT_ROP_SRC_COPY |PAGE_SIZE ; + *cmd++ = size >>PAGE_SHIFT <<16 |PAGE_SIZE ; + *cmd++ = dst_offset; + *cmd++ =PAGE_SIZE ; + *cmd++ = src_offset; + } + +/* Allow ourselves to be preempted in between blocks. */ + *cmd++ =MI_ARB_CHECK ; + + src_offset += size; + dst_offset += size; + rem -= size; + }while (rem); + + *cmd =MI_BATCH_BUFFER_END ; +intel_gt_chipset_flush (ce->vm->gt); + +i915_gem_object_unpin_map (pool->obj); + + batch =i915_vma_instance (pool->obj, ce->vm,NULL ); +if (IS_ERR (batch)) { + err =PTR_ERR (batch); + goto out_put; + } + + err =i915_vma_pin (batch,0 ,0 ,PIN_USER ); +if (unlikely (err)) + goto out_put; + + *p = pool; +return batch; + +out_put: +intel_engine_pool_put (pool); +return ERR_PTR (err); +} + +int i915_gem_object_copy_blt (struct drm_i915_gem_object *src, +struct drm_i915_gem_object *dst, +struct intel_context *ce) +{ +struct drm_gem_object *objs[] = { &src->base, &dst->base }; +struct i915_address_space *vm = ce->vm; +struct intel_engine_pool_node *pool; +struct ww_acquire_ctx acquire; +struct i915_vma *vma_src, *vma_dst; +struct i915_vma *batch; +struct i915_request *rq; +int err; + + vma_src =i915_vma_instance (src, vm,NULL ); +if (IS_ERR (vma_src)) +return PTR_ERR (vma_src); + + err =i915_vma_pin (vma_src,0 ,0 ,PIN_USER ); +if (unlikely (err)) +return err; + + vma_dst =i915_vma_instance (dst, vm,NULL ); +if (IS_ERR (vma_dst)) + goto out_unpin_src; + + err =i915_vma_pin (vma_dst,0 ,0 ,PIN_USER ); +if (unlikely (err)) + goto out_unpin_src; + +intel_engine_pm_get (ce->engine); + batch =intel_emit_vma_copy_blt (&pool, ce, vma_src, vma_dst); +if (IS_ERR (batch)) { + err =PTR_ERR (batch); + goto out_unpin_dst; + } + + rq =intel_context_create_request (ce); +if (IS_ERR (rq)) { + err =PTR_ERR (rq); + goto out_batch; + } + +i915_vma_lock (batch); + err =i915_vma_move_to_active (batch, rq,0 ); +i915_vma_unlock (batch); +if (unlikely (err)) + goto out_request; + + err =intel_engine_pool_mark_active (pool, rq); +if (unlikely (err)) + goto out_request; + + err =drm_gem_lock_reservations (objs,ARRAY_SIZE (objs), &acquire); +if (unlikely (err)) + goto out_request; + +if (src->cache_dirty & ~src->cache_coherent) +i915_gem_clflush_object (src,0 ); + +if (dst->cache_dirty & ~dst->cache_coherent) +i915_gem_clflush_object (dst,0 ); + + err =i915_request_await_object (rq, src, false); +if (unlikely (err)) + goto out_unlock; + + err =i915_vma_move_to_active (vma_src, rq,0 );
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c int i915_gem_object_fill_blt(struct drm_i915_gem_object *obj, · line 356
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +10
-0+if (unlikely (err)) + goto out_unlock; + + err =i915_request_await_object (rq, dst, true); +if (unlikely (err)) + goto out_unlock; + + err =i915_vma_move_to_active (vma_dst, rq,EXEC_OBJECT_WRITE ); +if (unlikely (err)) + goto out_unlock;
Strictly, wait on all objects, then setup all signals. Avoids any nasty cycles in the dependency graphs. Such as if someone passed in src = dst. Time for another selftest ;)
for (i = 0; i < ARRAY_SIZE(obj); i++) {
clflush_object(obj[i]);
await_object(rq, obj[i]);
}for (i = 0; i < ARRAY_SIZE(obj); i++)
move_to_active(obj[i]);
Quoted 17 lines
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +17
-0+ +if (ce->engine->emit_init_breadcrumb) { + err = ce->engine->emit_init_breadcrumb (rq); +if (unlikely (err)) + goto out_unlock; + } + + err = ce->engine->emit_bb_start (rq, + batch->node.start, batch->node.size, +0 ); +out_unlock: +drm_gem_unlock_reservations (objs,ARRAY_SIZE (objs), &acquire); +out_request: +if (unlikely (err)) +i915_request_skip (rq, err); + +i915_request_add (rq);
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c int i915_gem_object_fill_blt(struct drm_i915_gem_object *obj, · line 383
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +10
-0+out_batch: +i915_vma_unpin (batch); +intel_engine_pool_put (pool); +out_unpin_dst: +i915_vma_unpin (vma_dst); +intel_engine_pm_put (ce->engine); +out_unpin_src: +i915_vma_unpin (vma_src); +return err; +}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 13/37 drm/i915/selftests: move gpu-write-dw into utils
In reply to Matthew AuldUsing the gpu to write to some dword over a number of pages is rather useful, and we already have two copies of such a thing, and we don't want a third so move it to utils. There is probably some other stuff also...
--- .../gpu/drm/i915/gem/selftests/huge_pages.c | 120 ++-------------- .../drm/i915/gem/selftests/i915_gem_context.c | 134 ++--------------- .../drm/i915/gem/selftests/igt_gem_utils.c | 135 ++++++++++++++++++ .../drm/i915/gem/selftests/igt_gem_utils.h | 16 +++ 4 files changed, 169 insertions(+), 236 deletions(-)
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +8 -112
@@ -952,126 +952,22 @@ static int igt_mock_ppgtt_64K(void *arg)return err; } -static struct i915_vma * -gpu_write_dw (struct i915_vma *vma,u64 offset,u32 val) -{ -struct drm_i915_private *i915 = vma->vm->i915; -const int gen =INTEL_GEN (i915); -unsigned int count = vma->size >>PAGE_SHIFT ; -struct drm_i915_gem_object *obj; -struct i915_vma *batch; -unsigned int size; -u32 *cmd; -int n; -int err; - - size = (1 +4 * count) *sizeof (u32); - size =round_up (size,PAGE_SIZE ); - obj =i915_gem_object_create_internal (i915, size); -if (IS_ERR (obj)) -return ERR_CAST (obj); - - cmd =i915_gem_object_pin_map (obj,I915_MAP_WC ); -if (IS_ERR (cmd)) { - err =PTR_ERR (cmd); - goto err; - } - - offset += vma->node.start; - -for (n =0 ; n < count; n++) { -if (gen >=8 ) { - *cmd++ =MI_STORE_DWORD_IMM_GEN4 ; - *cmd++ =lower_32_bits (offset); - *cmd++ =upper_32_bits (offset); - *cmd++ = val; - }else if (gen >=4 ) { - *cmd++ =MI_STORE_DWORD_IMM_GEN4 | - (gen <6 ?MI_USE_GGTT :0 ); - *cmd++ =0 ; - *cmd++ = offset; - *cmd++ = val; - }else { - *cmd++ =MI_STORE_DWORD_IMM |MI_MEM_VIRTUAL ; - *cmd++ = offset; - *cmd++ = val; - } - - offset +=PAGE_SIZE ; - } - - *cmd =MI_BATCH_BUFFER_END ; -intel_gt_chipset_flush (vma->vm->gt); - -i915_gem_object_unpin_map (obj); - - batch =i915_vma_instance (obj, vma->vm,NULL ); -if (IS_ERR (batch)) { - err =PTR_ERR (batch); - goto err; - } - - err =i915_vma_pin (batch,0 ,0 ,PIN_USER ); -if (err) - goto err; - -return batch; - -err: -i915_gem_object_put (obj); - -return ERR_PTR (err); -} -static int gpu_write (struct i915_vma *vma,struct i915_gem_context *ctx,struct intel_engine_cs *engine, -u32 dword, -u32 value) +u32 dw, +u32 val) { -struct i915_request *rq; -struct i915_vma *batch;int err; -GEM_BUG_ON (!intel_engine_can_store_dword (engine)); - - batch =gpu_write_dw (vma, dword *sizeof (u32), value); -if (IS_ERR (batch)) -return PTR_ERR (batch); - - rq =igt_request_alloc (ctx, engine); -if (IS_ERR (rq)) { - err =PTR_ERR (rq); - goto err_batch; - } - -i915_vma_lock (batch); - err =i915_vma_move_to_active (batch, rq,0 ); -i915_vma_unlock (batch); -if (err) - goto err_request; - -i915_vma_lock (vma); - err =i915_gem_object_set_to_gtt_domain (vma->obj, false); -if (err ==0 ) - err =i915_vma_move_to_active (vma, rq,EXEC_OBJECT_WRITE ); -i915_vma_unlock (vma); +i915_gem_object_lock (vma->obj); + err =i915_gem_object_set_to_gtt_domain (vma->obj, true); +i915_gem_object_unlock (vma->obj);if (err) - goto err_request; - - err = engine->emit_bb_start (rq, - batch->node.start, batch->node.size, -0 ); -err_request: -if (err) -i915_request_skip (rq, err); -i915_request_add (rq); -err_batch: -i915_vma_unpin (batch); -i915_vma_close (batch); -i915_vma_put (batch); +return err; -return err; +return igt_gpu_fill_dw (vma, ctx, engine, dw *sizeof (u32), + vma->size >>PAGE_SHIFT , val); }static int cpu_check (struct drm_i915_gem_object *obj,u32 dword,u32 val)
drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c +10 -124
167 lines not on this page · raw message
drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c +135 -0
144 lines not on this page · raw message
drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h +16 -0
@@ -7,11 +7,27 @@#ifndef __IGT_GEM_UTILS_H__#define __IGT_GEM_UTILS_H__ +#include <linux/types.h> +struct i915_request ;struct i915_gem_context ;struct intel_engine_cs ; +struct i915_vma ;struct i915_request *igt_request_alloc (struct i915_gem_context *ctx,struct intel_engine_cs *engine); +struct i915_vma * +igt_emit_store_dw (struct i915_vma *vma, +u64 offset, +unsigned long count, +u32 val); + +int igt_gpu_fill_dw (struct i915_vma *vma, +struct i915_gem_context *ctx, +struct intel_engine_cs *engine, +u64 offset, +unsigned long count, +u32 val); +#endif /* __IGT_GEM_UTILS_H__ */
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 13/37] drm/i915/selftests: move gpu-write-dw into utils
Quoting Matthew Auld (2019-08-09 23:26:19)
Quoted 6 lines
Using the gpu to write to some dword over a number of pages is rather useful, and we already have two copies of such a thing, and we don't want a third so move it to utils. There is probably some other stuff also...
Signed-off-by Matthew Auld <[email protected]>
-Chris
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 14/37 drm/i915/selftests: add write-dword test for LMEM
In reply to Matthew AuldSimple test writing to dwords across an object, using various engines in a randomized order, checking that our writes land from the cpu.
--- .../drm/i915/selftests/intel_memory_region.c | 179 ++++++++++++++++++ 1 file changed, 179 insertions(+)
drivers/gpu/drm/i915/selftests/intel_memory_region.c +179 -0
@@ -7,6 +7,7 @@#include "../i915_selftest.h" +#include "mock_drm.h" #include "mock_gem_device.h" #include "mock_region.h"
@@ -14,9 +15,11 @@#include "gem/i915_gem_lmem.h" #include "gem/i915_gem_region.h" #include "gem/i915_gem_object_blt.h" +#include "gem/selftests/igt_gem_utils.h" #include "gem/selftests/mock_context.h" #include "gt/intel_gt.h" #include "selftests/igt_flush_test.h" +#include "selftests/i915_random.h" static void close_objects (struct list_head *objects) {
@@ -354,6 +357,128 @@ static int igt_mock_volatile(void *arg)return err; } +static int igt_gpu_write_dw (struct i915_vma *vma, +struct i915_gem_context *ctx, +struct intel_engine_cs *engine, +u32 dword, +u32 value) +{ +int err; + +i915_gem_object_lock (vma->obj); + err =i915_gem_object_set_to_gtt_domain (vma->obj, true); +i915_gem_object_unlock (vma->obj); +if (err) +return err; + +return igt_gpu_fill_dw (vma, ctx, engine, dword *sizeof (u32), + vma->size >>PAGE_SHIFT , value); +} + +static int igt_cpu_check (struct drm_i915_gem_object *obj,u32 dword,u32 val) +{ +unsigned long n; +int err; + +i915_gem_object_lock (obj); + err =i915_gem_object_set_to_wc_domain (obj, false); +i915_gem_object_unlock (obj); +if (err) +return err; + + err =i915_gem_object_pin_pages (obj); +if (err) +return err; + +for (n =0 ; n < obj->base.size >>PAGE_SHIFT ; ++n) { +u32 __iomem *base; +u32 read_val; + + base =i915_gem_object_lmem_io_map_page_atomic (obj, n); + + read_val =ioread32 (base + dword); +io_mapping_unmap_atomic (base); +if (read_val != val) { +pr_err ("n=%lu base[%u]=%u, val=%u\n" , + n, dword, read_val, val); + err = -EINVAL ; +break ; + } + } + +i915_gem_object_unpin_pages (obj); +return err; +} + +static int igt_gpu_write (struct i915_gem_context *ctx, +struct drm_i915_gem_object *obj) +{ +struct drm_i915_private *i915 = ctx->i915; +struct i915_address_space *vm = ctx->vm ?: &i915->ggtt.vm; +static struct intel_engine_cs *engines[I915_NUM_ENGINES ]; +struct intel_engine_cs *engine; +IGT_TIMEOUT (end_time); +I915_RND_STATE (prng); +struct i915_vma *vma; +unsigned int id; +int *order; +int i, n; +int err; + + n =0 ; +for_each_engine (engine, i915, id) { +if (!intel_engine_can_store_dword (engine)) { +pr_info ("store-dword-imm not supported on engine=%u\n" , + id); +continue ; + } + engines[n++] = engine; + } + +if (!n) +return 0 ; + + order =i915_random_order (n *I915_NUM_ENGINES , &prng); +if (!order) +return -ENOMEM ; + + vma =i915_vma_instance (obj, vm,NULL ); +if (IS_ERR (vma)) { + err =PTR_ERR (vma); + goto out_free; + } + + err =i915_vma_pin (vma,0 ,0 ,PIN_USER ); +if (err) + goto out_free; + + i =0 ; +do { +u32 rng =prandom_u32_state (&prng); +u32 dword =offset_in_page (rng) /4 ; + + engine = engines[order[i] % n]; + i = (i +1 ) % (n *I915_NUM_ENGINES ); + + err =igt_gpu_write_dw (vma, ctx, engine, dword, rng); +if (err) +break ; + + err =igt_cpu_check (obj, dword, rng); +if (err) +break ; + }while (!__igt_timeout (end_time,NULL )); + +i915_vma_unpin (vma); +out_free: +kfree (order); + +if (err == -ENOMEM ) + err =0 ; + +return err; +} +static int igt_lmem_create (void *arg) {struct drm_i915_private *i915 = arg;
@@ -375,6 +500,59 @@ static int igt_lmem_create(void *arg)return err; } +static int igt_lmem_write_gpu (void *arg) +{ +struct drm_i915_private *i915 = arg; +struct drm_i915_gem_object *obj; +struct i915_gem_context *ctx; +struct drm_file *file; +I915_RND_STATE (prng); +u32 sz; +int err; + +mutex_unlock (&i915->drm.struct_mutex); + file =mock_file (i915); +mutex_lock (&i915->drm.struct_mutex); +if (IS_ERR (file)) +return PTR_ERR (file); + + ctx =live_context (i915, file); +if (IS_ERR (ctx)) { + err =PTR_ERR (ctx); + goto out_file; + } + +/* +* XXX: Nothing too big for now; we don't want to upset CI. What we +* really want is the huge dma stuff for device memory, then we can go +* to town... +*/ + sz =round_up (prandom_u32_state (&prng) %SZ_32M ,PAGE_SIZE ); + + obj =i915_gem_object_create_lmem (i915, sz,0 ); +if (IS_ERR (obj)) { + err =PTR_ERR (obj); + goto out_file; + } + + err =i915_gem_object_pin_pages (obj); +if (err) + goto out_put; + + err =igt_gpu_write (ctx, obj); +if (err) +pr_err ("igt_gpu_write failed(%d)\n" , err); + +i915_gem_object_unpin_pages (obj); +out_put: +i915_gem_object_put (obj); +out_file: +mutex_unlock (&i915->drm.struct_mutex); +mock_file_free (i915, file); +mutex_lock (&i915->drm.struct_mutex); +return err; +} +static int igt_lmem_write_cpu (void *arg) {struct drm_i915_private *i915 = arg;
@@ -490,6 +668,7 @@ int intel_memory_region_live_selftests(struct drm_i915_private *i915)static const struct i915_subtest tests[] = {SUBTEST (igt_lmem_create),SUBTEST (igt_lmem_write_cpu), +SUBTEST (igt_lmem_write_gpu), };int err;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 15/37 drm/i915/selftest: extend coverage to include LMEM huge-pages
In reply to Matthew Auld--- .../gpu/drm/i915/gem/selftests/huge_pages.c | 121 +++++++++++++++++- 1 file changed, 120 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +120 -1
@@ -9,6 +9,7 @@#include "i915_selftest.h" #include "gem/i915_gem_region.h" +#include "gem/i915_gem_lmem.h" #include "gem/i915_gem_pm.h" #include "gt/intel_gt.h"
@@ -970,7 +971,7 @@ static int gpu_write(struct i915_vma *vma, vma->size >> PAGE_SHIFT, val); } -static int cpu_check (struct drm_i915_gem_object *obj,u32 dword,u32 val) +static int __cpu_check_shmem (struct drm_i915_gem_object *obj,u32 dword,u32 val) {unsigned int needs_flush;unsigned long n;
@@ -1002,6 +1003,51 @@ static int cpu_check(struct drm_i915_gem_object *obj, u32 dword, u32 val)return err; } +static int __cpu_check_lmem (struct drm_i915_gem_object *obj,u32 dword,u32 val) +{ +unsigned long n; +int err; + +i915_gem_object_lock (obj); + err =i915_gem_object_set_to_wc_domain (obj, false); +i915_gem_object_unlock (obj); +if (err) +return err; + + err =i915_gem_object_pin_pages (obj); +if (err) +return err; + +for (n =0 ; n < obj->base.size >>PAGE_SHIFT ; ++n) { +u32 __iomem *base; +u32 read_val; + + base =i915_gem_object_lmem_io_map_page_atomic (obj, n); + + read_val =ioread32 (base + dword); +io_mapping_unmap_atomic (base); +if (read_val != val) { +pr_err ("n=%lu base[%u]=%u, val=%u\n" , + n, dword, read_val, val); + err = -EINVAL ; +break ; + } + } + +i915_gem_object_unpin_pages (obj); +return err; +} + +static int cpu_check (struct drm_i915_gem_object *obj,u32 dword,u32 val) +{ +if (i915_gem_object_has_struct_page (obj)) +return __cpu_check_shmem (obj, dword, val); +else if (i915_gem_object_is_lmem (obj)) +return __cpu_check_lmem (obj, dword, val); + +return -ENODEV ; +} + static int __igt_write_huge(struct i915_gem_context *ctx, struct intel_engine_cs *engine, struct drm_i915_gem_object *obj,
@@ -1382,6 +1428,78 @@ static int igt_ppgtt_gemfs_huge(void *arg)return err; } +static int igt_ppgtt_lmem_huge (void *arg) +{ +struct i915_gem_context *ctx = arg; +struct drm_i915_private *i915 = ctx->i915; +struct drm_i915_gem_object *obj; +static const unsigned int sizes[] = { +SZ_64K , +SZ_512K , +SZ_1M , +SZ_2M , + }; +int i; +int err; + +if (!HAS_LMEM (i915)) { +pr_info ("device lacks LMEM support, skipping\n" ); +return 0 ; + } + +/* +* Sanity check that the HW uses huge pages correctly through LMEM +* -- ensure that our writes land in the right place. +*/ + +for (i =0 ; i <ARRAY_SIZE (sizes); ++i) { +unsigned int size = sizes[i]; + + obj =i915_gem_object_create_lmem (i915, size,I915_BO_ALLOC_CONTIGUOUS ); +if (IS_ERR (obj)) { + err =PTR_ERR (obj); +if (err == -E2BIG ) { +pr_info ("object too big for region!\n" ); +return 0 ; + } + +return err; + } + + err =i915_gem_object_pin_pages (obj); +if (err) + goto out_put; + +if (obj->mm.page_sizes.phys <I915_GTT_PAGE_SIZE_64K ) { +pr_info ("LMEM unable to allocate huge-page(s) with size=%u\n" , + size); + goto out_unpin; + } + + err =igt_write_huge (ctx, obj); +if (err) { +pr_err ("LMEM write-huge failed with size=%u\n" , size); + goto out_unpin; + } + +i915_gem_object_unpin_pages (obj); +__i915_gem_object_put_pages (obj,I915_MM_NORMAL ); +i915_gem_object_put (obj); + } + +return 0 ; + +out_unpin: +i915_gem_object_unpin_pages (obj); +out_put: +i915_gem_object_put (obj); + +if (err == -ENOMEM ) + err =0 ; + +return err; +} +static int igt_ppgtt_pin_update (void *arg) {struct i915_gem_context *ctx = arg;
@@ -1732,6 +1850,7 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *i915)SUBTEST (igt_ppgtt_exhaust_huge),SUBTEST (igt_ppgtt_gemfs_huge),SUBTEST (igt_ppgtt_internal_huge), + SUBTEST(igt_ppgtt_lmem_huge), };struct drm_file *file;struct i915_gem_context *ctx;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 16/37 drm/i915/lmem: support CPU relocations
In reply to Matthew AuldAdd LMEM support for the CPU reloc path. When doing relocations we have both a GPU and CPU reloc path, as well as some debugging options to force a particular path. The GPU reloc path is preferred when the object is not currently idle, otherwise we use the CPU reloc path. Since we can't kmap the object, and the mappable aperture might not be available, add support for mapping it through LMEMBAR.
--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 55 +++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +51 -4
@@ -15,6 +15,7 @@#include "display/intel_frontbuffer.h" #include "gem/i915_gem_ioctls.h" +#include "gem/i915_gem_lmem.h" #include "gt/intel_context.h" #include "gt/intel_engine_pool.h" #include "gt/intel_gt.h"
@@ -251,6 +252,7 @@ struct i915_execbuffer { bool has_llc : 1; bool has_fence : 1; bool needs_unfenced : 1; + bool is_lmem : 1;struct i915_request *rq;u32 *rq_cmd;
@@ -959,6 +961,7 @@ static void reloc_cache_init(struct reloc_cache *cache, cache->use_64bit_reloc =HAS_64BIT_RELOC (i915); cache->has_fence = cache->gen <4 ; cache->needs_unfenced =INTEL_INFO (i915)->unfenced_needs_alignment; + cache->is_lmem = false; cache->node.allocated = false; cache->rq =NULL ; cache->rq_size =0 ;
@@ -1017,10 +1020,14 @@ static void reloc_cache_reset(struct reloc_cache *cache) }else {struct i915_ggtt *ggtt =cache_to_ggtt (cache); -intel_gt_flush_ggtt_writes (ggtt->vm.gt); +if (!cache->is_lmem) +intel_gt_flush_ggtt_writes (ggtt->vm.gt);io_mapping_unmap_atomic ((void __iomem *)vaddr); -if (cache->node.allocated) { +if (cache->is_lmem) { +i915_gem_object_unpin_pages ((struct drm_i915_gem_object *)cache->node.mm); + cache->is_lmem = false; + }else if (cache->node.allocated) { ggtt->vm.clear_range (&ggtt->vm, cache->node.start, cache->node.size);
@@ -1066,6 +1073,42 @@ static void *reloc_kmap(struct drm_i915_gem_object *obj,return vaddr; } +static void *reloc_lmem (struct drm_i915_gem_object *obj, +struct reloc_cache *cache, +unsigned long page) +{ +void *vaddr; +int err; + +GEM_BUG_ON (use_cpu_reloc (cache, obj)); + +if (cache->vaddr) { +io_mapping_unmap_atomic ((void __force __iomem *)unmask_page (cache->vaddr)); + }else { + err =i915_gem_object_pin_pages (obj); +if (err) +return ERR_PTR (err); + +i915_gem_object_lock (obj); + err =i915_gem_object_set_to_wc_domain (obj, true); +i915_gem_object_unlock (obj); +if (err) { +i915_gem_object_unpin_pages (obj); +return ERR_PTR (err); + } + + cache->node.mm = (void *)obj; + cache->is_lmem = true; + } + + vaddr =i915_gem_object_lmem_io_map_page_atomic (obj, page); + + cache->vaddr = (unsigned long )vaddr; + cache->page = page; + +return vaddr; +} +static void *reloc_iomap (struct drm_i915_gem_object *obj,struct reloc_cache *cache,unsigned long page)
@@ -1142,8 +1185,12 @@ static void *reloc_vaddr(struct drm_i915_gem_object *obj, vaddr =unmask_page (cache->vaddr); }else { vaddr =NULL ; -if ((cache->vaddr &KMAP ) ==0 ) - vaddr =reloc_iomap (obj, cache, page); +if ((cache->vaddr &KMAP ) ==0 ) { +if (i915_gem_object_is_lmem (obj)) + vaddr =reloc_lmem (obj, cache, page); +else + vaddr =reloc_iomap (obj, cache, page); + }if (!vaddr) vaddr =reloc_kmap (obj, cache, page); }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 16/37] drm/i915/lmem: support CPU relocations
Quoting Matthew Auld (2019-08-09 23:26:22)
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c static void reloc_cache_reset(struct reloc_cache *cache) · line 1024
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +2
-1@@ -1017,10 +1020,14 @@ static void reloc_cache_reset(struct reloc_cache *cache) }else {struct i915_ggtt *ggtt =cache_to_ggtt (cache); -intel_gt_flush_ggtt_writes (ggtt->vm.gt); +if (!cache->is_lmem) +intel_gt_flush_ggtt_writes (ggtt->vm.gt);
I love an optimist. At the least you might need the wmb(). But we have yet to see how many mistakes they've carried over into the new implementation ;)
-Chris
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 17/37 drm/i915/lmem: support pread
In reply to Matthew AuldWe need to add support for pread'ing an LMEM object.
--- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 88 +++++++++++++++++++ .../gpu/drm/i915/gem/i915_gem_object_types.h | 2 + drivers/gpu/drm/i915/i915_gem.c | 6 ++ 3 files changed, 96 insertions(+)
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +88 -0
@@ -8,12 +8,100 @@#include "gem/i915_gem_lmem.h" #include "i915_drv.h" +static int lmem_pread (struct drm_i915_gem_object *obj, +const struct drm_i915_gem_pread *arg) +{ +struct drm_i915_private *i915 =to_i915 (obj->base.dev); +struct intel_runtime_pm *rpm = &i915->runtime_pm; +intel_wakeref_t wakeref; +struct dma_fence *fence; +char __user *user_data; +unsigned int offset; +unsigned long idx; +u64 remain; +int ret; + + ret =i915_gem_object_wait (obj, +I915_WAIT_INTERRUPTIBLE , +MAX_SCHEDULE_TIMEOUT ); +if (ret) +return ret; + + ret =i915_gem_object_pin_pages (obj); +if (ret) +return ret; + +i915_gem_object_lock (obj); + ret =i915_gem_object_set_to_wc_domain (obj, false); +if (ret) { +i915_gem_object_unlock (obj); + goto out_unpin; + } + + fence =i915_gem_object_lock_fence (obj); +i915_gem_object_unlock (obj); +if (!fence) { + ret = -ENOMEM ; + goto out_unpin; + } + + wakeref =intel_runtime_pm_get (rpm); + + remain = arg->size; + user_data =u64_to_user_ptr (arg->data_ptr); + offset =offset_in_page (arg->offset); +for (idx = arg->offset >>PAGE_SHIFT ; remain; idx++) { +unsigned long unwritten; +void __iomem *vaddr; +int length; + + length = remain; +if (offset + length >PAGE_SIZE ) + length =PAGE_SIZE - offset; + + vaddr =i915_gem_object_lmem_io_map_page_atomic (obj, idx); +if (!vaddr) { + ret = -ENOMEM ; + goto out_put; + } + unwritten =__copy_to_user_inatomic (user_data, + (void __force *)vaddr + offset, + length); +io_mapping_unmap_atomic (vaddr); +if (unwritten) { + vaddr =i915_gem_object_lmem_io_map_page (obj, idx); + unwritten =copy_to_user (user_data, + (void __force *)vaddr + offset, + length); +io_mapping_unmap (vaddr); + } +if (unwritten) { + ret = -EFAULT ; + goto out_put; + } + + remain -= length; + user_data += length; + offset =0 ; + } + +out_put: +intel_runtime_pm_put (rpm, wakeref); +i915_gem_object_unlock_fence (obj, fence); +out_unpin: +i915_gem_object_unpin_pages (obj); + +return ret; +} +const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = { .flags =I915_GEM_OBJECT_IS_MAPPABLE , .get_pages = i915_gem_object_get_pages_buddy, .put_pages = i915_gem_object_put_pages_buddy, .release = i915_gem_object_release_memory_region, + + .pread = lmem_pread, };/* XXX: Time to vfunc your life up? */
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +2 -0
@@ -53,6 +53,8 @@ struct drm_i915_gem_object_ops {void (*truncate)(struct drm_i915_gem_object *obj);void (*writeback)(struct drm_i915_gem_object *obj); +int (*pread)(struct drm_i915_gem_object *, +const struct drm_i915_gem_pread *arg);int (*pwrite)(struct drm_i915_gem_object *obj,const struct drm_i915_gem_pwrite *arg);
drivers/gpu/drm/i915/i915_gem.c +6 -0
@@ -465,6 +465,12 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,trace_i915_gem_object_pread (obj, args->offset, args->size); + ret = -ENODEV ; +if (obj->ops->pread) + ret = obj->ops->pread (obj, args); +if (ret != -ENODEV ) + goto out; + ret =i915_gem_object_wait (obj,I915_WAIT_INTERRUPTIBLE ,MAX_SCHEDULE_TIMEOUT );
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 18/37 drm/i915/lmem: support pwrite
In reply to Matthew AuldWe need to add support for pwrite'ing an LMEM object.
--- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 87 ++++++++++++++++++++++++ 1 file changed, 87 insertions(+)
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +87 -0
@@ -94,6 +94,92 @@ static int lmem_pread(struct drm_i915_gem_object *obj,return ret; } +static int lmem_pwrite (struct drm_i915_gem_object *obj, +const struct drm_i915_gem_pwrite *arg) +{ +struct drm_i915_private *i915 =to_i915 (obj->base.dev); +struct intel_runtime_pm *rpm = &i915->runtime_pm; +intel_wakeref_t wakeref; +struct dma_fence *fence; +char __user *user_data; +unsigned int offset; +unsigned long idx; +u64 remain; +int ret; + + ret =i915_gem_object_wait (obj, +I915_WAIT_INTERRUPTIBLE , +MAX_SCHEDULE_TIMEOUT ); +if (ret) +return ret; + + ret =i915_gem_object_pin_pages (obj); +if (ret) +return ret; + +i915_gem_object_lock (obj); + ret =i915_gem_object_set_to_wc_domain (obj, true); +if (ret) { +i915_gem_object_unlock (obj); + goto out_unpin; + } + + fence =i915_gem_object_lock_fence (obj); +i915_gem_object_unlock (obj); +if (!fence) { + ret = -ENOMEM ; + goto out_unpin; + } + + wakeref =intel_runtime_pm_get (rpm); + + remain = arg->size; + user_data =u64_to_user_ptr (arg->data_ptr); + offset =offset_in_page (arg->offset); +for (idx = arg->offset >>PAGE_SHIFT ; remain; idx++) { +unsigned long unwritten; +void __iomem *vaddr; +int length; + + length = remain; +if (offset + length >PAGE_SIZE ) + length =PAGE_SIZE - offset; + + vaddr =i915_gem_object_lmem_io_map_page_atomic (obj, idx); +if (!vaddr) { + ret = -ENOMEM ; + goto out_put; + } + + unwritten =__copy_from_user_inatomic_nocache ((void __force *)vaddr + offset, + user_data, length); +io_mapping_unmap_atomic (vaddr); +if (unwritten) { + vaddr =i915_gem_object_lmem_io_map_page (obj, idx); + unwritten =copy_from_user ((void __force *)vaddr + offset, + user_data, length); +io_mapping_unmap (vaddr); + } +if (unwritten) { + ret = -EFAULT ; + goto out_put; + } + + remain -= length; + user_data += length; + offset =0 ; + } + +out_put: +intel_runtime_pm_put (rpm, wakeref); +i915_gem_object_unlock_fence (obj, fence); +out_unpin: +i915_gem_object_unpin_pages (obj); + +return ret; +} + +const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = { .flags =I915_GEM_OBJECT_IS_MAPPABLE ,
@@ -102,6 +188,7 @@ const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = { .release = i915_gem_object_release_memory_region, .pread = lmem_pread, + .pwrite = lmem_pwrite, };/* XXX: Time to vfunc your life up? */
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 19/37 drm/i915: enumerate and init each supported region
In reply to Matthew AuldFrom: Abdiel Janulgue <[email protected]>
Nothing to enumerate yet...
--- drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_gem_gtt.c | 70 +++++++++++++++++-- .../gpu/drm/i915/selftests/mock_gem_device.c | 6 ++ 3 files changed, 72 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -2436,6 +2436,9 @@ int __must_check i915_gem_evict_for_node(struct i915_address_space *vm, unsigned int flags);int i915_gem_evict_vm (struct i915_address_space *vm); +void i915_gem_cleanup_memory_regions (struct drm_i915_private *i915); +int i915_gem_init_memory_regions (struct drm_i915_private *i915); +/* i915_gem_internal.c */ struct drm_i915_gem_object * i915_gem_object_create_internal(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/i915_gem_gtt.c +63 -7
94 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/mock_gem_device.c +6 -0
@@ -82,6 +82,8 @@ static void mock_device_release(struct drm_device *dev)i915_gemfs_fini (i915); +i915_gem_cleanup_memory_regions (i915); +drm_mode_config_cleanup (&i915->drm);drm_dev_fini (&i915->drm);
@@ -219,6 +221,10 @@ struct drm_i915_private *mock_gem_device(void)WARN_ON (i915_gemfs_init (i915)); + err =i915_gem_init_memory_regions (i915); +if (err) + goto err_context; +return i915; err_context:
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 19/37] drm/i915: enumerate and init each supported region
Quoting Matthew Auld (2019-08-09 23:26:25)
drivers/gpu/drm/i915/i915_gem_gtt.c
Quoted 31 lines
From: Abdiel Janulgue <[email protected]>
Nothing to enumerate yet...
Signed-off-by Abdiel Janulgue <[email protected]>Signed-off-by Matthew Auld <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_gem_gtt.c | 70 +++++++++++++++++-- .../gpu/drm/i915/selftests/mock_gem_device.c | 6 ++ 3 files changed, 72 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/i915_drv.h +3
-0@@ -2436,6 +2436,9 @@ int __must_check i915_gem_evict_for_node(struct i915_address_space *vm, unsigned int flags);int i915_gem_evict_vm (struct i915_address_space *vm); +void i915_gem_cleanup_memory_regions (struct drm_i915_private *i915); +int i915_gem_init_memory_regions (struct drm_i915_private *i915); +/* i915_gem_internal.c */ struct drm_i915_gem_object * i915_gem_object_create_internal(struct drm_i915_private *dev_priv,drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0
Note this is not a GEM file. This is a hardware interface that I haven't renamed due to expected conflicted...
Quoted 68 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +60
-0@@ -2713,6 +2713,66 @@ int i915_init_ggtt(struct drm_i915_private *i915)return 0 ; } +void i915_gem_cleanup_memory_regions (struct drm_i915_private *i915) +{ +int i; + +i915_gem_cleanup_stolen (i915); + +for (i =0 ; i <ARRAY_SIZE (i915->regions); ++i) { +struct intel_memory_region *region = i915->regions[i]; + +if (region) +intel_memory_region_destroy (region); + } +} + +int i915_gem_init_memory_regions (struct drm_i915_private *i915) +{ +int err, i; + +/* +* Initialise stolen early so that we may reserve preallocated +* objects for the BIOS to KMS transition. +*/ +/* XXX: stolen will become a region at some point */ + err =i915_gem_init_stolen (i915); +if (err) +return err; + +for (i =0 ; i <INTEL_MEMORY_UKNOWN ; i++) { +struct intel_memory_region *mem =NULL ; +u32 type; + +if (!HAS_REGION (i915,BIT (i))) +continue ; + + type =MEMORY_TYPE_FROM_REGION (intel_region_map[i]); +switch (type) { +default : +break ; + } + +if (IS_ERR (mem)) { + err =PTR_ERR (mem); +DRM_ERROR ("Failed to setup region(%d) type=%d\n" , err, type); + goto out_cleanup; + } + + mem->id = intel_region_map[i]; + mem->type = type; + mem->instance =MEMORY_INSTANCE_FROM_REGION (intel_region_map[i]); + + i915->regions[i] = mem; + } + +return 0 ; + +out_cleanup: +i915_gem_cleanup_memory_regions (i915); +return err; +} +static void ggtt_cleanup_hw (struct i915_ggtt *ggtt) {struct drm_i915_private *i915 = ggtt->vm.i915;
drivers/gpu/drm/i915/i915_gem_gtt.c void i915_ggtt_driver_release(struct drm_i915_private *i915) · line 2817
Quoted 4 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-0@@ -2754,6 +2814,8 @@ void i915_ggtt_driver_release(struct drm_i915_private *i915) {struct pagevec *pvec; +i915_gem_cleanup_memory_regions (i915);
What are you doing here? Just because ggtt and stolen were related? -Chris
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 20/37 drm/i915: treat shmem as a region
In reply to Matthew Auld--- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 6 +- drivers/gpu/drm/i915/gem/i915_gem_region.c | 14 +++- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 68 ++++++++++++++----- drivers/gpu/drm/i915/i915_drv.c | 5 +- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_gem.c | 13 +--- drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +- drivers/gpu/drm/i915/i915_pci.c | 29 +++++--- .../gpu/drm/i915/selftests/mock_gem_device.c | 6 +- 9 files changed, 99 insertions(+), 49 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_phys.c +5 -1
@@ -16,6 +16,7 @@#include "gt/intel_gt.h" #include "i915_drv.h" #include "i915_gem_object.h" +#include "i915_gem_region.h" #include "i915_scatterlist.h" static int i915_gem_object_get_pages_phys (struct drm_i915_gem_object *obj)
@@ -191,8 +192,11 @@ int i915_gem_object_attach_phys(struct drm_i915_gem_object *obj, int align)/* Perma-pin (until release) the physical set of pages */ __i915_gem_object_pin_pages (obj); -if (!IS_ERR_OR_NULL (pages)) +if (!IS_ERR_OR_NULL (pages)) { i915_gem_shmem_ops.put_pages (obj, pages); +/* XXX: where is the fput now though? */ +i915_gem_object_release_memory_region (obj); + }mutex_unlock (&obj->mm.lock);return 0 ;
drivers/gpu/drm/i915/gem/i915_gem_region.c +13 -1
@@ -6,6 +6,7 @@#include "intel_memory_region.h" #include "i915_gem_region.h" #include "i915_drv.h" +#include "i915_trace.h" void i915_gem_object_put_pages_buddy(struct drm_i915_gem_object *obj,
@@ -143,11 +144,22 @@ i915_gem_object_create_region(struct intel_memory_region *mem,GEM_BUG_ON (!size);GEM_BUG_ON (!IS_ALIGNED (size,I915_GTT_MIN_ALIGNMENT )); +/* +* There is a prevalence of the assumption that we fit the object's +* page count inside a 32bit _signed_ variable. Let's document this and +* catch if we ever need to fix it. In the meantime, if you do spot +* such a local variable, please consider fixing! +*/ +if (size >>PAGE_SHIFT >INT_MAX )return ERR_PTR (-E2BIG );if (overflows_type (size, obj->base.size))return ERR_PTR (-E2BIG ); -return mem->ops->create_object (mem, size, flags); + obj = mem->ops->create_object (mem, size, flags); +if (!IS_ERR (obj)) +trace_i915_gem_object_create (obj); + +return obj; }
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +51 -17
131 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.c +1 -4
@@ -511,9 +511,7 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)intel_gt_init_early (&dev_priv->gt, dev_priv); - ret =i915_gem_init_early (dev_priv); -if (ret <0 ) - goto err_workqueues; +i915_gem_init_early (dev_priv);/* This must be called before any calls to HAS_PCH_* */ intel_detect_pch (dev_priv);
@@ -535,7 +533,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv) err_gem:i915_gem_cleanup_early (dev_priv); -err_workqueues:intel_gt_driver_late_release (&dev_priv->gt);i915_workqueues_cleanup (dev_priv);return ret;
drivers/gpu/drm/i915/i915_drv.h +3 -1
@@ -2295,11 +2295,13 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data,int i915_gem_init_userptr (struct drm_i915_private *dev_priv);void i915_gem_cleanup_userptr (struct drm_i915_private *dev_priv);void i915_gem_sanitize (struct drm_i915_private *i915); -int i915_gem_init_early (struct drm_i915_private *dev_priv); +void i915_gem_init_early (struct drm_i915_private *dev_priv);void i915_gem_cleanup_early (struct drm_i915_private *dev_priv);int i915_gem_freeze (struct drm_i915_private *dev_priv);int i915_gem_freeze_late (struct drm_i915_private *dev_priv); +struct intel_memory_region *i915_gem_shmem_setup (struct drm_i915_private *i915); +static inline void i915_gem_drain_freed_objects (struct drm_i915_private *i915) {/*
drivers/gpu/drm/i915/i915_gem.c +1 -12
@@ -45,7 +45,6 @@#include "gem/i915_gem_context.h" #include "gem/i915_gem_ioctls.h" #include "gem/i915_gem_pm.h" -#include "gem/i915_gemfs.h" #include "gt/intel_engine_user.h" #include "gt/intel_gt.h" #include "gt/intel_gt_pm.h"
@@ -1669,20 +1668,12 @@ static void i915_gem_init__mm(struct drm_i915_private *i915)i915_gem_init__objects (i915); } -int i915_gem_init_early (struct drm_i915_private *dev_priv) +void i915_gem_init_early (struct drm_i915_private *dev_priv) { -int err; -i915_gem_init__mm (dev_priv);i915_gem_init__pm (dev_priv);spin_lock_init (&dev_priv->fb_tracking.lock); - - err =i915_gemfs_init (dev_priv); -if (err) -DRM_NOTE ("Unable to create a private tmpfs mount, hugepage support will be disabled(%d).\n" , err); - -return 0 ; }void i915_gem_cleanup_early (struct drm_i915_private *dev_priv)
@@ -1691,8 +1682,6 @@ void i915_gem_cleanup_early(struct drm_i915_private *dev_priv)GEM_BUG_ON (!llist_empty (&dev_priv->mm.free_list));GEM_BUG_ON (atomic_read (&dev_priv->mm.free_count));WARN_ON (dev_priv->mm.shrink_count); - -i915_gemfs_fini (dev_priv); }int i915_gem_freeze (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -1
@@ -2749,7 +2749,8 @@ int i915_gem_init_memory_regions(struct drm_i915_private *i915) type =MEMORY_TYPE_FROM_REGION (intel_region_map[i]);switch (type) { -default : +case INTEL_SMEM : + mem =i915_gem_shmem_setup (i915);break ; }
drivers/gpu/drm/i915/i915_pci.c +21 -8
@@ -144,6 +144,9 @@#define GEN_DEFAULT_PAGE_SIZES \ .page_sizes = I915_GTT_PAGE_SIZE_4K +#define GEN_DEFAULT_REGIONS \ + .memory_regions = REGION_SMEM +#define I830_FEATURES \ GEN(2), \ .is_mobile = 1, \
@@ -161,7 +164,8 @@I9XX_PIPE_OFFSETS , \I9XX_CURSOR_OFFSETS , \I9XX_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONS#define I845_FEATURES \ GEN(2), \
@@ -178,7 +182,8 @@I845_PIPE_OFFSETS , \I845_CURSOR_OFFSETS , \I9XX_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONSstatic const struct intel_device_info intel_i830_info = {I830_FEATURES ,
@@ -212,7 +217,8 @@ static const struct intel_device_info intel_i865g_info = {I9XX_PIPE_OFFSETS , \I9XX_CURSOR_OFFSETS , \I9XX_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONSstatic const struct intel_device_info intel_i915g_info = {GEN3_FEATURES ,
@@ -297,7 +303,8 @@ static const struct intel_device_info intel_pineview_m_info = {I9XX_PIPE_OFFSETS , \I9XX_CURSOR_OFFSETS , \I965_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONSstatic const struct intel_device_info intel_i965g_info = {GEN4_FEATURES ,
@@ -347,7 +354,8 @@ static const struct intel_device_info intel_gm45_info = {I9XX_PIPE_OFFSETS , \I9XX_CURSOR_OFFSETS , \ILK_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONSstatic const struct intel_device_info intel_ironlake_d_info = {GEN5_FEATURES ,
@@ -377,7 +385,8 @@ static const struct intel_device_info intel_ironlake_m_info = {I9XX_PIPE_OFFSETS , \I9XX_CURSOR_OFFSETS , \ILK_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONS#define SNB_D_PLATFORM \ GEN6_FEATURES, \
@@ -425,7 +434,8 @@ static const struct intel_device_info intel_sandybridge_m_gt2_info = {IVB_PIPE_OFFSETS , \IVB_CURSOR_OFFSETS , \IVB_COLORS , \ - GEN_DEFAULT_PAGE_SIZES +GEN_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONS#define IVB_D_PLATFORM \ GEN7_FEATURES, \
@@ -486,6 +496,7 @@ static const struct intel_device_info intel_valleyview_info = {I9XX_CURSOR_OFFSETS ,I965_COLORS ,GEN_DEFAULT_PAGE_SIZES , + GEN_DEFAULT_REGIONS, };#define G75_FEATURES \
@@ -582,6 +593,7 @@ static const struct intel_device_info intel_cherryview_info = {CHV_CURSOR_OFFSETS ,CHV_COLORS ,GEN_DEFAULT_PAGE_SIZES , + GEN_DEFAULT_REGIONS, };#define GEN9_DEFAULT_PAGE_SIZES \
@@ -657,7 +669,8 @@ static const struct intel_device_info intel_skylake_gt4_info = {HSW_PIPE_OFFSETS , \IVB_CURSOR_OFFSETS , \IVB_COLORS , \ - GEN9_DEFAULT_PAGE_SIZES +GEN9_DEFAULT_PAGE_SIZES , \ + GEN_DEFAULT_REGIONSstatic const struct intel_device_info intel_broxton_info = {GEN9_LP_FEATURES ,
drivers/gpu/drm/i915/selftests/mock_gem_device.c +2 -4
@@ -80,8 +80,6 @@ static void mock_device_release(struct drm_device *dev)destroy_workqueue (i915->wq); -i915_gemfs_fini (i915); -i915_gem_cleanup_memory_regions (i915);drm_mode_config_cleanup (&i915->drm);
@@ -181,6 +179,8 @@ struct drm_i915_private *mock_gem_device(void)I915_GTT_PAGE_SIZE_64K |I915_GTT_PAGE_SIZE_2M ; +mkwrite_device_info (i915)->memory_regions =REGION_SMEM ; +mock_uncore_init (&i915->uncore);i915_gem_init__mm (i915);intel_gt_init_early (&i915->gt, i915);
@@ -219,8 +219,6 @@ struct drm_i915_private *mock_gem_device(void)intel_engines_driver_register (i915);mutex_unlock (&i915->drm.struct_mutex); -WARN_ON (i915_gemfs_init (i915)); - err =i915_gem_init_memory_regions (i915);if (err) goto err_context;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 21/37 drm/i915: treat stolen as a region
In reply to Matthew AuldConvert stolen memory over to a region object. Still leaves open the question with what to do with pre-allocated objects...
--- drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 71 +++++++++++++++++++--- drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 3 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 14 +---- drivers/gpu/drm/i915/i915_pci.c | 2 +- 5 files changed, 68 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_region.c +1 -1
@@ -158,7 +158,7 @@ i915_gem_object_create_region(struct intel_memory_region *mem,return ERR_PTR (-E2BIG ); obj = mem->ops->create_object (mem, size, flags); -if (!IS_ERR (obj)) +if (!IS_ERR_OR_NULL (obj))trace_i915_gem_object_create (obj);return obj;
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +62 -9
132 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_stolen.h +1 -2
@@ -21,8 +21,7 @@ int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv, u64 end);void i915_gem_stolen_remove_node (struct drm_i915_private *dev_priv,struct drm_mm_node *node); -int i915_gem_init_stolen (struct drm_i915_private *dev_priv); -void i915_gem_cleanup_stolen (struct drm_i915_private *dev_priv); +struct intel_memory_region *i915_gem_stolen_setup (struct drm_i915_private *i915);struct drm_i915_gem_object *i915_gem_object_create_stolen (struct drm_i915_private *dev_priv,resource_size_t size);
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -11
@@ -2717,8 +2717,6 @@ void i915_gem_cleanup_memory_regions(struct drm_i915_private *i915) {int i; -i915_gem_cleanup_stolen (i915); -for (i =0 ; i <ARRAY_SIZE (i915->regions); ++i) {struct intel_memory_region *region = i915->regions[i];
@@ -2731,15 +2729,6 @@ int i915_gem_init_memory_regions(struct drm_i915_private *i915) {int err, i; -/* -* Initialise stolen early so that we may reserve preallocated -* objects for the BIOS to KMS transition. -*/ -/* XXX: stolen will become a region at some point */ - err =i915_gem_init_stolen (i915); -if (err) -return err; -for (i =0 ; i <INTEL_MEMORY_UKNOWN ; i++) {struct intel_memory_region *mem =NULL ;u32 type;
@@ -2752,6 +2741,9 @@ int i915_gem_init_memory_regions(struct drm_i915_private *i915)case INTEL_SMEM : mem =i915_gem_shmem_setup (i915);break ; +case INTEL_STOLEN : + mem =i915_gem_stolen_setup (i915); +break ; }if (IS_ERR (mem)) {
drivers/gpu/drm/i915/i915_pci.c +1 -1
@@ -145,7 +145,7 @@ .page_sizes = I915_GTT_PAGE_SIZE_4K#define GEN_DEFAULT_REGIONS \ - .memory_regions = REGION_SMEM + .memory_regions = REGION_SMEM | REGION_STOLEN#define I830_FEATURES \ GEN(2), \
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 22/37 drm/i915: define HAS_MAPPABLE_APERTURE
In reply to Matthew AuldFrom: Daniele Ceraolo Spurio <[email protected]>
The following patches in the series will use it to avoid certain operations when aperture is not available in HW.
--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2168,6 +2168,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define OVERLAY_NEEDS_PHYSICAL (dev_priv) \ (INTEL_INFO(dev_priv)->display.overlay_needs_physical) +#define HAS_MAPPABLE_APERTURE (dev_priv) (dev_priv->ggtt.mappable_end > 0) +/* Early gen2 have a totally busted CS tlb and require pinned batches. */ #define HAS_BROKEN_CS_TLB (dev_priv) (IS_I830(dev_priv) || IS_I845G(dev_priv))
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 23/37 drm/i915: do not map aperture if it is not available.
In reply to Matthew AuldFrom: Daniele Ceraolo Spurio <[email protected]>
Skip both setup and cleanup of the aperture mapping if the HW doesn't have an aperture bar.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 36 ++++++++++++++++++----------- 1 file changed, 22 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +22 -14
@@ -2795,8 +2795,10 @@ static void ggtt_cleanup_hw(struct i915_ggtt *ggtt)mutex_unlock (&i915->drm.struct_mutex); -arch_phys_wc_del (ggtt->mtrr); -io_mapping_fini (&ggtt->iomap); +if (HAS_MAPPABLE_APERTURE (i915)) { +arch_phys_wc_del (ggtt->mtrr); +io_mapping_fini (&ggtt->iomap); + } }/**
@@ -2992,10 +2994,13 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)int err;/* TODO: We're not aware of mappable constraints on gen8 yet */ - ggtt->gmadr = - (struct resource )DEFINE_RES_MEM (pci_resource_start (pdev,2 ), -pci_resource_len (pdev,2 )); - ggtt->mappable_end =resource_size (&ggtt->gmadr); +/* FIXME: We probably need to add do device_info or runtime_info */ +if (!HAS_LMEM (dev_priv)) { + ggtt->gmadr = + (struct resource )DEFINE_RES_MEM (pci_resource_start (pdev,2 ), +pci_resource_len (pdev,2 )); + ggtt->mappable_end =resource_size (&ggtt->gmadr); + } err =pci_set_dma_mask (pdev,DMA_BIT_MASK (39 ));if (!err)
@@ -3220,15 +3225,18 @@ static int ggtt_init_hw(struct i915_ggtt *ggtt)if (!HAS_LLC (i915) && !HAS_PPGTT (i915)) ggtt->vm.mm.color_adjust = i915_gtt_color_adjust; -if (!io_mapping_init_wc (&ggtt->iomap, - ggtt->gmadr.start, - ggtt->mappable_end)) { - ggtt->vm.cleanup (&ggtt->vm); - ret = -EIO ; - goto out; - } +if (HAS_MAPPABLE_APERTURE (i915)) { +if (!io_mapping_init_wc (&ggtt->iomap, + ggtt->gmadr.start, + ggtt->mappable_end)) { + ggtt->vm.cleanup (&ggtt->vm); + ret = -EIO ; + goto out; + } - ggtt->mtrr =arch_phys_wc_add (ggtt->gmadr.start, ggtt->mappable_end); + ggtt->mtrr =arch_phys_wc_add (ggtt->gmadr.start, + ggtt->mappable_end); + }i915_ggtt_init_fences (ggtt);
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 23/37] drm/i915: do not map aperture if it is not available.
Quoting Matthew Auld (2019-08-09 23:26:29)
Quoted 16 lines
From: Daniele Ceraolo Spurio <[email protected]>
Skip both setup and cleanup of the aperture mapping if the HW doesn't have an aperture bar.
Signed-off-by Daniele Ceraolo Spurio <[email protected]>Cc Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 36 ++++++++++++++++++----------- 1 file changed, 22 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0
drivers/gpu/drm/i915/i915_gem_gtt.c static void ggtt_cleanup_hw(struct i915_ggtt *ggtt) · line 2798
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-2@@ -2795,8 +2795,10 @@ static void ggtt_cleanup_hw(struct i915_ggtt *ggtt)mutex_unlock (&i915->drm.struct_mutex); -arch_phys_wc_del (ggtt->mtrr); -io_mapping_fini (&ggtt->iomap); +if (HAS_MAPPABLE_APERTURE (i915)) {
I feel here it should be less shouting.
drivers/gpu/drm/i915/i915_gem_gtt.c static void ggtt_cleanup_hw(struct i915_ggtt *ggtt) · line 2799
Quoted 1 line
drivers/gpu/drm/i915/i915_gem_gtt.c +1
-0+arch_phys_wc_del (ggtt->mtrr);
wc_del() doesn't care if we call it without a mtrr (nothing has been using an mtrr since PAT).
if (ggtt->iomap.size)
Quoted 27 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +2
-0+io_mapping_fini (&ggtt->iomap); + } }/**
drivers/gpu/drm/i915/i915_gem_gtt.c +7
-4@@ -2992,10 +2994,13 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt)int err;/* TODO: We're not aware of mappable constraints on gen8 yet */ - ggtt->gmadr = - (struct resource )DEFINE_RES_MEM (pci_resource_start (pdev,2 ), -pci_resource_len (pdev,2 )); - ggtt->mappable_end =resource_size (&ggtt->gmadr); +/* FIXME: We probably need to add do device_info or runtime_info */ +if (!HAS_LMEM (dev_priv)) { + ggtt->gmadr = + (struct resource )DEFINE_RES_MEM (pci_resource_start (pdev,2 ), +pci_resource_len (pdev,2 )); + ggtt->mappable_end =resource_size (&ggtt->gmadr); + } err =pci_set_dma_mask (pdev,DMA_BIT_MASK (39 ));if (!err)@@ -3220,15 +3225,18 @@ static int ggtt_init_hw(struct i915_ggtt *ggtt)if (!HAS_LLC (i915) && !HAS_PPGTT (i915)) ggtt->vm.mm.color_adjust = i915_gtt_color_adjust;
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_init_hw(struct i915_ggtt *ggtt) · line 3229
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +2
-7-if (!io_mapping_init_wc (&ggtt->iomap, - ggtt->gmadr.start, - ggtt->mappable_end)) { - ggtt->vm.cleanup (&ggtt->vm); - ret = -EIO ; - goto out; - } + if (HAS_MAPPABLE_APERTURE(i915)) { + if (!io_mapping_init_wc(&ggtt->iomap,
if (ggtt->mappable_end) {
In this file, we are dealing with the low level details so I would prefer less obfuscation.
drivers/gpu/drm/i915/i915_gem_gtt.c static int ggtt_init_hw(struct i915_ggtt *ggtt) · line 3239
Quoted 11 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +9
-1+ ggtt->gmadr.start, + ggtt->mappable_end)) { + ggtt->vm.cleanup (&ggtt->vm); + ret = -EIO ; + goto out; + } - ggtt->mtrr =arch_phys_wc_add (ggtt->gmadr.start, ggtt->mappable_end); + ggtt->mtrr =arch_phys_wc_add (ggtt->gmadr.start, + ggtt->mappable_end); + }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 24/37 drm/i915: set num_fence_regs to 0 if there is no aperture
In reply to Matthew AuldFrom: Daniele Ceraolo Spurio <[email protected]>
We can't fence anything without aperture.
--- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_gem_fence_reg.c +4 -2
@@ -808,8 +808,10 @@ void i915_ggtt_init_fences(struct i915_ggtt *ggtt)detect_bit_6_swizzle (i915); -if (INTEL_GEN (i915) >=7 && - !(IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915))) +if (!HAS_MAPPABLE_APERTURE (i915)) + num_fences =0 ; +else if (INTEL_GEN (i915) >=7 && + !(IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915))) num_fences =32 ; else if (INTEL_GEN(i915) >= 4 || IS_I945G(i915) || IS_I945GM(i915) ||
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 24/37] drm/i915: set num_fence_regs to 0 if there is no aperture
Quoted 3 lines · Matthew Auld
From: Daniele Ceraolo Spurio <[email protected]>
We can't fence anything without aperture.
When I wrote this patch (before LMEM was in the picture) mappable aperture was supposed to only be missing in headless scenarios so I didn't consider the display case. Do we still need/use fences for direct access from display HW to LMEM? if so, we should drop this.
Daniele
Quoted 16 lines
Signed-off-by Daniele Ceraolo Spurio <[email protected]>Signed-off-by Stuart Summers <[email protected]>Cc Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_gem_fence_reg.c +0
-0@@ -808,8 +808,10 @@ void i915_ggtt_init_fences(struct i915_ggtt *ggtt)detect_bit_6_swizzle (i915);
drivers/gpu/drm/i915/i915_gem_fence_reg.c void i915_ggtt_init_fences(struct i915_ggtt *ggtt) · line 817
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem_fence_reg.c +4
-2-if (INTEL_GEN (i915) >=7 && - !(IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915))) +if (!HAS_MAPPABLE_APERTURE (i915)) + num_fences =0 ; +else if (INTEL_GEN (i915) >=7 && + !(IS_VALLEYVIEW (i915) ||IS_CHERRYVIEW (i915))) num_fences =32 ; else if (INTEL_GEN(i915) >= 4 || IS_I945G(i915) || IS_I945GM(i915) ||
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 24/37] drm/i915: set num_fence_regs to 0 if there is no aperture
Quoted 11 lines · Daniele Ceraolo Spurio
Quoted 3 lines · Matthew Auld
From: Daniele Ceraolo Spurio <[email protected]>
We can't fence anything without aperture.
When I wrote this patch (before LMEM was in the picture) mappable aperture was supposed to only be missing in headless scenarios so I didn't consider the display case. Do we still need/use fences for direct access from display HW to LMEM? if so, we should drop this.
Daniele
Chris confirmed there is currently no use-case from the display side, so we can keep this.
Daniele
Quoted 20 lines
Quoted 20 lines
Signed-off-by Daniele Ceraolo Spurio <[email protected]>Signed-off-by Stuart Summers <[email protected]>Cc Matthew Auld <[email protected]>---
drivers/gpu/drm/i915/i915_gem_fence_reg.c| 6 ++++--1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_gem_fence_reg.c +4
-2@@ -808,8 +808,10 @@ void i915_ggtt_init_fences(struct i915_ggtt *ggtt) detect_bit_6_swizzle(i915); - if (INTEL_GEN(i915) >= 7 && - !(IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915))) + if (!HAS_MAPPABLE_APERTURE(i915)) + num_fences = 0; + else if (INTEL_GEN(i915) >= 7 && + !(IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)))
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/i915/i915_gem_fence_reg.c +0
-0num_fences = 32;else if (
INTEL_GEN(i915)>= 4 ||
IS_I945G(i915)||IS_I945GM(i915)||_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 25/37 drm/i915/selftests: check for missing aperture
In reply to Matthew AuldWe may be missing support for the mappable aperture on some platforms.
--- .../drm/i915/gem/selftests/i915_gem_coherency.c | 5 ++++- drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 3 +++ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 14 ++++++++++---- drivers/gpu/drm/i915/selftests/i915_gem.c | 3 +++ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 3 +++ 5 files changed, 23 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c +4 -1
@@ -244,7 +244,10 @@ static bool always_valid(struct drm_i915_private *i915)static bool needs_fence_registers (struct drm_i915_private *i915) { -return !intel_gt_is_wedged (&i915->gt); +if (intel_gt_is_wedged (&i915->gt)) +return false; + +return i915->ggtt.num_fences; }static bool needs_mi_store_dword (struct drm_i915_private *i915)
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +3 -0
@@ -184,6 +184,9 @@ static int igt_partial_tiling(void *arg)int tiling;int err; +if (!HAS_MAPPABLE_APERTURE (i915)) +return 0 ; +/* We want to check the page mapping and fencing of a large object * mmapped through the GTT. The object we create is larger than can * possibly be mmaped as a whole, and so we must use partial GGTT vma.
drivers/gpu/drm/i915/gt/selftest_hangcheck.c +10 -4
@@ -1179,8 +1179,12 @@ static int __igt_reset_evict_vma(struct intel_gt *gt,struct i915_request *rq;struct evict_vma arg;struct hang h; +unsigned int pin_flags;int err; +if (!gt->ggtt->num_fences && flags &EXEC_OBJECT_NEEDS_FENCE ) +return 0 ; +if (!engine || !intel_engine_can_store_dword (engine))return 0 ;
@@ -1217,10 +1221,12 @@ static int __igt_reset_evict_vma(struct intel_gt *gt, goto out_obj; } - err =i915_vma_pin (arg.vma,0 ,0 , -i915_vma_is_ggtt (arg.vma) ? -PIN_GLOBAL |PIN_MAPPABLE : -PIN_USER ); + pin_flags =i915_vma_is_ggtt (arg.vma) ?PIN_GLOBAL :PIN_USER ; + +if (flags &EXEC_OBJECT_NEEDS_FENCE ) + pin_flags |=PIN_MAPPABLE ; + + err =i915_vma_pin (arg.vma,0 ,0 , pin_flags);if (err) {i915_request_add (rq); goto out_obj;
drivers/gpu/drm/i915/selftests/i915_gem.c +3 -0
@@ -42,6 +42,9 @@ static void trash_stolen(struct drm_i915_private *i915)unsigned long page;u32 prng =0x12345678 ; +if (!HAS_MAPPABLE_APERTURE (i915)) +return ; +for (page =0 ; page < size; page +=PAGE_SIZE ) {const dma_addr_t dma = i915->dsm.start + page;u32 __iomem *s;
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +3 -0
@@ -1147,6 +1147,9 @@ static int igt_ggtt_page(void *arg)unsigned int *order, n;int err; +if (!HAS_MAPPABLE_APERTURE (i915)) +return 0 ; +mutex_lock (&i915->drm.struct_mutex); obj =i915_gem_object_create_internal (i915,PAGE_SIZE );
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 26/37 drm/i915: error capture with no ggtt slot
In reply to Matthew AuldFrom: Daniele Ceraolo Spurio <[email protected]>
If the aperture is not available in HW we can't use a ggtt slot and wc copy, so fall back to regular kmap.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 19 ++++---- drivers/gpu/drm/i915/i915_gpu_error.c | 64 ++++++++++++++++++++++----- 2 files changed, 63 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +11 -8
@@ -2630,7 +2630,8 @@ static void ggtt_release_guc_top(struct i915_ggtt *ggtt)static void cleanup_init_ggtt (struct i915_ggtt *ggtt) {ggtt_release_guc_top (ggtt); -drm_mm_remove_node (&ggtt->error_capture); +if (drm_mm_node_allocated (&ggtt->error_capture)) +drm_mm_remove_node (&ggtt->error_capture); }static int init_ggtt (struct i915_ggtt *ggtt)
@@ -2661,13 +2662,15 @@ static int init_ggtt(struct i915_ggtt *ggtt)if (ret)return ret; -/* Reserve a mappable slot for our lockless error capture */ - ret =drm_mm_insert_node_in_range (&ggtt->vm.mm, &ggtt->error_capture, -PAGE_SIZE ,0 ,I915_COLOR_UNEVICTABLE , -0 , ggtt->mappable_end, -DRM_MM_INSERT_LOW ); -if (ret) -return ret; +if (HAS_MAPPABLE_APERTURE (ggtt->vm.i915)) { +/* Reserve a mappable slot for our lockless error capture */ + ret =drm_mm_insert_node_in_range (&ggtt->vm.mm, &ggtt->error_capture, +PAGE_SIZE ,0 ,I915_COLOR_UNEVICTABLE , +0 , ggtt->mappable_end, +DRM_MM_INSERT_LOW ); +if (ret) +return ret; + }/* * The upper portion of the GuC address space has a sizeable hole
drivers/gpu/drm/i915/i915_gpu_error.c +52 -12
117 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 26/37] drm/i915: error capture with no ggtt slot
Quoting Matthew Auld (2019-08-09 23:26:32)
Quoted 104 lines
From: Daniele Ceraolo Spurio <[email protected]>
If the aperture is not available in HW we can't use a ggtt slot and wc copy, so fall back to regular kmap.
Signed-off-by Daniele Ceraolo Spurio <[email protected]>Signed-off-by Abdiel Janulgue <[email protected]>--- drivers/gpu/drm/i915/i915_gem_gtt.c | 19 ++++---- drivers/gpu/drm/i915/i915_gpu_error.c | 64 ++++++++++++++++++++++----- 2 files changed, 63 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/i915_gem_gtt.c +11
-8@@ -2630,7 +2630,8 @@ static void ggtt_release_guc_top(struct i915_ggtt *ggtt)static void cleanup_init_ggtt (struct i915_ggtt *ggtt) {ggtt_release_guc_top (ggtt); -drm_mm_remove_node (&ggtt->error_capture); +if (drm_mm_node_allocated (&ggtt->error_capture)) +drm_mm_remove_node (&ggtt->error_capture); }static int init_ggtt (struct i915_ggtt *ggtt)@@ -2661,13 +2662,15 @@ static int init_ggtt(struct i915_ggtt *ggtt)if (ret)return ret; -/* Reserve a mappable slot for our lockless error capture */ - ret =drm_mm_insert_node_in_range (&ggtt->vm.mm, &ggtt->error_capture, -PAGE_SIZE ,0 ,I915_COLOR_UNEVICTABLE , -0 , ggtt->mappable_end, -DRM_MM_INSERT_LOW ); -if (ret) -return ret; +if (HAS_MAPPABLE_APERTURE (ggtt->vm.i915)) { +/* Reserve a mappable slot for our lockless error capture */ + ret =drm_mm_insert_node_in_range (&ggtt->vm.mm, &ggtt->error_capture, +PAGE_SIZE ,0 ,I915_COLOR_UNEVICTABLE , +0 , ggtt->mappable_end, +DRM_MM_INSERT_LOW ); +if (ret) +return ret; + }/* * The upper portion of the GuC address space has a sizeable hole drivers/gpu/drm/i915/i915_gpu_error.c +5
-3@@ -40,6 +40,7 @@#include "display/intel_overlay.h" #include "gem/i915_gem_context.h" +#include "gem/i915_gem_lmem.h" #include "i915_drv.h" #include "i915_gpu_error.h" @@ -235,6 +236,7 @@ struct compress {struct pagevec pool;struct z_stream_s zstream;void *tmp; +bool wc; };static bool compress_init (struct compress *c)@@ -292,7 +294,7 @@ static int compress_page(struct compress *c,struct z_stream_s *zstream = &c->zstream; zstream->next_in = src; -if (c->tmp &&i915_memcpy_from_wc (c->tmp, src,PAGE_SIZE )) +if (c->wc && c->tmp &&i915_memcpy_from_wc (c->tmp, src,PAGE_SIZE )) zstream->next_in = c->tmp; zstream->avail_in =PAGE_SIZE ;@@ -367,6 +369,7 @@ static void err_compression_marker(struct drm_i915_error_state_buf *m)struct compress {struct pagevec pool; +bool wc; };static bool compress_init (struct compress *c)@@ -389,7 +392,7 @@ static int compress_page(struct compress *c,if (!ptr)return -ENOMEM ; -if (!i915_memcpy_from_wc (ptr, src,PAGE_SIZE )) +if (!(c->wc &&i915_memcpy_from_wc (ptr, src,PAGE_SIZE )))memcpy (ptr, src,PAGE_SIZE ); dst->pages[dst->page_count++] = ptr;@@ -963,7 +966,6 @@ i915_error_object_create(struct drm_i915_private *i915,struct drm_i915_error_object *dst;unsigned long num_pages;struct sgt_iter iter; -dma_addr_t dma;int ret;might_sleep ();
drivers/gpu/drm/i915/i915_gpu_error.c i915_error_object_create(struct drm_i915_private *i915, · line 993
Quoted 4 lines
drivers/gpu/drm/i915/i915_gpu_error.c +1
-0@@ -988,17 +990,53 @@ i915_error_object_create(struct drm_i915_private *i915, dst->page_count =0 ; dst->unused =0 ; + compress->wc = i915_gem_object_is_lmem(vma->obj) ||
We need to talk about this fixation you appear to have on vma->obj!
Quoted 18 lines
drivers/gpu/drm/i915/i915_gpu_error.c +7
-7+drm_mm_node_allocated (&ggtt->error_capture); + ret = -EINVAL ; -for_each_sgt_dma (dma, iter, vma->pages) { +if (drm_mm_node_allocated (&ggtt->error_capture)) {void __iomem *s; +dma_addr_t dma; - ggtt->vm.insert_page (&ggtt->vm, dma, slot,I915_CACHE_NONE ,0 ); +for_each_sgt_dma (dma, iter, vma->pages) { + ggtt->vm.insert_page (&ggtt->vm, dma, slot, +I915_CACHE_NONE ,0 ); - s =io_mapping_map_wc (&ggtt->iomap, slot,PAGE_SIZE ); - ret =compress_page (compress, (void __force *)s, dst); -io_mapping_unmap (s); -if (ret) -break ;
drivers/gpu/drm/i915/i915_gpu_error.c i915_error_object_create(struct drm_i915_private *i915, · line 1014
Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +10
-0+ s =io_mapping_map_wc (&ggtt->iomap, slot,PAGE_SIZE ); + ret =compress_page (compress, (void __force *)s, dst); +io_mapping_unmap (s); +if (ret) +break ; + } + }else if (i915_gem_object_is_lmem (vma->obj)) { +void *s; +dma_addr_t dma; +struct intel_memory_region *mem = vma->obj->mm.region;
You did that on purpose!
Quoted 4 lines
drivers/gpu/drm/i915/i915_gpu_error.c +4
-0+ +for_each_sgt_dma (dma, iter, vma->pages) { + s =io_mapping_map_atomic_wc (&mem->iomap, dma); + ret =compress_page (compress, s, dst);
drivers/gpu/drm/i915/i915_gpu_error.c i915_error_object_create(struct drm_i915_private *i915, · line 1028
Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +10
-0+io_mapping_unmap_atomic (s); + +if (ret) +break ; + } + }else { +void *s; +struct page *page; + +for_each_sgt_page (page, iter, vma->pages) {
void *s;
Then I wouldn't even complain about the ordering.
drivers/gpu/drm/i915/i915_gpu_error.c i915_error_object_create(struct drm_i915_private *i915, · line 1038
Quoted 10 lines
drivers/gpu/drm/i915/i915_gpu_error.c +10
-0+drm_clflush_pages (&page,1 ); + + s =kmap_atomic (page); + ret =compress_page (compress, s, dst); +kunmap_atomic (s); + +if (ret) +break ; + +drm_clflush_pages (&page,1 );
clflush before the ret
I have to say the circle is complete.
-Chris
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 27/37 drm/i915: Don't try to place HWS in non-existing mappable region
In reply to Matthew AuldFrom: Michal Wajdeczko <[email protected]>
HWS placement restrictions can't just rely on HAS_LLC flag.
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +1 -1
@@ -512,7 +512,7 @@ static int pin_ggtt_status_page(struct intel_engine_cs *engine,unsigned int flags; flags =PIN_GLOBAL ; -if (!HAS_LLC (engine->i915)) +if (!HAS_LLC (engine->i915) &&HAS_MAPPABLE_APERTURE (engine->i915))/* * On g33, we cannot place HWS above 256MiB, so * restrict its pinning to the low mappable arena.
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 27/37] drm/i915: Don't try to place HWS in non-existing mappable region
Quoting Matthew Auld (2019-08-09 23:26:33)
Quoted 15 lines
From: Michal Wajdeczko <[email protected]>
HWS placement restrictions can't just rely on
HAS_LLCflag.Signed-off-by Michal Wajdeczko <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/gt/intel_engine_cs.c +0
-0
drivers/gpu/drm/i915/gt/intel_engine_cs.c static int pin_ggtt_status_page(struct intel_engine_cs *engine, · line 515
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_engine_cs.c +1
-1@@ -512,7 +512,7 @@ static int pin_ggtt_status_page(struct intel_engine_cs *engine,unsigned int flags; flags =PIN_GLOBAL ; -if (!HAS_LLC (engine->i915)) +if (!HAS_LLC (engine->i915) &&HAS_MAPPABLE_APERTURE (engine->i915))
Should we risk IS_GEN() <= 9 instead?
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_engine_cs.c +0
-0/* * On g33, we cannot place HWS above 256MiB, so * restrict its pinning to the low mappable arena. Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 28/37 drm/i915: check for missing aperture in insert_mappable_node
In reply to Matthew AuldFrom: CQ Tang <[email protected]>
--- drivers/gpu/drm/i915/i915_gem.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/i915_gem.c +3 -0
@@ -64,6 +64,9 @@ static int insert_mappable_node(struct i915_ggtt *ggtt, struct drm_mm_node *node, u32 size) { + if (!ggtt->mappable_end) + return -ENOSPC; +memset (node,0 ,sizeof (*node)); return drm_mm_insert_node_in_range(&ggtt->vm.mm, node, size, 0, I915_COLOR_UNEVICTABLE,
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 28/37] drm/i915: check for missing aperture in insert_mappable_node
Quoting Matthew Auld (2019-08-09 23:26:34)
Quoted 13 lines
From: CQ Tang <[email protected]>
Signed-off-by CQ Tang <[email protected]>Signed-off-by Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/i915_gem.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/i915/i915_gem.c +0
-0
drivers/gpu/drm/i915/i915_gem.c static int · line 68
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem.c +2
-0@@ -64,6 +64,9 @@ static int insert_mappable_node(struct i915_ggtt *ggtt, struct drm_mm_node *node, u32 size) { + if (!ggtt->mappable_end) + return -ENOSPC;
How did you get here? This should remain the BUG for the programming error.
-Chris
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 29/37 drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
In reply to Matthew AuldFrom: Abdiel Janulgue <[email protected]>
This enables us to store extra data within vma->vm_private_data and assign the pagefault ops for each mmap instance.
We replace the core drm_gem_mmap implementation to overcome the limitation in having only a single offset node per gem object, allowing us to have multiple offsets per object. This enables a mapping instance to use unique fault-hadlers, per object.
--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 183 ++++++++++++++++-- drivers/gpu/drm/i915/gem/i915_gem_object.c | 16 ++ drivers/gpu/drm/i915/gem/i915_gem_object.h | 7 +- .../gpu/drm/i915/gem/i915_gem_object_types.h | 18 ++ .../drm/i915/gem/selftests/i915_gem_mman.c | 12 +- drivers/gpu/drm/i915/gt/intel_reset.c | 13 +- drivers/gpu/drm/i915/i915_drv.c | 9 +- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_vma.c | 21 +- 9 files changed, 244 insertions(+), 36 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_mman.c +165 -18
@@ -221,7 +221,8 @@ vm_fault_t i915_gem_fault(struct vm_fault *vmf) {#define MIN_CHUNK_PAGES (SZ_1M >> PAGE_SHIFT)struct vm_area_struct *area = vmf->vma; -struct drm_i915_gem_object *obj =to_intel_bo (area->vm_private_data); +struct i915_mmap_offset *priv = area->vm_private_data; +struct drm_i915_gem_object *obj = priv->obj;struct drm_device *dev = obj->base.dev;struct drm_i915_private *i915 =to_i915 (dev);struct intel_runtime_pm *rpm = &i915->runtime_pm;
@@ -373,13 +374,15 @@ vm_fault_t i915_gem_fault(struct vm_fault *vmf)void __i915_gem_object_release_mmap (struct drm_i915_gem_object *obj) {struct i915_vma *vma; +struct i915_mmap_offset *mmo;GEM_BUG_ON (!obj->userfault_count); obj->userfault_count =0 ;list_del (&obj->userfault_link); -drm_vma_node_unmap (&obj->base.vma_node, - obj->base.dev->anon_inode->i_mapping); +list_for_each_entry (mmo, &obj->mmap_offsets, offset) +drm_vma_node_unmap (&mmo->vma_node, + obj->base.dev->anon_inode->i_mapping);for_each_ggtt_vma (vma, obj)i915_vma_unset_userfault (vma);
@@ -433,14 +436,31 @@ void i915_gem_object_release_mmap(struct drm_i915_gem_object *obj)intel_runtime_pm_put (&i915->runtime_pm, wakeref); } -static int create_mmap_offset (struct drm_i915_gem_object *obj) +static void init_mmap_offset (struct drm_i915_gem_object *obj, +struct i915_mmap_offset *mmo) +{ +mutex_lock (&obj->mmo_lock); +kref_init (&mmo->ref); +list_add (&mmo->offset, &obj->mmap_offsets); +mutex_unlock (&obj->mmo_lock); +} + +static int create_mmap_offset (struct drm_i915_gem_object *obj, +struct i915_mmap_offset *mmo) {struct drm_i915_private *i915 =to_i915 (obj->base.dev); +struct drm_device *dev = obj->base.dev;int err; - err =drm_gem_create_mmap_offset (&obj->base); -if (likely (!err)) +drm_vma_node_reset (&mmo->vma_node); +if (mmo->file) +drm_vma_node_allow (&mmo->vma_node, mmo->file); + err =drm_vma_offset_add (dev->vma_offset_manager, &mmo->vma_node, + obj->base.size /PAGE_SIZE ); +if (likely (!err)) { +init_mmap_offset (obj, mmo);return 0 ; + }/* Attempt to reap some mmap space from dead objects */ do {
@@ -451,32 +471,49 @@ static int create_mmap_offset(struct drm_i915_gem_object *obj)break ;i915_gem_drain_freed_objects (i915); - err =drm_gem_create_mmap_offset (&obj->base); -if (!err) + err =drm_vma_offset_add (dev->vma_offset_manager, &mmo->vma_node, + obj->base.size /PAGE_SIZE ); +if (!err) { +init_mmap_offset (obj, mmo);break ; + } }while (flush_delayed_work (&i915->gem.retire_work));return err; } -int -i915_gem_mmap_gtt (struct drm_file *file, -struct drm_device *dev, -u32 handle, -u64 *offset) +static int +__assign_gem_object_mmap_data (struct drm_file *file, +u32 handle, +enum i915_mmap_type mmap_type, +u64 *offset) {struct drm_i915_gem_object *obj; +struct i915_mmap_offset *mmo;int ret; obj =i915_gem_object_lookup (file, handle);if (!obj)return -ENOENT ; - ret =create_mmap_offset (obj); -if (ret ==0 ) - *offset =drm_vma_node_offset_addr (&obj->base.vma_node); + mmo =kzalloc (sizeof (*mmo),GFP_KERNEL ); +if (!mmo) { + ret = -ENOMEM ; + goto err; + } + mmo->file = file; + ret =create_mmap_offset (obj, mmo); +if (ret) { +kfree (mmo); + goto err; + } + + mmo->mmap_type = mmap_type; + mmo->obj = obj; + *offset =drm_vma_node_offset_addr (&mmo->vma_node); +err:i915_gem_object_put (obj);return ret; }
@@ -500,9 +537,119 @@ int i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, struct drm_file *file) { - struct drm_i915_gem_mmap_gtt *args = data; + struct drm_i915_gem_mmap_offset *args = data; + +return __assign_gem_object_mmap_data (file, args->handle, +I915_MMAP_TYPE_GTT , + &args->offset); +} + +void i915_mmap_offset_object_release (struct kref *ref) +{ +struct i915_mmap_offset *mmo =container_of (ref, + struct i915_mmap_offset, + ref); +struct drm_i915_gem_object *obj = mmo->obj; +struct drm_device *dev = obj->base.dev; + +if (mmo->file) +drm_vma_node_revoke (&mmo->vma_node, mmo->file); +drm_vma_offset_remove (dev->vma_offset_manager, &mmo->vma_node); +list_del (&mmo->offset); + +kfree (mmo); +} + +static void i915_gem_vm_open (struct vm_area_struct *vma) +{ +struct i915_mmap_offset *priv = vma->vm_private_data; +struct drm_i915_gem_object *obj = priv->obj; + +i915_gem_object_get (obj); +kref_get (&priv->ref); +} + +static void i915_gem_vm_close (struct vm_area_struct *vma) +{ +struct i915_mmap_offset *priv = vma->vm_private_data; +struct drm_i915_gem_object *obj = priv->obj; -return i915_gem_mmap_gtt (file, dev, args->handle, &args->offset); +i915_gem_object_put (obj); +kref_put (&priv->ref, i915_mmap_offset_object_release); +} + +static const struct vm_operations_struct i915_gem_gtt_vm_ops = { + .fault = i915_gem_fault, + .open = i915_gem_vm_open, + .close = i915_gem_vm_close, +}; + +/* This overcomes the limitation in drm_gem_mmap's assignment of a +* drm_gem_object as the vma->vm_private_data. Since we need to +* be able to resolve multiple mmap offsets which could be tied +* to a single gem object. +*/ +int i915_gem_mmap (struct file *filp,struct vm_area_struct *vma) +{ +struct drm_vma_offset_node *node; +struct drm_file *priv = filp->private_data; +struct drm_device *dev = priv->minor->dev; +struct i915_mmap_offset *mmo =NULL ; +struct drm_gem_object *obj =NULL ; + +if (drm_dev_is_unplugged (dev)) +return -ENODEV ; + +drm_vma_offset_lock_lookup (dev->vma_offset_manager); + node =drm_vma_offset_exact_lookup_locked (dev->vma_offset_manager, + vma->vm_pgoff, +vma_pages (vma)); +if (likely (node)) { + mmo = container_of(node, struct i915_mmap_offset, + vma_node); +/* +* Take a ref for our mmap_offset and gem objects. The reference is cleaned +* up when the vma is closed. +* +* Skip 0-refcnted objects as it is in the process of being destroyed +* and will be invalid when the vma manager lock is released. +*/ +if (kref_get_unless_zero (&mmo->ref)) { + obj = &mmo->obj->base; +if (!kref_get_unless_zero (&obj->refcount)) + obj =NULL ; + } + } +drm_vma_offset_unlock_lookup (dev->vma_offset_manager); + +if (!obj) { +if (mmo) +kref_put (&mmo->ref, i915_mmap_offset_object_release); +return -EINVAL ; + } + +if (!drm_vma_node_is_allowed (node, priv)) { +drm_gem_object_put_unlocked (obj); +return -EACCES ; + } + +if (to_intel_bo (obj)->readonly) { +if (vma->vm_flags &VM_WRITE ) { +drm_gem_object_put_unlocked (obj); +return -EINVAL ; + } + + vma->vm_flags &= ~VM_MAYWRITE ; + } + + vma->vm_flags |=VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; + vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); + vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot); + vma->vm_private_data = mmo; + + vma->vm_ops = &i915_gem_gtt_vm_ops; + +return 0 ; }#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST )
drivers/gpu/drm/i915/gem/i915_gem_object.c +16 -0
@@ -68,6 +68,9 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,INIT_LIST_HEAD (&obj->lut_list); +mutex_init (&obj->mmo_lock); +INIT_LIST_HEAD (&obj->mmap_offsets); +init_rcu_head (&obj->rcu); obj->ops = ops;
@@ -108,6 +111,7 @@ void i915_gem_close_object(struct drm_gem_object *gem, struct drm_file *file)struct drm_i915_gem_object *obj =to_intel_bo (gem);struct drm_i915_file_private *fpriv = file->driver_priv;struct i915_lut_handle *lut, *ln; +struct i915_mmap_offset *mmo, *on;LIST_HEAD (close);i915_gem_object_lock (obj);
@@ -122,6 +126,11 @@ void i915_gem_close_object(struct drm_gem_object *gem, struct drm_file *file) }i915_gem_object_unlock (obj); +mutex_lock (&obj->mmo_lock); +list_for_each_entry_safe (mmo, on, &obj->mmap_offsets, offset) +kref_put (&mmo->ref, i915_mmap_offset_object_release); +mutex_unlock (&obj->mmo_lock); +list_for_each_entry_safe (lut, ln, &close, obj_link) {struct i915_gem_context *ctx = lut->ctx;struct i915_vma *vma;
@@ -170,6 +179,7 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915, wakeref =intel_runtime_pm_get (&i915->runtime_pm);llist_for_each_entry_safe (obj, on, freed, freed) {struct i915_vma *vma, *vn; +struct i915_mmap_offset *mmo, *on;trace_i915_gem_object_destroy (obj);
@@ -183,6 +193,7 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915,GEM_BUG_ON (!list_empty (&obj->vma.list));GEM_BUG_ON (!RB_EMPTY_ROOT (&obj->vma.tree)); +i915_gem_object_release_mmap (obj);mutex_unlock (&i915->drm.struct_mutex);GEM_BUG_ON (atomic_read (&obj->bind_count));
@@ -203,6 +214,11 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915,if (obj->ops->release) obj->ops->release (obj); +mutex_lock (&obj->mmo_lock); +list_for_each_entry_safe (mmo, on, &obj->mmap_offsets, offset) +kref_put (&mmo->ref, i915_mmap_offset_object_release); +mutex_unlock (&obj->mmo_lock); +/* But keep the pointer alive for RCU-protected lookups */ call_rcu (&obj->rcu, __i915_gem_free_object_rcu); }
drivers/gpu/drm/i915/gem/i915_gem_object.h +5 -2
@@ -131,13 +131,13 @@ i915_gem_object_is_volatile(const struct drm_i915_gem_object *obj)static inline void i915_gem_object_set_readonly (struct drm_i915_gem_object *obj) { - obj->base.vma_node.readonly = true; + obj->readonly = true; }static inline bool i915_gem_object_is_readonly (const struct drm_i915_gem_object *obj) { -return obj->base.vma_node.readonly; +return obj->readonly; } static inline bool
@@ -435,6 +435,9 @@ int i915_gem_object_wait(struct drm_i915_gem_object *obj,int i915_gem_object_wait_priority (struct drm_i915_gem_object *obj,unsigned int flags,const struct i915_sched_attr *attr); + +void i915_mmap_offset_object_release (struct kref *ref); +#define I915_PRIORITY_DISPLAY I915_USER_PRIORITY(I915_PRIORITY_MAX)#endif
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +18 -0
@@ -62,6 +62,19 @@ struct drm_i915_gem_object_ops {void (*release)(struct drm_i915_gem_object *obj); }; +enum i915_mmap_type { +I915_MMAP_TYPE_GTT =0 , +}; + +struct i915_mmap_offset { +struct drm_vma_offset_node vma_node; +struct drm_i915_gem_object * obj; +struct drm_file *file; +enum i915_mmap_type mmap_type; +struct kref ref; +struct list_head offset; +}; +struct drm_i915_gem_object {struct drm_gem_object base;
@@ -117,6 +130,11 @@ struct drm_i915_gem_object {unsigned int userfault_count;struct list_head userfault_link; +/* Protects access to mmap offsets */ +struct mutex mmo_lock; +struct list_head mmap_offsets; + bool readonly:1; + I915_SELFTEST_DECLARE(struct list_head st_link);unsigned long flags;
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +10 -2
@@ -371,15 +371,20 @@ static bool assert_mmap_offset(struct drm_i915_private *i915, int expected) {struct drm_i915_gem_object *obj; +/* refcounted in create_mmap_offset */ +struct i915_mmap_offset *mmo =kzalloc (sizeof (*mmo),GFP_KERNEL );int err; obj =i915_gem_object_create_internal (i915, size);if (IS_ERR (obj))return PTR_ERR (obj); - err =create_mmap_offset (obj); + err =create_mmap_offset (obj, mmo);i915_gem_object_put (obj); +if (err) +kfree (mmo); +return err == expected; }
@@ -422,6 +427,8 @@ static int igt_mmap_offset_exhaustion(void *arg)struct drm_mm *mm = &i915->drm.vma_offset_manager->vm_addr_space_mm;struct drm_i915_gem_object *obj;struct drm_mm_node resv, *hole; +/* refcounted in create_mmap_offset */ +struct i915_mmap_offset *mmo =kzalloc (sizeof (*mmo),GFP_KERNEL );u64 hole_start, hole_end;int loop, err;
@@ -465,9 +472,10 @@ static int igt_mmap_offset_exhaustion(void *arg) goto out; } - err =create_mmap_offset (obj); + err =create_mmap_offset (obj, mmo);if (err) {pr_err ("Unable to insert object into reclaimed hole\n" ); +kfree (mmo); goto err_obj; }
drivers/gpu/drm/i915/gt/intel_reset.c +12 -1
@@ -628,6 +628,7 @@ static void revoke_mmaps(struct intel_gt *gt)for (i =0 ; i < gt->ggtt->num_fences; i++) {struct drm_vma_offset_node *node; +struct i915_mmap_offset *mmo;struct i915_vma *vma;u64 vma_offset;
@@ -641,10 +642,20 @@ static void revoke_mmaps(struct intel_gt *gt)GEM_BUG_ON (vma->fence != >->ggtt->fence_regs[i]); node = &vma->obj->base.vma_node; vma_offset = vma->ggtt_view.partial.offset <<PAGE_SHIFT ; -unmap_mapping_range (gt->i915->drm.anon_inode->i_mapping, + +mutex_lock (&vma->obj->mmo_lock); +list_for_each_entry (mmo, &vma->obj->mmap_offsets, offset) { + node = &mmo->vma_node; +if (!drm_mm_node_allocated (&node->vm_node) || + mmo->mmap_type !=I915_MMAP_TYPE_GTT ) +continue ; + +unmap_mapping_range (gt->i915->drm.anon_inode->i_mapping,drm_vma_node_offset_addr (node) + vma_offset, vma->size,1 ); + } +mutex_unlock (&vma->obj->mmo_lock); } }
drivers/gpu/drm/i915/i915_drv.c +1 -8
@@ -2658,18 +2658,12 @@ const struct dev_pm_ops i915_pm_ops = { .runtime_resume = intel_runtime_resume, }; -static const struct vm_operations_struct i915_gem_vm_ops = { - .fault = i915_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static const struct file_operations i915_driver_fops = { .owner =THIS_MODULE , .open = drm_open, .release = drm_release, .unlocked_ioctl = drm_ioctl, - .mmap = drm_gem_mmap, + .mmap = i915_gem_mmap, .poll = drm_poll, .read = drm_read, .compat_ioctl = i915_compat_ioctl,
@@ -2758,7 +2752,6 @@ static struct drm_driver driver = { .gem_close_object = i915_gem_close_object, .gem_free_object_unlocked = i915_gem_free_object, - .gem_vm_ops = &i915_gem_vm_ops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -2396,6 +2396,7 @@ int i915_gem_wait_for_idle(struct drm_i915_private *dev_priv,void i915_gem_suspend (struct drm_i915_private *dev_priv);void i915_gem_suspend_late (struct drm_i915_private *dev_priv);void i915_gem_resume (struct drm_i915_private *dev_priv); +int i915_gem_mmap (struct file *filp,struct vm_area_struct *vma);vm_fault_t i915_gem_fault (struct vm_fault *vmf);int i915_gem_open (struct drm_i915_private *i915,struct drm_file *file);
drivers/gpu/drm/i915/i915_vma.c +16 -5
@@ -865,7 +865,8 @@ static void __i915_vma_iounmap(struct i915_vma *vma)void i915_vma_revoke_mmap (struct i915_vma *vma) { -struct drm_vma_offset_node *node = &vma->obj->base.vma_node; +struct drm_vma_offset_node *node; +struct i915_mmap_offset *mmo;u64 vma_offset;lockdep_assert_held (&vma->vm->i915->drm.struct_mutex);
@@ -877,10 +878,20 @@ void i915_vma_revoke_mmap(struct i915_vma *vma)GEM_BUG_ON (!vma->obj->userfault_count); vma_offset = vma->ggtt_view.partial.offset <<PAGE_SHIFT ; -unmap_mapping_range (vma->vm->i915->drm.anon_inode->i_mapping, -drm_vma_node_offset_addr (node) + vma_offset, - vma->size, -1 ); + +mutex_lock (&vma->obj->mmo_lock); +list_for_each_entry (mmo, &vma->obj->mmap_offsets, offset) { + node = &mmo->vma_node; +if (!drm_mm_node_allocated (&node->vm_node) || + mmo->mmap_type !=I915_MMAP_TYPE_GTT ) +continue ; + +unmap_mapping_range (vma->vm->i915->drm.anon_inode->i_mapping, +drm_vma_node_offset_addr (node) + vma_offset, + vma->size, +1 ); + } +mutex_unlock (&vma->obj->mmo_lock);i915_vma_unset_userfault (vma);if (!--vma->obj->userfault_count)
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 29/37] drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
Quoting Matthew Auld (2019-08-09 23:26:35)
Quoted 167 lines
From: Abdiel Janulgue <[email protected]>
This enables us to store extra data within
vma->vm_private_dataand assign the pagefault ops for each mmap instance.We replace the core
drm_gem_mmapimplementation to overcome the limitation in having only a single offset node per gem object, allowing us to have multiple offsets per object. This enables a mapping instance to use unique fault-hadlers, per object.Signed-off-by Abdiel Janulgue <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 183 ++++++++++++++++-- drivers/gpu/drm/i915/gem/i915_gem_object.c | 16 ++ drivers/gpu/drm/i915/gem/i915_gem_object.h | 7 +- .../gpu/drm/i915/gem/i915_gem_object_types.h | 18 ++ .../drm/i915/gem/selftests/i915_gem_mman.c | 12 +- drivers/gpu/drm/i915/gt/intel_reset.c | 13 +- drivers/gpu/drm/i915/i915_drv.c | 9 +- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_vma.c | 21 +- 9 files changed, 244 insertions(+), 36 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_mman.c +63
-17@@ -221,7 +221,8 @@ vm_fault_t i915_gem_fault(struct vm_fault *vmf) {#define MIN_CHUNK_PAGES (SZ_1M >> PAGE_SHIFT)struct vm_area_struct *area = vmf->vma; -struct drm_i915_gem_object *obj =to_intel_bo (area->vm_private_data); +struct i915_mmap_offset *priv = area->vm_private_data; +struct drm_i915_gem_object *obj = priv->obj;struct drm_device *dev = obj->base.dev;struct drm_i915_private *i915 =to_i915 (dev);struct intel_runtime_pm *rpm = &i915->runtime_pm;@@ -373,13 +374,15 @@ vm_fault_t i915_gem_fault(struct vm_fault *vmf)void __i915_gem_object_release_mmap (struct drm_i915_gem_object *obj) {struct i915_vma *vma; +struct i915_mmap_offset *mmo;GEM_BUG_ON (!obj->userfault_count); obj->userfault_count =0 ;list_del (&obj->userfault_link); -drm_vma_node_unmap (&obj->base.vma_node, - obj->base.dev->anon_inode->i_mapping); +list_for_each_entry (mmo, &obj->mmap_offsets, offset) +drm_vma_node_unmap (&mmo->vma_node, + obj->base.dev->anon_inode->i_mapping);for_each_ggtt_vma (vma, obj)i915_vma_unset_userfault (vma);@@ -433,14 +436,31 @@ void i915_gem_object_release_mmap(struct drm_i915_gem_object *obj)intel_runtime_pm_put (&i915->runtime_pm, wakeref); } -static int create_mmap_offset (struct drm_i915_gem_object *obj) +static void init_mmap_offset (struct drm_i915_gem_object *obj, +struct i915_mmap_offset *mmo) +{ +mutex_lock (&obj->mmo_lock); +kref_init (&mmo->ref); +list_add (&mmo->offset, &obj->mmap_offsets); +mutex_unlock (&obj->mmo_lock); +} + +static int create_mmap_offset (struct drm_i915_gem_object *obj, +struct i915_mmap_offset *mmo) {struct drm_i915_private *i915 =to_i915 (obj->base.dev); +struct drm_device *dev = obj->base.dev;int err; - err =drm_gem_create_mmap_offset (&obj->base); -if (likely (!err)) +drm_vma_node_reset (&mmo->vma_node); +if (mmo->file) +drm_vma_node_allow (&mmo->vma_node, mmo->file); + err =drm_vma_offset_add (dev->vma_offset_manager, &mmo->vma_node, + obj->base.size /PAGE_SIZE ); +if (likely (!err)) { +init_mmap_offset (obj, mmo);return 0 ; + }/* Attempt to reap some mmap space from dead objects */ do {@@ -451,32 +471,49 @@ static int create_mmap_offset(struct drm_i915_gem_object *obj)break ;i915_gem_drain_freed_objects (i915); - err =drm_gem_create_mmap_offset (&obj->base); -if (!err) + err =drm_vma_offset_add (dev->vma_offset_manager, &mmo->vma_node, + obj->base.size /PAGE_SIZE ); +if (!err) { +init_mmap_offset (obj, mmo);break ; + } }while (flush_delayed_work (&i915->gem.retire_work));return err; } -int -i915_gem_mmap_gtt (struct drm_file *file, -struct drm_device *dev, -u32 handle, -u64 *offset) +static int +__assign_gem_object_mmap_data (struct drm_file *file, +u32 handle, +enum i915_mmap_type mmap_type, +u64 *offset) {struct drm_i915_gem_object *obj; +struct i915_mmap_offset *mmo;int ret; obj =i915_gem_object_lookup (file, handle);if (!obj)return -ENOENT ; - ret =create_mmap_offset (obj); -if (ret ==0 ) - *offset =drm_vma_node_offset_addr (&obj->base.vma_node); + mmo =kzalloc (sizeof (*mmo),GFP_KERNEL ); +if (!mmo) { + ret = -ENOMEM ; + goto err; + } + mmo->file = file; + ret =create_mmap_offset (obj, mmo); +if (ret) { +kfree (mmo); + goto err; + } + + mmo->mmap_type = mmap_type; + mmo->obj = obj; + *offset =drm_vma_node_offset_addr (&mmo->vma_node); +err:i915_gem_object_put (obj);return ret; }@@ -500,9 +537,119 @@ int i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, struct drm_file *file) { - struct drm_i915_gem_mmap_gtt *args = data; + struct drm_i915_gem_mmap_offset *args = data; + +return __assign_gem_object_mmap_data (file, args->handle, +I915_MMAP_TYPE_GTT , + &args->offset); +} + +void i915_mmap_offset_object_release (struct kref *ref) +{ + struct i915_mmap_offset *mmo = container_of(ref,
drivers/gpu/drm/i915/gem/i915_gem_mman.c int · line 559
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +9
-0+ struct i915_mmap_offset, + ref); +struct drm_i915_gem_object *obj = mmo->obj; +struct drm_device *dev = obj->base.dev; + +if (mmo->file) +drm_vma_node_revoke (&mmo->vma_node, mmo->file); +drm_vma_offset_remove (dev->vma_offset_manager, &mmo->vma_node); +list_del (&mmo->offset);
Unlocked because you like to see the world burn?
Quoted 52 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +50
-1+ +kfree (mmo); +} + +static void i915_gem_vm_open (struct vm_area_struct *vma) +{ +struct i915_mmap_offset *priv = vma->vm_private_data; +struct drm_i915_gem_object *obj = priv->obj; + +i915_gem_object_get (obj); +kref_get (&priv->ref); +} + +static void i915_gem_vm_close (struct vm_area_struct *vma) +{ +struct i915_mmap_offset *priv = vma->vm_private_data; +struct drm_i915_gem_object *obj = priv->obj; -return i915_gem_mmap_gtt (file, dev, args->handle, &args->offset); +i915_gem_object_put (obj); +kref_put (&priv->ref, i915_mmap_offset_object_release); +} + +static const struct vm_operations_struct i915_gem_gtt_vm_ops = { + .fault = i915_gem_fault, + .open = i915_gem_vm_open, + .close = i915_gem_vm_close, +}; + +/* This overcomes the limitation in drm_gem_mmap's assignment of a +* drm_gem_object as the vma->vm_private_data. Since we need to +* be able to resolve multiple mmap offsets which could be tied +* to a single gem object. +*/ +int i915_gem_mmap (struct file *filp,struct vm_area_struct *vma) +{ +struct drm_vma_offset_node *node; +struct drm_file *priv = filp->private_data; +struct drm_device *dev = priv->minor->dev; +struct i915_mmap_offset *mmo =NULL ; +struct drm_gem_object *obj =NULL ; + +if (drm_dev_is_unplugged (dev)) +return -ENODEV ; + +drm_vma_offset_lock_lookup (dev->vma_offset_manager); + node =drm_vma_offset_exact_lookup_locked (dev->vma_offset_manager, + vma->vm_pgoff, +vma_pages (vma)); +if (likely (node)) { + mmo = container_of(node, struct i915_mmap_offset, + vma_node);
drivers/gpu/drm/i915/gem/i915_gem_mman.c int · line 619
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +10
-0+/* +* Take a ref for our mmap_offset and gem objects. The reference is cleaned +* up when the vma is closed. +* +* Skip 0-refcnted objects as it is in the process of being destroyed +* and will be invalid when the vma manager lock is released. +*/ +if (kref_get_unless_zero (&mmo->ref)) { + obj = &mmo->obj->base; +if (!kref_get_unless_zero (&obj->refcount))
The mmo owns a reference to the obj.
Quoted 59 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +33
-0+ obj =NULL ; + } + } +drm_vma_offset_unlock_lookup (dev->vma_offset_manager); + +if (!obj) { +if (mmo) +kref_put (&mmo->ref, i915_mmap_offset_object_release); +return -EINVAL ; + } + +if (!drm_vma_node_is_allowed (node, priv)) { +drm_gem_object_put_unlocked (obj); +return -EACCES ; + } + +if (to_intel_bo (obj)->readonly) { +if (vma->vm_flags &VM_WRITE ) { +drm_gem_object_put_unlocked (obj); +return -EINVAL ; + } + + vma->vm_flags &= ~VM_MAYWRITE ; + } + + vma->vm_flags |=VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; + vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); + vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot); + vma->vm_private_data = mmo; + + vma->vm_ops = &i915_gem_gtt_vm_ops; + +return 0 ; }#if
IS_ENABLED(CONFIG_DRM_I915_SELFTEST)drivers/gpu/drm/i915/gem/i915_gem_object.c +4
-0@@ -68,6 +68,9 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,INIT_LIST_HEAD (&obj->lut_list); +mutex_init (&obj->mmo_lock); +INIT_LIST_HEAD (&obj->mmap_offsets); +init_rcu_head (&obj->rcu); obj->ops = ops;@@ -108,6 +111,7 @@ void i915_gem_close_object(struct drm_gem_object *gem, struct drm_file *file)struct drm_i915_gem_object *obj =to_intel_bo (gem);struct drm_i915_file_private *fpriv = file->driver_priv;struct i915_lut_handle *lut, *ln; +struct i915_mmap_offset *mmo, *on;LIST_HEAD (close);i915_gem_object_lock (obj);
drivers/gpu/drm/i915/gem/i915_gem_object.c void i915_gem_close_object(struct drm_gem_object *gem, struct drm_file *file) · line 132
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +4
-0@@ -122,6 +126,11 @@ void i915_gem_close_object(struct drm_gem_object *gem, struct drm_file *file) }i915_gem_object_unlock (obj); +mutex_lock (&obj->mmo_lock); +list_for_each_entry_safe (mmo, on, &obj->mmap_offsets, offset) +kref_put (&mmo->ref, i915_mmap_offset_object_release); +mutex_unlock (&obj->mmo_lock);
You can only free the mmo corresponding to this file.
a = gem_create(A);a_offset = mmap_offset_ioctl(a);
b = gem_open(B, gem_flink(A, a))b_offset = mmap_offset_ioctl(b);
(b_offset is allowed to be the same as a_offset)
gem_close(b);
ptr = mmap(a_offset, A)igt_assert(ptr != MAP_FAILED);
Quoted 21 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +3
-0+list_for_each_entry_safe (lut, ln, &close, obj_link) {struct i915_gem_context *ctx = lut->ctx;struct i915_vma *vma;@@ -170,6 +179,7 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915, wakeref =intel_runtime_pm_get (&i915->runtime_pm);llist_for_each_entry_safe (obj, on, freed, freed) {struct i915_vma *vma, *vn; +struct i915_mmap_offset *mmo, *on;trace_i915_gem_object_destroy (obj);@@ -183,6 +193,7 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915,GEM_BUG_ON (!list_empty (&obj->vma.list));GEM_BUG_ON (!RB_EMPTY_ROOT (&obj->vma.tree)); +i915_gem_object_release_mmap (obj);mutex_unlock (&i915->drm.struct_mutex);GEM_BUG_ON (atomic_read (&obj->bind_count));
drivers/gpu/drm/i915/gem/i915_gem_object.c static void __i915_gem_free_objects(struct drm_i915_private *i915, · line 220
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +4
-0@@ -203,6 +214,11 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915,if (obj->ops->release) obj->ops->release (obj); +mutex_lock (&obj->mmo_lock); +list_for_each_entry_safe (mmo, on, &obj->mmap_offsets, offset) +kref_put (&mmo->ref, i915_mmap_offset_object_release); +mutex_unlock (&obj->mmo_lock);
Ahem. mmo has a ref to obj. There's a big circle here. Should code should be redundant and you can assert that you have no mmo (according to the outline sketch).
Quoted 59 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +1
-0+/* But keep the pointer alive for RCU-protected lookups */ call_rcu (&obj->rcu, __i915_gem_free_object_rcu); }drivers/gpu/drm/i915/gem/i915_gem_object.h +5
-2@@ -131,13 +131,13 @@ i915_gem_object_is_volatile(const struct drm_i915_gem_object *obj)static inline void i915_gem_object_set_readonly (struct drm_i915_gem_object *obj) { - obj->base.vma_node.readonly = true; + obj->readonly = true; }static inline bool i915_gem_object_is_readonly (const struct drm_i915_gem_object *obj) { -return obj->base.vma_node.readonly; +return obj->readonly; } static inline bool@@ -435,6 +435,9 @@ int i915_gem_object_wait(struct drm_i915_gem_object *obj,int i915_gem_object_wait_priority (struct drm_i915_gem_object *obj,unsigned int flags,const struct i915_sched_attr *attr); + +void i915_mmap_offset_object_release (struct kref *ref); +#define I915_PRIORITY_DISPLAY I915_USER_PRIORITY(I915_PRIORITY_MAX)#endif drivers/gpu/drm/i915/gem/i915_gem_object_types.h +13
-0@@ -62,6 +62,19 @@ struct drm_i915_gem_object_ops {void (*release)(struct drm_i915_gem_object *obj); }; +enum i915_mmap_type { +I915_MMAP_TYPE_GTT =0 , +}; + +struct i915_mmap_offset { +struct drm_vma_offset_node vma_node; +struct drm_i915_gem_object * obj; +struct drm_file *file; +enum i915_mmap_type mmap_type; +struct kref ref; +struct list_head offset; +}; +struct drm_i915_gem_object {struct drm_gem_object base;
drivers/gpu/drm/i915/gem/i915_gem_object_types.h struct drm_i915_gem_object { · line 136
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +4
-0@@ -117,6 +130,11 @@ struct drm_i915_gem_object {unsigned int userfault_count;struct list_head userfault_link; +/* Protects access to mmap offsets */ +struct mutex mmo_lock; +struct list_head mmap_offsets; + bool readonly:1;
You know that we just added a obj->flags?
Quoted 64 lines
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +1
-0+ I915_SELFTEST_DECLARE(struct list_head st_link);unsigned long flags;drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +10
-2@@ -371,15 +371,20 @@ static bool assert_mmap_offset(struct drm_i915_private *i915, int expected) {struct drm_i915_gem_object *obj; +/* refcounted in create_mmap_offset */ +struct i915_mmap_offset *mmo =kzalloc (sizeof (*mmo),GFP_KERNEL );int err; obj =i915_gem_object_create_internal (i915, size);if (IS_ERR (obj))return PTR_ERR (obj); - err =create_mmap_offset (obj); + err =create_mmap_offset (obj, mmo);i915_gem_object_put (obj); +if (err) +kfree (mmo); +return err == expected; }@@ -422,6 +427,8 @@ static int igt_mmap_offset_exhaustion(void *arg)struct drm_mm *mm = &i915->drm.vma_offset_manager->vm_addr_space_mm;struct drm_i915_gem_object *obj;struct drm_mm_node resv, *hole; +/* refcounted in create_mmap_offset */ +struct i915_mmap_offset *mmo =kzalloc (sizeof (*mmo),GFP_KERNEL );u64 hole_start, hole_end;int loop, err;@@ -465,9 +472,10 @@ static int igt_mmap_offset_exhaustion(void *arg) goto out; } - err =create_mmap_offset (obj); + err =create_mmap_offset (obj, mmo);if (err) {pr_err ("Unable to insert object into reclaimed hole\n" ); +kfree (mmo); goto err_obj; }drivers/gpu/drm/i915/gt/intel_reset.c +1
-0@@ -628,6 +628,7 @@ static void revoke_mmaps(struct intel_gt *gt)for (i =0 ; i < gt->ggtt->num_fences; i++) {struct drm_vma_offset_node *node; +struct i915_mmap_offset *mmo;struct i915_vma *vma;u64 vma_offset;
drivers/gpu/drm/i915/gt/intel_reset.c static void revoke_mmaps(struct intel_gt *gt) · line 646
Quoted 6 lines
drivers/gpu/drm/i915/gt/intel_reset.c +2
-1@@ -641,10 +642,20 @@ static void revoke_mmaps(struct intel_gt *gt)GEM_BUG_ON (vma->fence != >->ggtt->fence_regs[i]); node = &vma->obj->base.vma_node; vma_offset = vma->ggtt_view.partial.offset <<PAGE_SHIFT ; - unmap_mapping_range(gt->i915->drm.anon_inode->i_mapping, + +mutex_lock (&vma->obj->mmo_lock);
Oh crikey, get that lock away from here.
Quoted 74 lines
drivers/gpu/drm/i915/gt/intel_reset.c +9
-0+list_for_each_entry (mmo, &vma->obj->mmap_offsets, offset) { + node = &mmo->vma_node; +if (!drm_mm_node_allocated (&node->vm_node) || + mmo->mmap_type !=I915_MMAP_TYPE_GTT ) +continue ; + +unmap_mapping_range (gt->i915->drm.anon_inode->i_mapping,drm_vma_node_offset_addr (node) + vma_offset, vma->size,1 ); + } +mutex_unlock (&vma->obj->mmo_lock); } }drivers/gpu/drm/i915/i915_drv.c +1
-8@@ -2658,18 +2658,12 @@ const struct dev_pm_ops i915_pm_ops = { .runtime_resume = intel_runtime_resume, }; -static const struct vm_operations_struct i915_gem_vm_ops = { - .fault = i915_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static const struct file_operations i915_driver_fops = { .owner =THIS_MODULE , .open = drm_open, .release = drm_release, .unlocked_ioctl = drm_ioctl, - .mmap = drm_gem_mmap, + .mmap = i915_gem_mmap, .poll = drm_poll, .read = drm_read, .compat_ioctl = i915_compat_ioctl,@@ -2758,7 +2752,6 @@ static struct drm_driver driver = { .gem_close_object = i915_gem_close_object, .gem_free_object_unlocked = i915_gem_free_object, - .gem_vm_ops = &i915_gem_vm_ops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -2396,6 +2396,7 @@ int i915_gem_wait_for_idle(struct drm_i915_private *dev_priv,void i915_gem_suspend (struct drm_i915_private *dev_priv);void i915_gem_suspend_late (struct drm_i915_private *dev_priv);void i915_gem_resume (struct drm_i915_private *dev_priv); +int i915_gem_mmap (struct file *filp,struct vm_area_struct *vma);vm_fault_t i915_gem_fault (struct vm_fault *vmf);int i915_gem_open (struct drm_i915_private *i915,struct drm_file *file);drivers/gpu/drm/i915/i915_vma.c +2
-1@@ -865,7 +865,8 @@ static void __i915_vma_iounmap(struct i915_vma *vma)void i915_vma_revoke_mmap (struct i915_vma *vma) { -struct drm_vma_offset_node *node = &vma->obj->base.vma_node; +struct drm_vma_offset_node *node; +struct i915_mmap_offset *mmo;u64 vma_offset;lockdep_assert_held (&vma->vm->i915->drm.struct_mutex);
drivers/gpu/drm/i915/i915_vma.c void i915_vma_revoke_mmap(struct i915_vma *vma) · line 883
Quoted 10 lines
drivers/gpu/drm/i915/i915_vma.c +3
-4@@ -877,10 +878,20 @@ void i915_vma_revoke_mmap(struct i915_vma *vma)GEM_BUG_ON (!vma->obj->userfault_count); vma_offset = vma->ggtt_view.partial.offset <<PAGE_SHIFT ; -unmap_mapping_range (vma->vm->i915->drm.anon_inode->i_mapping, -drm_vma_node_offset_addr (node) + vma_offset, - vma->size, -1 ); + +mutex_lock (&vma->obj->mmo_lock); +list_for_each_entry (mmo, &vma->obj->mmap_offsets, offset) {
Sure you know which vma you used with this mmo.
Quoted 21 lines
drivers/gpu/drm/i915/i915_vma.c +11
-0+ node = &mmo->vma_node; +if (!drm_mm_node_allocated (&node->vm_node) || + mmo->mmap_type !=I915_MMAP_TYPE_GTT ) +continue ; + +unmap_mapping_range (vma->vm->i915->drm.anon_inode->i_mapping, +drm_vma_node_offset_addr (node) + vma_offset, + vma->size, +1 ); + } +mutex_unlock (&vma->obj->mmo_lock);i915_vma_unset_userfault (vma);if (!--vma->obj->userfault_count)Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 30/37 drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET
In reply to Matthew AuldFrom: Abdiel Janulgue <[email protected]>
Add a new CPU mmap implementation that allows multiple fault handlers that depends on the object's backing pages.
Note that we multiplex mmap_gtt and mmap_offset through the same ioctl, and use the zero extending behaviour of drm to differentiate between them, when we inspect the flags.
--- drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 2 ++ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 30 ++++++++++++++++++ .../gpu/drm/i915/gem/i915_gem_object_types.h | 3 ++ drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_getparam.c | 1 + include/uapi/drm/i915_drm.h | 31 +++++++++++++++++++ 6 files changed, 68 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gem/i915_gem_ioctls.h +2 -0
@@ -30,6 +30,8 @@ int i915_gem_mmap_ioctl(struct drm_device *dev, void *data, struct drm_file *file);int i915_gem_mmap_gtt_ioctl (struct drm_device *dev,void *data,struct drm_file *file); +int i915_gem_mmap_offset_ioctl (struct drm_device *dev,void *data, +struct drm_file *file_priv);int i915_gem_pread_ioctl (struct drm_device *dev,void *data,struct drm_file *file); int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
drivers/gpu/drm/i915/gem/i915_gem_mman.c +30 -0
@@ -538,12 +538,42 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, struct drm_file *file) {struct drm_i915_gem_mmap_offset *args = data; +struct drm_i915_private *i915 =to_i915 (dev); + +if (args->flags &I915_MMAP_OFFSET_FLAGS ) +return i915_gem_mmap_offset_ioctl (dev, data, file); + +if (!HAS_MAPPABLE_APERTURE (i915)) { +DRM_ERROR ("No aperture, cannot mmap via legacy GTT\n" ); +return -ENODEV ; + }return __assign_gem_object_mmap_data (file, args->handle,I915_MMAP_TYPE_GTT , &args->offset); } +int i915_gem_mmap_offset_ioctl (struct drm_device *dev,void *data, +struct drm_file *file) +{ +struct drm_i915_gem_mmap_offset *args = data; +enum i915_mmap_type type; + +if ((args->flags & (I915_MMAP_OFFSET_WC |I915_MMAP_OFFSET_WB )) && + !boot_cpu_has (X86_FEATURE_PAT )) +return -ENODEV ; + +if (args->flags &I915_MMAP_OFFSET_WC ) + type =I915_MMAP_TYPE_OFFSET_WC ; +else if (args->flags &I915_MMAP_OFFSET_WB ) + type =I915_MMAP_TYPE_OFFSET_WB ; +else if (args->flags &I915_MMAP_OFFSET_UC ) + type =I915_MMAP_TYPE_OFFSET_UC ; + +return __assign_gem_object_mmap_data (file, args->handle, type, + &args->offset); +} +void i915_mmap_offset_object_release (struct kref *ref) { struct i915_mmap_offset *mmo = container_of(ref,
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +3 -0
@@ -64,6 +64,9 @@ struct drm_i915_gem_object_ops {enum i915_mmap_type {I915_MMAP_TYPE_GTT =0 , +I915_MMAP_TYPE_OFFSET_WC , +I915_MMAP_TYPE_OFFSET_WB , +I915_MMAP_TYPE_OFFSET_UC , };struct i915_mmap_offset {
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -2710,7 +2710,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GEM_PREAD , i915_gem_pread_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_PWRITE , i915_gem_pwrite_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_MMAP , i915_gem_mmap_ioctl,DRM_RENDER_ALLOW ), -DRM_IOCTL_DEF_DRV (I915_GEM_MMAP_GTT , i915_gem_mmap_gtt_ioctl,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (I915_GEM_MMAP_OFFSET , i915_gem_mmap_gtt_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_SET_DOMAIN , i915_gem_set_domain_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_SW_FINISH , i915_gem_sw_finish_ioctl,DRM_RENDER_ALLOW ), DRM_IOCTL_DEF_DRV(I915_GEM_SET_TILING, i915_gem_set_tiling_ioctl, DRM_RENDER_ALLOW),
drivers/gpu/drm/i915/i915_getparam.c +1 -0
@@ -130,6 +130,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data,case I915_PARAM_HAS_EXEC_BATCH_FIRST :case I915_PARAM_HAS_EXEC_FENCE_ARRAY :case I915_PARAM_HAS_EXEC_SUBMIT_FENCE : +case I915_PARAM_MMAP_OFFSET_VERSION :/* For the time being all of these are always true; * if some supported hardware does not have one of these * features this value needs to be provided from
include/uapi/drm/i915_drm.h +31 -0
@@ -359,6 +359,7 @@ typedef struct _drm_i915_sarea {#define DRM_I915_QUERY 0x39#define DRM_I915_GEM_VM_CREATE 0x3a#define DRM_I915_GEM_VM_DESTROY 0x3b +#define DRM_I915_GEM_MMAP_OFFSET DRM_I915_GEM_MMAP_GTT/* Must be kept compact -- no holes */ #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
@@ -421,6 +422,7 @@ typedef struct _drm_i915_sarea {#define DRM_IOCTL_I915_QUERY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_QUERY, struct drm_i915_query)#define DRM_IOCTL_I915_GEM_VM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_VM_CREATE, struct drm_i915_gem_vm_control)#define DRM_IOCTL_I915_GEM_VM_DESTROY DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_VM_DESTROY, struct drm_i915_gem_vm_control) +#define DRM_IOCTL_I915_GEM_MMAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_OFFSET, struct drm_i915_gem_mmap_offset)/* Allow drivers to submit batchbuffers directly to hardware, relying * on the security mechanisms provided by hardware.
@@ -611,6 +613,10 @@ typedef struct drm_i915_irq_wait {* See I915_EXEC_FENCE_OUT and I915_EXEC_FENCE_SUBMIT. */ #define I915_PARAM_HAS_EXEC_SUBMIT_FENCE 53 + +/* Mmap offset ioctl */ +#define I915_PARAM_MMAP_OFFSET_VERSION 54 +/* Must be kept compact -- no holes and well documented */ typedef struct drm_i915_getparam {
@@ -786,6 +792,31 @@ struct drm_i915_gem_mmap_gtt {__u64 offset; }; +struct drm_i915_gem_mmap_offset { +/** Handle for the object being mapped. */ +__u32 handle; +__u32 pad; +/** +* Fake offset to use for subsequent mmap call +* +* This is a fixed-size type for 32/64 compatibility. +*/ +__u64 offset; + +/** +* Flags for extended behaviour. +* +* It is mandatory that either one of the _WC/_WB flags +* should be passed here. +*/ +__u64 flags; +#define I915_MMAP_OFFSET_WC (1 << 0) +#define I915_MMAP_OFFSET_WB (1 << 1) +#define I915_MMAP_OFFSET_UC (1 << 2) +#define I915_MMAP_OFFSET_FLAGS \ + (I915_MMAP_OFFSET_WC | I915_MMAP_OFFSET_WB | I915_MMAP_OFFSET_UC) +}; +struct drm_i915_gem_set_domain {/** Handle for the object */ __u32 handle;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 30/37] drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET
Quoting Matthew Auld (2019-08-09 23:26:36)
Quoted 26 lines
From: Abdiel Janulgue <[email protected]>
Add a new CPU mmap implementation that allows multiple fault handlers that depends on the object's backing pages.
Note that we multiplex
mmap_gttandmmap_offsetthrough the same ioctl, and use the zero extending behaviour of drm to differentiate between them, when we inspect the flags.Signed-off-by Abdiel Janulgue <[email protected]>Signed-off-by Matthew Auld <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 2 ++ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 30 ++++++++++++++++++ .../gpu/drm/i915/gem/i915_gem_object_types.h | 3 ++ drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_getparam.c | 1 + include/uapi/drm/i915_drm.h | 31 +++++++++++++++++++ 6 files changed, 68 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/gem/i915_gem_ioctls.h +0
-0
drivers/gpu/drm/i915/gem/i915_gem_ioctls.h int i915_gem_mmap_ioctl(struct drm_device *dev, void *data, · line 34
Quoted 5 lines
drivers/gpu/drm/i915/gem/i915_gem_ioctls.h +2
-0@@ -30,6 +30,8 @@ int i915_gem_mmap_ioctl(struct drm_device *dev, void *data, struct drm_file *file);int i915_gem_mmap_gtt_ioctl (struct drm_device *dev,void *data,struct drm_file *file); +int i915_gem_mmap_offset_ioctl (struct drm_device *dev,void *data, +struct drm_file *file_priv);
mmap_offset_ioctl is replacing mmap_gtt_ioctl, you don't need to keep the old one public.
(Or vice versa apparently.)
Quoted 82 lines
drivers/gpu/drm/i915/gem/i915_gem_ioctls.h +0
-0int i915_gem_pread_ioctl (struct drm_device *dev,void *data,struct drm_file *file); int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,drivers/gpu/drm/i915/gem/i915_gem_mman.c +30
-0@@ -538,12 +538,42 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, struct drm_file *file) {struct drm_i915_gem_mmap_offset *args = data; +struct drm_i915_private *i915 =to_i915 (dev); + +if (args->flags &I915_MMAP_OFFSET_FLAGS ) +return i915_gem_mmap_offset_ioctl (dev, data, file); + +if (!HAS_MAPPABLE_APERTURE (i915)) { +DRM_ERROR ("No aperture, cannot mmap via legacy GTT\n" ); +return -ENODEV ; + }return __assign_gem_object_mmap_data (file, args->handle,I915_MMAP_TYPE_GTT , &args->offset); } +int i915_gem_mmap_offset_ioctl (struct drm_device *dev,void *data, +struct drm_file *file) +{ +struct drm_i915_gem_mmap_offset *args = data; +enum i915_mmap_type type; + +if ((args->flags & (I915_MMAP_OFFSET_WC |I915_MMAP_OFFSET_WB )) && + !boot_cpu_has (X86_FEATURE_PAT )) +return -ENODEV ; + +if (args->flags &I915_MMAP_OFFSET_WC ) + type =I915_MMAP_TYPE_OFFSET_WC ; +else if (args->flags &I915_MMAP_OFFSET_WB ) + type =I915_MMAP_TYPE_OFFSET_WB ; +else if (args->flags &I915_MMAP_OFFSET_UC ) + type =I915_MMAP_TYPE_OFFSET_UC ; + +return __assign_gem_object_mmap_data (file, args->handle, type, + &args->offset); +} +void i915_mmap_offset_object_release (struct kref *ref) { struct i915_mmap_offset *mmo = container_of(ref,drivers/gpu/drm/i915/gem/i915_gem_object_types.h +3
-0@@ -64,6 +64,9 @@ struct drm_i915_gem_object_ops {enum i915_mmap_type {I915_MMAP_TYPE_GTT =0 , +I915_MMAP_TYPE_OFFSET_WC , +I915_MMAP_TYPE_OFFSET_WB , +I915_MMAP_TYPE_OFFSET_UC , };struct i915_mmap_offset {drivers/gpu/drm/i915/i915_drv.c +1
-1@@ -2710,7 +2710,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GEM_PREAD , i915_gem_pread_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_PWRITE , i915_gem_pwrite_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_MMAP , i915_gem_mmap_ioctl,DRM_RENDER_ALLOW ), -DRM_IOCTL_DEF_DRV (I915_GEM_MMAP_GTT , i915_gem_mmap_gtt_ioctl,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (I915_GEM_MMAP_OFFSET , i915_gem_mmap_gtt_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_SET_DOMAIN , i915_gem_set_domain_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_SW_FINISH , i915_gem_sw_finish_ioctl,DRM_RENDER_ALLOW ), DRM_IOCTL_DEF_DRV(I915_GEM_SET_TILING, i915_gem_set_tiling_ioctl, DRM_RENDER_ALLOW),drivers/gpu/drm/i915/i915_getparam.c +0
-0
drivers/gpu/drm/i915/i915_getparam.c int i915_getparam_ioctl(struct drm_device *dev, void *data, · line 133
Quoted 4 lines
drivers/gpu/drm/i915/i915_getparam.c +1
-0@@ -130,6 +130,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data,case I915_PARAM_HAS_EXEC_BATCH_FIRST :case I915_PARAM_HAS_EXEC_FENCE_ARRAY :case I915_PARAM_HAS_EXEC_SUBMIT_FENCE : +case I915_PARAM_MMAP_OFFSET_VERSION :
Funny. You do realise this is just MMAP_GT_VERSION for the new struct + ABI.
Quoted 24 lines
drivers/gpu/drm/i915/i915_getparam.c +0
-0/* For the time being all of these are always true; * if some supported hardware does not have one of these * features this value needs to be provided from include/uapi/drm/i915_drm.h +2
-0@@ -359,6 +359,7 @@ typedef struct _drm_i915_sarea {#define DRM_I915_QUERY 0x39#define DRM_I915_GEM_VM_CREATE 0x3a#define DRM_I915_GEM_VM_DESTROY 0x3b +#define DRM_I915_GEM_MMAP_OFFSET DRM_I915_GEM_MMAP_GTT/* Must be kept compact -- no holes */ #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)@@ -421,6 +422,7 @@ typedef struct _drm_i915_sarea {#define DRM_IOCTL_I915_QUERY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_QUERY, struct drm_i915_query)#define DRM_IOCTL_I915_GEM_VM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_VM_CREATE, struct drm_i915_gem_vm_control)#define DRM_IOCTL_I915_GEM_VM_DESTROY DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_VM_DESTROY, struct drm_i915_gem_vm_control) +#define DRM_IOCTL_I915_GEM_MMAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_OFFSET, struct drm_i915_gem_mmap_offset)/* Allow drivers to submit batchbuffers directly to hardware, relying * on the security mechanisms provided by hardware.
include/uapi/drm/i915_drm.h typedef struct drm_i915_irq_wait { · line 618
Quoted 6 lines
include/uapi/drm/i915_drm.h +3
-0@@ -611,6 +613,10 @@ typedef struct drm_i915_irq_wait {* See I915_EXEC_FENCE_OUT and I915_EXEC_FENCE_SUBMIT. */ #define I915_PARAM_HAS_EXEC_SUBMIT_FENCE 53 + +/* Mmap offset ioctl */ +#define I915_PARAM_MMAP_OFFSET_VERSION 54
No, it's just MMAP_GTT_VERSION.
Quoted 20 lines
include/uapi/drm/i915_drm.h +13
-0/* Must be kept compact -- no holes and well documented */ typedef struct drm_i915_getparam {@@ -786,6 +792,31 @@ struct drm_i915_gem_mmap_gtt {__u64 offset; }; +struct drm_i915_gem_mmap_offset { +/** Handle for the object being mapped. */ +__u32 handle; +__u32 pad; +/** +* Fake offset to use for subsequent mmap call +* +* This is a fixed-size type for 32/64 compatibility. +*/ +__u64 offset; + +/** +* Flags for extended behaviour.
include/uapi/drm/i915_drm.h struct drm_i915_gem_mmap_gtt { · line 817
Quoted 10 lines
include/uapi/drm/i915_drm.h +10
-0+* +* It is mandatory that either one of the _WC/_WB flags +* should be passed here. +*/ +__u64 flags; +#define I915_MMAP_OFFSET_WC (1 << 0) +#define I915_MMAP_OFFSET_WB (1 << 1) +#define I915_MMAP_OFFSET_UC (1 << 2) +#define I915_MMAP_OFFSET_FLAGS \ + (I915_MMAP_OFFSET_WC | I915_MMAP_OFFSET_WB | I915_MMAP_OFFSET_UC)
You missed the extension struct.
Quoted 12 lines
include/uapi/drm/i915_drm.h +2
-0+}; +struct drm_i915_gem_set_domain {/** Handle for the object */ __u32 handle;Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 31/37 drm/i915/lmem: add helper to get CPU accessible offset
In reply to Matthew AuldFrom: Abdiel Janulgue <[email protected]>
LMEM can be accessed by the CPU through a BAR. The mapping itself should be 1:1.
--- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 16 ++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 3 +++ 2 files changed, 19 insertions(+)
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +16 -0
@@ -225,6 +225,22 @@ void __iomem *i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj,return io_mapping_map_wc (&obj->mm.region->iomap, offset, size); } +resource_size_t i915_gem_object_lmem_io_offset (struct drm_i915_gem_object *obj, +unsigned long n) +{ +struct intel_memory_region *mem = obj->mm.region; +dma_addr_t daddr; + +/* +* XXX: It's not a dma address, more a device address or physical +* offset, so we are clearly abusing the semantics of the sg_table +* here, and elsewhere like in the gtt paths. +*/ + daddr =i915_gem_object_get_dma_address (obj, n); + +return mem->io_start + daddr; +} +bool i915_gem_object_is_lmem (struct drm_i915_gem_object *obj) {struct intel_memory_region *region = obj->mm.region;
drivers/gpu/drm/i915/gem/i915_gem_lmem.h +3 -0
@@ -21,6 +21,9 @@ void __iomem * i915_gem_object_lmem_io_map_page_atomic(struct drm_i915_gem_object *obj, unsigned long n); +resource_size_t i915_gem_object_lmem_io_offset (struct drm_i915_gem_object *obj, +unsigned long n); +bool i915_gem_object_is_lmem (struct drm_i915_gem_object *obj); struct drm_i915_gem_object *
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 32/37 drm/i915: Add cpu and lmem fault handlers
In reply to Matthew AuldFrom: Abdiel Janulgue <[email protected]>
Fault handler to handle missing pages to be filled depending on an object's backing storage. Handle also changes needed to refault pages depending on fault handler usage.
--- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 54 +++++++ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 3 + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 155 +++++++++++++++++++-- drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 +- drivers/gpu/drm/i915/i915_gem.c | 2 +- 5 files changed, 201 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +54 -0
@@ -6,6 +6,7 @@#include "intel_memory_region.h" #include "gem/i915_gem_region.h" #include "gem/i915_gem_lmem.h" +#include "gt/intel_gt.h" #include "i915_drv.h" static int lmem_pread(struct drm_i915_gem_object *obj,
@@ -179,6 +180,59 @@ static int lmem_pwrite(struct drm_i915_gem_object *obj,return ret; } +vm_fault_t i915_gem_fault_lmem (struct vm_fault *vmf) +{ +struct vm_area_struct *area = vmf->vma; +struct i915_mmap_offset *priv = area->vm_private_data; +struct drm_i915_gem_object *obj = priv->obj; +struct drm_device *dev = obj->base.dev; +struct drm_i915_private *i915 =to_i915 (dev); +unsigned long size = area->vm_end - area->vm_start; +bool write = area->vm_flags &VM_WRITE ; +vm_fault_t vmf_ret; +int i, ret; + +/* Sanity check that we allow writing into this object */ +if (i915_gem_object_is_readonly (obj) && write) +return VM_FAULT_SIGBUS ; + + ret =i915_gem_object_pin_pages (obj); +if (ret) + goto err; + +for (i =0 ; i < size >>PAGE_SHIFT ; i++) { + vmf_ret =vmf_insert_pfn (area, + (unsigned long )area->vm_start + i *PAGE_SIZE , +i915_gem_object_lmem_io_offset (obj, i) >>PAGE_SHIFT ); +if (vmf_ret &VM_FAULT_ERROR ) { + ret =vm_fault_to_errno (vmf_ret,0 ); + goto err; + } + } + +i915_gem_object_unpin_pages (obj); +err: +switch (ret) { +case -EIO : +if (!intel_gt_is_wedged (&i915->gt)) +return VM_FAULT_SIGBUS ; +/* fallthrough */ +case -EAGAIN : +case 0 : +case -ERESTARTSYS : +case -EINTR : +case -EBUSY : +return VM_FAULT_NOPAGE ; +case -ENOMEM : +return VM_FAULT_OOM ; +case -ENOSPC : +case -EFAULT : +return VM_FAULT_SIGBUS ; +default : +WARN_ONCE (ret,"unhandled error in %s: %i\n" , __func__, ret); +return VM_FAULT_SIGBUS ; + } +}const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = { .flags =I915_GEM_OBJECT_IS_MAPPABLE ,
drivers/gpu/drm/i915/gem/i915_gem_lmem.h +3 -0
@@ -7,6 +7,7 @@#define __I915_GEM_LMEM_H#include <linux/types.h> +#include <linux/mman.h> struct drm_i915_private ;struct drm_i915_gem_object ;
@@ -24,6 +25,8 @@ i915_gem_object_lmem_io_map_page_atomic(struct drm_i915_gem_object *obj,resource_size_t i915_gem_object_lmem_io_offset (struct drm_i915_gem_object *obj,unsigned long n); +vm_fault_t i915_gem_fault_lmem (struct vm_fault *vmf); +bool i915_gem_object_is_lmem (struct drm_i915_gem_object *obj); struct drm_i915_gem_object *
drivers/gpu/drm/i915/gem/i915_gem_mman.c +142 -13
215 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_object.h +1 -1
@@ -350,7 +350,7 @@ static inline void i915_gem_object_unpin_map(struct drm_i915_gem_object *obj)i915_gem_object_unpin_pages (obj); } -void __i915_gem_object_release_mmap (struct drm_i915_gem_object *obj); +void __i915_gem_object_release_mmap_gtt (struct drm_i915_gem_object *obj);void i915_gem_object_release_mmap (struct drm_i915_gem_object *obj);void
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -871,7 +871,7 @@ void i915_gem_runtime_suspend(struct drm_i915_private *i915)list_for_each_entry_safe (obj, on, &i915->ggtt.userfault_list, userfault_link) -__i915_gem_object_release_mmap (obj); +__i915_gem_object_release_mmap_gtt (obj);/* * The fence will be lost when the device powers down. If any were
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 32/37] drm/i915: Add cpu and lmem fault handlers
Quoting Matthew Auld (2019-08-09 23:26:38)
Quoted 8 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +7
-1-void __i915_gem_object_release_mmap (struct drm_i915_gem_object *obj) +static vm_fault_t i915_gem_fault_cpu (struct vm_fault *vmf) +{ +struct vm_area_struct *area = vmf->vma; +struct i915_mmap_offset *priv = area->vm_private_data; +struct drm_i915_gem_object *obj = priv->obj; +struct drm_device *dev = obj->base.dev; +struct drm_i915_private *dev_priv =to_i915 (dev);
drivers/gpu/drm/i915/gem/i915_gem_mman.c vm_fault_t i915_gem_fault(struct vm_fault *vmf) · line 392
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +10
-0+vm_fault_t vmf_ret; +unsigned long size = area->vm_end - area->vm_start; +bool write = area->vm_flags &VM_WRITE ; +int i, ret; + +/* Sanity check that we allow writing into this object */ +if (i915_gem_object_is_readonly (obj) && write) +return VM_FAULT_SIGBUS ; + + ret =i915_gem_object_pin_pages (obj);
if (err)
return i915_error_to_vmf_fault(err);
Quoted 4 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +4
-0+ goto err; + +for (i =0 ; i < size >>PAGE_SHIFT ; i++) { +struct page *page =i915_gem_object_get_page (obj, i);
drivers/gpu/drm/i915/gem/i915_gem_mman.c vm_fault_t i915_gem_fault(struct vm_fault *vmf) · line 407
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +10
-0+ vmf_ret =vmf_insert_pfn (area, + (unsigned long )area->vm_start + i *PAGE_SIZE , +page_to_pfn (page)); +if (vmf_ret &VM_FAULT_ERROR ) { + ret =vm_fault_to_errno (vmf_ret,0 ); +break ; + } + } + +i915_gem_object_unpin_pages (obj);
return vmf_ret;
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 33/37 drm/i915: cpu-map based dumb buffers
In reply to Matthew AuldFrom: Abdiel Janulgue <[email protected]>
If there is no aperture we can't use map_gtt to map dumb buffers, so we need a cpu-map based path to do it. We prefer map_gtt on platforms that do have aperture.
--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 18 +++++++++++++++++- .../gpu/drm/i915/gem/i915_gem_object_types.h | 1 + drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_mman.c +17 -1
@@ -500,7 +500,8 @@ static void i915_gem_object_release_mmap_offset(struct drm_i915_gem_object *obj)list_for_each_entry (mmo, &obj->mmap_offsets, offset) {if (mmo->mmap_type ==I915_MMAP_TYPE_OFFSET_WC || mmo->mmap_type ==I915_MMAP_TYPE_OFFSET_WB || - mmo->mmap_type ==I915_MMAP_TYPE_OFFSET_UC ) + mmo->mmap_type ==I915_MMAP_TYPE_OFFSET_UC || + mmo->mmap_type ==I915_MMAP_TYPE_DUMB_WC )drm_vma_node_unmap (&mmo->vma_node, obj->base.dev->anon_inode->i_mapping); }
@@ -602,6 +603,19 @@ __assign_gem_object_mmap_data(struct drm_file *file,return ret; } +int +i915_gem_mmap_dumb (struct drm_file *file, +struct drm_device *dev, +u32 handle, +u64 *offset) +{ +struct drm_i915_private *i915 = dev->dev_private; +enum i915_mmap_type mmap_type =HAS_MAPPABLE_APERTURE (i915) ? +I915_MMAP_TYPE_GTT :I915_MMAP_TYPE_DUMB_WC ; + +return __assign_gem_object_mmap_data (file, handle, mmap_type, offset); +} +/** * i915_gem_mmap_gtt_ioctl - prepare an object for GTT mmap'ing * @dev: DRM device
@@ -714,6 +728,7 @@ static void set_vmdata_mmap_offset(struct i915_mmap_offset *mmo, struct vm_area_ {switch (mmo->mmap_type) {case I915_MMAP_TYPE_OFFSET_WC : +case I915_MMAP_TYPE_DUMB_WC : vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags));break ;
@@ -801,6 +816,7 @@ int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma)case I915_MMAP_TYPE_OFFSET_WC :case I915_MMAP_TYPE_OFFSET_WB :case I915_MMAP_TYPE_OFFSET_UC : +case I915_MMAP_TYPE_DUMB_WC :set_vmdata_mmap_offset (mmo, vma);break ;case I915_MMAP_TYPE_GTT :
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +1 -0
@@ -67,6 +67,7 @@ enum i915_mmap_type {I915_MMAP_TYPE_OFFSET_WC ,I915_MMAP_TYPE_OFFSET_WB ,I915_MMAP_TYPE_OFFSET_UC , + I915_MMAP_TYPE_DUMB_WC, }; struct i915_mmap_offset {
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -2762,7 +2762,7 @@ static struct drm_driver driver = { .get_scanout_position = i915_get_crtc_scanoutpos, .dumb_create = i915_gem_dumb_create, - .dumb_map_offset = i915_gem_mmap_gtt, + .dumb_map_offset = i915_gem_mmap_dumb, .ioctls = i915_ioctls, .num_ioctls = ARRAY_SIZE(i915_ioctls), .fops = &i915_driver_fops,
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -2363,7 +2363,7 @@ i915_mutex_lock_interruptible(struct drm_device *dev)int i915_gem_dumb_create (struct drm_file *file_priv,struct drm_device *dev,struct drm_mode_create_dumb *args); -int i915_gem_mmap_gtt (struct drm_file *file_priv,struct drm_device *dev, +int i915_gem_mmap_dumb (struct drm_file *file_priv,struct drm_device *dev,u32 handle,u64 *offset);int i915_gem_mmap_gtt_version (void );
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 33/37] drm/i915: cpu-map based dumb buffers
Quoting Matthew Auld (2019-08-09 23:26:39)
Quoted 22 lines
From: Abdiel Janulgue <[email protected]>
If there is no aperture we can't use
map_gttto map dumb buffers, so we need a cpu-map based path to do it. We prefermap_gtton platforms that do have aperture.Signed-off-by Abdiel Janulgue <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 18 +++++++++++++++++- .../gpu/drm/i915/gem/i915_gem_object_types.h | 1 + drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_mman.c +0
-0
drivers/gpu/drm/i915/gem/i915_gem_mman.c static void i915_gem_object_release_mmap_offset(struct drm_i915_gem_object *obj) · line 504
Quoted 6 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +2
-1@@ -500,7 +500,8 @@ static void i915_gem_object_release_mmap_offset(struct drm_i915_gem_object *obj)list_for_each_entry (mmo, &obj->mmap_offsets, offset) {if (mmo->mmap_type ==I915_MMAP_TYPE_OFFSET_WC || mmo->mmap_type ==I915_MMAP_TYPE_OFFSET_WB || - mmo->mmap_type ==I915_MMAP_TYPE_OFFSET_UC ) + mmo->mmap_type ==I915_MMAP_TYPE_OFFSET_UC || + mmo->mmap_type ==I915_MMAP_TYPE_DUMB_WC )
Why even special case it???
Even at three logical-ors I suggest you start encoding flags into mmap_type.
In this case, why isn't it something like
if (has_node(&mmo->vma_node))
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +0
-0drm_vma_node_unmap (&mmo->vma_node, obj->base.dev->anon_inode->i_mapping);}drivers/gpu/drm/i915/gem/i915_gem_mman.c +0
-0@@ -602,6 +603,19 @@ __assign_gem_object_mmap_data(struct drm_file *file,return ret; }
drivers/gpu/drm/i915/gem/i915_gem_mman.c __assign_gem_object_mmap_data(struct drm_file *file, · line 614
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +9
-0+int +i915_gem_mmap_dumb (struct drm_file *file, +struct drm_device *dev, +u32 handle, +u64 *offset) +{ +struct drm_i915_private *i915 = dev->dev_private; +enum i915_mmap_type mmap_type =HAS_MAPPABLE_APERTURE (i915) ? +I915_MMAP_TYPE_GTT :I915_MMAP_TYPE_DUMB_WC ;
It's a linear buffer, you can always do WC now that you can return an offset for WC.
Quoted 16 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +5
-0+ +return __assign_gem_object_mmap_data (file, handle, mmap_type, offset); +} +/** * i915_gem_mmap_gtt_ioctl - prepare an object for GTT mmap'ing * @dev: DRM device @@ -714,6 +728,7 @@ static void set_vmdata_mmap_offset(struct i915_mmap_offset *mmo, struct vm_area_ {switch (mmo->mmap_type) {case I915_MMAP_TYPE_OFFSET_WC : +case I915_MMAP_TYPE_DUMB_WC : vma->vm_page_prot =pgprot_writecombine (vm_get_page_prot (vma->vm_flags));break ;
drivers/gpu/drm/i915/gem/i915_gem_mman.c int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma) · line 819
Quoted 4 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +1
-0@@ -801,6 +816,7 @@ int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma)case I915_MMAP_TYPE_OFFSET_WC :case I915_MMAP_TYPE_OFFSET_WB :case I915_MMAP_TYPE_OFFSET_UC : +case I915_MMAP_TYPE_DUMB_WC :
Yup, that was quite redundant.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 34/37 drm/i915: support basic object migration
In reply to Matthew AuldWe are going want to able to move objects between different regions like system memory and local memory. In the future everything should be just another region.
--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 140 ++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.h | 8 + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 +- .../drm/i915/selftests/intel_memory_region.c | 129 ++++++++++++++++ 4 files changed, 278 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gem/i915_gem_object.c +140 -0
@@ -28,6 +28,8 @@#include "i915_gem_clflush.h" #include "i915_gem_context.h" #include "i915_gem_object.h" +#include "i915_gem_object_blt.h" +#include "i915_gem_region.h" #include "i915_globals.h" #include "i915_trace.h"
@@ -170,6 +172,144 @@ static void __i915_gem_free_object_rcu(struct rcu_head *head)atomic_dec (&i915->mm.free_count); } + +int i915_gem_object_prepare_move (struct drm_i915_gem_object *obj) +{ +int err; + +lockdep_assert_held (&obj->base.dev->struct_mutex); + +if (obj->mm.madv !=I915_MADV_WILLNEED ) +return -EINVAL ; + +if (i915_gem_object_needs_bit17_swizzle (obj)) +return -EINVAL ; + +if (atomic_read (&obj->mm.pages_pin_count) > +atomic_read (&obj->bind_count)) +return -EBUSY ; + +if (obj->pin_global) +return -EBUSY ; + +i915_gem_object_release_mmap (obj); + +GEM_BUG_ON (obj->mm.mapping); +GEM_BUG_ON (obj->base.filp &&mapping_mapped (obj->base.filp->f_mapping)); + + err =i915_gem_object_wait (obj, +I915_WAIT_INTERRUPTIBLE | +I915_WAIT_LOCKED | +I915_WAIT_ALL , +MAX_SCHEDULE_TIMEOUT ); +if (err) +return err; + +return i915_gem_object_unbind (obj, +I915_GEM_OBJECT_UNBIND_ACTIVE ); +} + +int i915_gem_object_migrate (struct drm_i915_gem_object *obj, +struct intel_context *ce, +enum intel_region_id id) +{ +struct drm_i915_private *i915 =to_i915 (obj->base.dev); +struct drm_i915_gem_object *donor; +struct intel_memory_region *mem; +struct sg_table *pages =NULL ; +unsigned int page_sizes; +int err =0 ; + +lockdep_assert_held (&i915->drm.struct_mutex); + +GEM_BUG_ON (id >=INTEL_MEMORY_UKNOWN ); +GEM_BUG_ON (obj->mm.region->id == id); +GEM_BUG_ON (obj->mm.madv !=I915_MADV_WILLNEED ); + + mem = i915->regions[id]; + + donor =i915_gem_object_create_region (mem, obj->base.size,0 ); +if (IS_ERR (donor)) +return PTR_ERR (donor); + +/* Copy backing-pages if we have to */ +if (i915_gem_object_has_pages (obj)) { + err =i915_gem_object_pin_pages (obj); +if (err) + goto err_put_donor; + + err =i915_gem_object_copy_blt (obj, donor, ce); +if (err) + goto err_put_donor; + +i915_gem_object_lock (donor); + err =i915_gem_object_set_to_cpu_domain (donor, false); +i915_gem_object_unlock (donor); +if (err) + goto err_put_donor; + +i915_retire_requests (i915); + +i915_gem_object_unbind (donor,0 ); + err =i915_gem_object_unbind (obj,0 ); +if (err) + goto err_put_donor; + +mutex_lock (&obj->mm.lock); + + pages =__i915_gem_object_unset_pages (obj); + obj->ops->put_pages (obj, pages); + +mutex_unlock (&obj->mm.lock); + + page_sizes = donor->mm.page_sizes.phys; + pages =__i915_gem_object_unset_pages (donor); + } + +if (obj->ops->release) + obj->ops->release (obj); + +mutex_lock (&obj->mm.lock); + +/* We need still need a little special casing for shmem */ +if (obj->base.filp) +fput (fetch_and_zero (&obj->base.filp)); +else if (donor->base.filp) { +atomic_long_inc (&donor->base.filp->f_count); + obj->base.filp = donor->base.filp; + } + + obj->base.size = donor->base.size; + obj->mm.region = mem; + obj->flags = donor->flags; + obj->ops = donor->ops; + obj->cache_level = donor->cache_level; + obj->cache_coherent = donor->cache_coherent; + obj->cache_dirty = donor->cache_dirty; + +list_replace_init (&donor->mm.blocks, &obj->mm.blocks); + +mutex_lock (&mem->obj_lock); +list_add (&obj->mm.region_link, &mem->objects); +mutex_unlock (&mem->obj_lock); + +/* set pages after migrated */ +if (pages) +__i915_gem_object_set_pages (obj, pages, page_sizes); + +mutex_unlock (&obj->mm.lock); + +GEM_BUG_ON (i915_gem_object_has_pages (donor)); +GEM_BUG_ON (i915_gem_object_has_pinned_pages (donor)); + +err_put_donor: +i915_gem_object_put (donor); +if (i915_gem_object_has_pinned_pages (obj)) +i915_gem_object_unpin_pages (obj); + +return err; +} +static void __i915_gem_free_objects (struct drm_i915_private *i915,struct llist_node *freed) {
drivers/gpu/drm/i915/gem/i915_gem_object.h +8 -0
@@ -40,8 +40,16 @@ int i915_gem_object_attach_phys(struct drm_i915_gem_object *obj, int align);void i915_gem_close_object (struct drm_gem_object *gem,struct drm_file *file);void i915_gem_free_object (struct drm_gem_object *obj); +enum intel_region_id ; +int i915_gem_object_prepare_move (struct drm_i915_gem_object *obj); +int i915_gem_object_migrate (struct drm_i915_gem_object *obj, +struct intel_context *ce, +enum intel_region_id id); +void i915_gem_flush_free_objects (struct drm_i915_private *i915); +void __i915_gem_object_reset_page_iter (struct drm_i915_gem_object *obj); +struct sg_table *__i915_gem_object_unset_pages (struct drm_i915_gem_object *obj);void i915_gem_object_truncate (struct drm_i915_gem_object *obj);
drivers/gpu/drm/i915/gem/i915_gem_pages.c +1 -1
@@ -143,7 +143,7 @@ void i915_gem_object_writeback(struct drm_i915_gem_object *obj) obj->ops->writeback (obj); } -static void __i915_gem_object_reset_page_iter (struct drm_i915_gem_object *obj) +void __i915_gem_object_reset_page_iter (struct drm_i915_gem_object *obj) {struct radix_tree_iter iter;void __rcu **slot;
drivers/gpu/drm/i915/selftests/intel_memory_region.c +129 -0
147 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 34/37] drm/i915: support basic object migration
Quoting Matthew Auld (2019-08-09 23:26:40)
Quoted 30 lines
We are going want to able to move objects between different regions like system memory and local memory. In the future everything should be just another region.
Signed-off-by Matthew Auld <[email protected]>Signed-off-by Abdiel Janulgue <[email protected]>Signed-off-by CQ Tang <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Abdiel Janulgue <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 140 ++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_object.h | 8 + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 2 +- .../drm/i915/selftests/intel_memory_region.c | 129 ++++++++++++++++ 4 files changed, 278 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/gem/i915_gem_object.c +2
-0@@ -28,6 +28,8 @@#include "i915_gem_clflush.h" #include "i915_gem_context.h" #include "i915_gem_object.h" +#include "i915_gem_object_blt.h" +#include "i915_gem_region.h" #include "i915_globals.h" #include "i915_trace.h"
drivers/gpu/drm/i915/gem/i915_gem_object.c static void __i915_gem_free_object_rcu(struct rcu_head *head) · line 180
Quoted 9 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +6
-0@@ -170,6 +172,144 @@ static void __i915_gem_free_object_rcu(struct rcu_head *head)atomic_dec (&i915->mm.free_count); } + +int i915_gem_object_prepare_move (struct drm_i915_gem_object *obj) +{ +int err; + +lockdep_assert_held (&obj->base.dev->struct_mutex);
No, straight up no.
-Chris
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 35/37 drm/i915: Introduce GEM_OBJECT_SETPARAM with I915_PARAM_MEMORY_REGION
In reply to Matthew AuldFrom: Abdiel Janulgue <[email protected]>
This call will specify which memory region an object should be placed.
Note that changing the object's backing storage should be immediately done after an object is created or if it's not yet in use, otherwise this will fail on a busy object.
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 17 +++ drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 + drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 2 + drivers/gpu/drm/i915/gem/i915_gem_object.c | 115 ++++++++++++++++++++ drivers/gpu/drm/i915/i915_drv.c | 2 +- include/uapi/drm/i915_drm.h | 23 ++++ 6 files changed, 160 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +17 -0
@@ -76,6 +76,7 @@#include "i915_globals.h" #include "i915_trace.h" #include "i915_user_extensions.h" +#include "i915_gem_ioctls.h" #define ALL_L3_SLICES (dev) (1 << NUM_L3_SLICES(dev)) - 1
@@ -2308,6 +2309,22 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data,return ret; } +int i915_gem_setparam_ioctl (struct drm_device *dev,void *data, +struct drm_file *file) +{ +struct drm_i915_gem_context_param *args = data; +u32 object_class =upper_32_bits (args->param); + +switch (object_class) { +case 0 : +return i915_gem_context_setparam_ioctl (dev, data, file); +case 1 : +return i915_gem_object_setparam_ioctl (dev, data, file); + + } +return -EINVAL ; +} +int i915_gem_context_reset_stats_ioctl (struct drm_device *dev,void *data,struct drm_file *file) {
drivers/gpu/drm/i915/gem/i915_gem_context.h +2 -0
@@ -157,6 +157,8 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv);int i915_gem_context_setparam_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); +int i915_gem_setparam_ioctl (struct drm_device *dev,void *data, +struct drm_file *file);int i915_gem_context_reset_stats_ioctl (struct drm_device *dev,void *data,struct drm_file *file);
drivers/gpu/drm/i915/gem/i915_gem_ioctls.h +2 -0
@@ -32,6 +32,8 @@ int i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, struct drm_file *file);int i915_gem_mmap_offset_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); +int i915_gem_object_setparam_ioctl (struct drm_device *dev,void *data, +struct drm_file *file_priv);int i915_gem_pread_ioctl (struct drm_device *dev,void *data,struct drm_file *file); int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
drivers/gpu/drm/i915/gem/i915_gem_object.c +115 -0
121 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.c +1 -1
@@ -2729,7 +2729,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GET_RESET_STATS , i915_gem_context_reset_stats_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_USERPTR , i915_gem_userptr_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_GETPARAM , i915_gem_context_getparam_ioctl,DRM_RENDER_ALLOW ), -DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_SETPARAM , i915_gem_context_setparam_ioctl,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_SETPARAM , i915_gem_setparam_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_PERF_OPEN , i915_perf_open_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_PERF_ADD_CONFIG , i915_perf_add_config_ioctl,DRM_RENDER_ALLOW ), DRM_IOCTL_DEF_DRV(I915_PERF_REMOVE_CONFIG, i915_perf_remove_config_ioctl, DRM_RENDER_ALLOW),
include/uapi/drm/i915_drm.h +23 -0
@@ -360,6 +360,7 @@ typedef struct _drm_i915_sarea {#define DRM_I915_GEM_VM_CREATE 0x3a#define DRM_I915_GEM_VM_DESTROY 0x3b#define DRM_I915_GEM_MMAP_OFFSET DRM_I915_GEM_MMAP_GTT +#define DRM_I915_GEM_OBJECT_SETPARAM DRM_I915_GEM_CONTEXT_SETPARAM/* Must be kept compact -- no holes */ #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
@@ -423,6 +424,7 @@ typedef struct _drm_i915_sarea {#define DRM_IOCTL_I915_GEM_VM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_VM_CREATE, struct drm_i915_gem_vm_control)#define DRM_IOCTL_I915_GEM_VM_DESTROY DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_VM_DESTROY, struct drm_i915_gem_vm_control)#define DRM_IOCTL_I915_GEM_MMAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_OFFSET, struct drm_i915_gem_mmap_offset) +#define DRM_IOCTL_I915_GEM_OBJECT_SETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_OBJECT_SETPARAM, struct drm_i915_gem_object_param)/* Allow drivers to submit batchbuffers directly to hardware, relying * on the security mechanisms provided by hardware.
@@ -1601,6 +1603,27 @@ struct drm_i915_gem_context_param {__u64 value; }; +struct drm_i915_gem_object_param { +/** Handle for the object */ +__u32 handle; + +__u32 size; + +/** Set the memory region for the object listed in preference order +* as an array of region ids within data. To force an object +* to a particular memory region, set the region as the sole entry. +* +* Valid region ids are derived from the id field of +* struct drm_i915_memory_region_info. +* See struct drm_i915_query_memory_region_info. +*/ +#define I915_OBJECT_PARAM (1ull<<32) +#define I915_PARAM_MEMORY_REGION 0x1 +__u64 param; + +__u64 data; +}; +/** * Context SSEU programming *
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 35/37] drm/i915: Introduce GEM_OBJECT_SETPARAM with I915_PARAM_MEMORY_REGION
Quoting Matthew Auld (2019-08-09 23:26:41)
Quoted 32 lines
From: Abdiel Janulgue <[email protected]>
This call will specify which memory region an object should be placed.
Note that changing the object's backing storage should be immediately done after an object is created or if it's not yet in use, otherwise this will fail on a busy object.
Signed-off-by Abdiel Janulgue <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 17 +++ drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 + drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 2 + drivers/gpu/drm/i915/gem/i915_gem_object.c | 115 ++++++++++++++++++++ drivers/gpu/drm/i915/i915_drv.c | 2 +- include/uapi/drm/i915_drm.h | 23 ++++ 6 files changed, 160 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/gem/i915_gem_context.c +1
-0@@ -76,6 +76,7 @@#include "i915_globals.h" #include "i915_trace.h" #include "i915_user_extensions.h" +#include "i915_gem_ioctls.h" #define ALL_L3_SLICES (dev) (1 << NUM_L3_SLICES(dev)) - 1
drivers/gpu/drm/i915/gem/i915_gem_context.c int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, · line 2313
Quoted 5 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +2
-0@@ -2308,6 +2309,22 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data,return ret; } +int i915_gem_setparam_ioctl (struct drm_device *dev,void *data, +struct drm_file *file)
This does not need to be in i915_gem_context.c
drivers/gpu/drm/i915/gem/i915_gem_context.c int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, · line 2317
Quoted 3 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +3
-0+{ +struct drm_i915_gem_context_param *args = data; +
switch(upper_32_bits(args->param)) {Quoted 61 lines
drivers/gpu/drm/i915/gem/i915_gem_context.c +9
-0+case 0 : +return i915_gem_context_setparam_ioctl (dev, data, file); +case 1 : +return i915_gem_object_setparam_ioctl (dev, data, file); + + } +return -EINVAL ; +} +int i915_gem_context_reset_stats_ioctl (struct drm_device *dev,void *data,struct drm_file *file) {drivers/gpu/drm/i915/gem/i915_gem_context.h +2
-0@@ -157,6 +157,8 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv);int i915_gem_context_setparam_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); +int i915_gem_setparam_ioctl (struct drm_device *dev,void *data, +struct drm_file *file);int i915_gem_context_reset_stats_ioctl (struct drm_device *dev,void *data,struct drm_file *file);drivers/gpu/drm/i915/gem/i915_gem_ioctls.h +2
-0@@ -32,6 +32,8 @@ int i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, struct drm_file *file);int i915_gem_mmap_offset_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv); +int i915_gem_object_setparam_ioctl (struct drm_device *dev,void *data, +struct drm_file *file_priv);int i915_gem_pread_ioctl (struct drm_device *dev,void *data,struct drm_file *file); int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,drivers/gpu/drm/i915/gem/i915_gem_object.c +15
-0@@ -506,6 +506,121 @@ int __init i915_global_objects_init(void)return 0 ; } +static enum intel_region_id +__region_id (u32 region) +{ +enum intel_region_id id; + +for (id =0 ; id <INTEL_MEMORY_UKNOWN ; ++id) { +if (intel_region_map[id] == region) +return id; + } + +return INTEL_MEMORY_UKNOWN ; +} + +static int i915_gem_object_region_select(struct drm_i915_private *dev_priv, + struct drm_i915_gem_object_param *args,
drivers/gpu/drm/i915/gem/i915_gem_object.c int __init i915_global_objects_init(void) · line 533
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +10
-0+struct drm_file *file, + struct drm_i915_gem_object *obj) +{ + struct intel_context *ce = dev_priv->engine[BCS0]->kernel_context; +u32 __user *uregions =u64_to_user_ptr (args->data); +u32 uregions_copy[INTEL_MEMORY_UKNOWN ]; +int i, ret; + +if (args->size >INTEL_MEMORY_UKNOWN ) +return -EINVAL ;
args->size should be in bytes (as returned by the GETPARAM for this).
drivers/gpu/drm/i915/gem/i915_gem_object.c int __init i915_global_objects_init(void) · line 547
Quoted 13 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +13
-0+memset (uregions_copy,0 ,sizeof (uregions_copy)); +for (i =0 ; i < args->size; i++) { +u32 region; + + ret =get_user (region, uregions); +if (ret) +return ret; + + uregions_copy[i] = region; + ++uregions; + } + +mutex_lock (&dev_priv->drm.struct_mutex);
Pardon?
Quoted 23 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +23
-0+ ret =i915_gem_object_prepare_move (obj); +if (ret) { +DRM_ERROR ("Cannot set memory region, object in use\n" ); + goto err; + } + +for (i =0 ; i < args->size; i++) { +u32 region = uregions_copy[i]; +enum intel_region_id id =__region_id (region); + +if (id ==INTEL_MEMORY_UKNOWN ) { + ret = -EINVAL ; + goto err; + } + + ret =i915_gem_object_migrate (obj, ce, id); +if (!ret) { +if (!i915_gem_object_has_pages (obj) && +MEMORY_TYPE_FROM_REGION (region) == +INTEL_LMEM ) { +/* +* TODO: this should be part of get_pages(), +* when async get_pages arrives
drivers/gpu/drm/i915/gem/i915_gem_object.c int __init i915_global_objects_init(void) · line 580
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +10
-0+*/ + ret =i915_gem_object_fill_blt (obj, ce,0 ); +if (ret) { +DRM_ERROR ("Failed clearing the object\n" ); + goto err; + } + +i915_gem_object_lock (obj); + ret =i915_gem_object_set_to_cpu_domain (obj, false); +i915_gem_object_unlock (obj);
Pardon?
Quoted 64 lines
drivers/gpu/drm/i915/gem/i915_gem_object.c +43
-0+if (ret) + goto err; + } +break ; + } + } +err: +mutex_unlock (&dev_priv->drm.struct_mutex); +return ret; +} + +int i915_gem_object_setparam_ioctl (struct drm_device *dev,void *data, +struct drm_file *file) +{ + +struct drm_i915_gem_object_param *args = data; +struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_gem_object *obj; +int ret; + + obj =i915_gem_object_lookup (file, args->handle); +if (!obj) +return -ENOENT ; + +switch (lower_32_bits (args->param)) { +case I915_PARAM_MEMORY_REGION : + ret =i915_gem_object_region_select (dev_priv, args, file, obj); +if (ret) { +DRM_ERROR ("Cannot set memory region, migration failed\n" ); + goto err; + } + +break ; +default : + ret = -EINVAL ; +break ; + } + +err: +i915_gem_object_put (obj); +return ret; +} +#if IS_ENABLED (CONFIG_DRM_I915_SELFTEST )#include "selftests/huge_gem_object.c" #include "selftests/huge_pages.c" drivers/gpu/drm/i915/i915_drv.c +1
-1@@ -2729,7 +2729,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GET_RESET_STATS , i915_gem_context_reset_stats_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_USERPTR , i915_gem_userptr_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_GETPARAM , i915_gem_context_getparam_ioctl,DRM_RENDER_ALLOW ), -DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_SETPARAM , i915_gem_context_setparam_ioctl,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_SETPARAM , i915_gem_setparam_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_PERF_OPEN , i915_perf_open_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_PERF_ADD_CONFIG , i915_perf_add_config_ioctl,DRM_RENDER_ALLOW ), DRM_IOCTL_DEF_DRV(I915_PERF_REMOVE_CONFIG, i915_perf_remove_config_ioctl, DRM_RENDER_ALLOW),include/uapi/drm/i915_drm.h +0
-0
include/uapi/drm/i915_drm.h typedef struct _drm_i915_sarea { · line 363
Quoted 4 lines
include/uapi/drm/i915_drm.h +1
-0@@ -360,6 +360,7 @@ typedef struct _drm_i915_sarea {#define DRM_I915_GEM_VM_CREATE 0x3a#define DRM_I915_GEM_VM_DESTROY 0x3b#define DRM_I915_GEM_MMAP_OFFSET DRM_I915_GEM_MMAP_GTT +#define DRM_I915_GEM_OBJECT_SETPARAM DRM_I915_GEM_CONTEXT_SETPARAM
#define DRM_I915_GEM_SETPARAM 0x35
#define DRM_I915_GEM_GETPARAM 0x36
#define DRM_I915_GEM_CONTEXT_SETPARAM DRM_I915_GEM_SETPARAM #define DRM_I915_GEM_CONTEXT_GETPARAM DRM_I915_GEM_GETPARAM
Make sure you do do both.
Quoted 12 lines
include/uapi/drm/i915_drm.h +1
-0/* Must be kept compact -- no holes */ #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)@@ -423,6 +424,7 @@ typedef struct _drm_i915_sarea {#define DRM_IOCTL_I915_GEM_VM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_VM_CREATE, struct drm_i915_gem_vm_control)#define DRM_IOCTL_I915_GEM_VM_DESTROY DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_VM_DESTROY, struct drm_i915_gem_vm_control)#define DRM_IOCTL_I915_GEM_MMAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_OFFSET, struct drm_i915_gem_mmap_offset) +#define DRM_IOCTL_I915_GEM_OBJECT_SETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_OBJECT_SETPARAM, struct drm_i915_gem_object_param)/* Allow drivers to submit batchbuffers directly to hardware, relying * on the security mechanisms provided by hardware.
include/uapi/drm/i915_drm.h struct drm_i915_gem_context_param { · line 1612
Quoted 10 lines
include/uapi/drm/i915_drm.h +7
-0@@ -1601,6 +1603,27 @@ struct drm_i915_gem_context_param {__u64 value; }; +struct drm_i915_gem_object_param { +/** Handle for the object */ +__u32 handle; + +__u32 size; + +/** Set the memory region for the object listed in preference order
/**
* Set
This is not kerneldoc anyway.
And the comment is not abutting the right variable.
include/uapi/drm/i915_drm.h struct drm_i915_gem_context_param { · line 1620
Quoted 8 lines
include/uapi/drm/i915_drm.h +8
-0+* as an array of region ids within data. To force an object +* to a particular memory region, set the region as the sole entry. +* +* Valid region ids are derived from the id field of +* struct drm_i915_memory_region_info. +* See struct drm_i915_query_memory_region_info. +*/ +#define I915_OBJECT_PARAM (1ull<<32)
#define I915_OBJECT_PARAM_REGION (I915_OBJECT_PARAM | 0x1)
include/uapi/drm/i915_drm.h struct drm_i915_gem_context_param { · line 1624
Quoted 3 lines
include/uapi/drm/i915_drm.h +3
-0+__u64 param; + +__u64 data;
Any particular reason for the divergent with the identical struct? -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 35/37] drm/i915: Introduce GEM_OBJECT_SETPARAM with I915_PARAM_MEMORY_REGION
In reply to Matthew AuldQuoted 16 lines · Matthew Auld
From: Abdiel Janulgue <[email protected]>
This call will specify which memory region an object should be placed.
Note that changing the object's backing storage should be immediately done after an object is created or if it's not yet in use, otherwise this will fail on a busy object.
Signed-off-by Abdiel Janulgue <[email protected]>Cc Joonas Lahtinen <[email protected]>drivers/gpu/drm/i915/gem/i915_gem_context.h +0
-0
drivers/gpu/drm/i915/gem/i915_gem_context.h int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, · line 159
Quoted 3 lines
drivers/gpu/drm/i915/gem/i915_gem_context.h +0
-0@@ -157,6 +157,8 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv);int i915_gem_context_setparam_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv);
This function declaration can be removed and can be declared static.
Quoted 41 lines
drivers/gpu/drm/i915/gem/i915_gem_context.h +2
-0+int i915_gem_setparam_ioctl (struct drm_device *dev,void *data, +struct drm_file *file);int i915_gem_context_reset_stats_ioctl (struct drm_device *dev,void *data,struct drm_file *file);include/uapi/drm/i915_drm.h +13
-0@@ -360,6 +360,7 @@ typedef struct _drm_i915_sarea {#define DRM_I915_GEM_VM_CREATE 0x3a#define DRM_I915_GEM_VM_DESTROY 0x3b#define DRM_I915_GEM_MMAP_OFFSET DRM_I915_GEM_MMAP_GTT +#define DRM_I915_GEM_OBJECT_SETPARAM DRM_I915_GEM_CONTEXT_SETPARAM/* Must be kept compact -- no holes */ #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)@@ -423,6 +424,7 @@ typedef struct _drm_i915_sarea {#define DRM_IOCTL_I915_GEM_VM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_VM_CREATE, struct drm_i915_gem_vm_control)#define DRM_IOCTL_I915_GEM_VM_DESTROY DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_VM_DESTROY, struct drm_i915_gem_vm_control)#define DRM_IOCTL_I915_GEM_MMAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_OFFSET, struct drm_i915_gem_mmap_offset) +#define DRM_IOCTL_I915_GEM_OBJECT_SETPARAM DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_OBJECT_SETPARAM, struct drm_i915_gem_object_param)/* Allow drivers to submit batchbuffers directly to hardware, relying * on the security mechanisms provided by hardware. @@ -1601,6 +1603,27 @@ struct drm_i915_gem_context_param {__u64 value; }; +struct drm_i915_gem_object_param { +/** Handle for the object */ +__u32 handle; + +__u32 size; + +/** Set the memory region for the object listed in preference order +* as an array of region ids within data. To force an object +* to a particular memory region, set the region as the sole entry. +* +* Valid region ids are derived from the id field of
include/uapi/drm/i915_drm.h struct drm_i915_gem_context_param { · line 1626
Quoted 10 lines
include/uapi/drm/i915_drm.h +10
-0+* struct drm_i915_memory_region_info. +* See struct drm_i915_query_memory_region_info. +*/ +#define I915_OBJECT_PARAM (1ull<<32) +#define I915_PARAM_MEMORY_REGION 0x1 +__u64 param; + +__u64 data; +}; +
May be another class that probably can use this GET/SETPARAM interface is the address space (vm). Probably we can allow user to query for PPGTT size of vm object (not just context). Not related to this patch series, but another type/class definition here (I915_VM_PARAM?). We probably should define these classes in one place.
Niranjana
Quoted 10 lines
include/uapi/drm/i915_drm.h +0
-0/** * Context SSEU programming * Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 36/37 drm/i915/query: Expose memory regions through the query uAPI
In reply to Matthew AuldFrom: Abdiel Janulgue <[email protected]>
Returns the available memory region areas supported by the HW.
--- drivers/gpu/drm/i915/i915_query.c | 57 +++++++++++++++++++++++++++++++ include/uapi/drm/i915_drm.h | 39 +++++++++++++++++++++ 2 files changed, 96 insertions(+)
drivers/gpu/drm/i915/i915_query.c +57 -0
@@ -142,10 +142,67 @@ query_engine_info(struct drm_i915_private *i915,return len; } +static int query_memregion_info (struct drm_i915_private *dev_priv, +struct drm_i915_query_item *query_item) +{ +struct drm_i915_query_memory_region_info __user *query_ptr = +u64_to_user_ptr (query_item->data_ptr); +struct drm_i915_memory_region_info __user *info_ptr = + &query_ptr->regions[0 ]; +struct drm_i915_memory_region_info info = { }; +struct drm_i915_query_memory_region_info query; +u32 total_length; +int ret, i; + +if (query_item->flags !=0 ) +return -EINVAL ; + + total_length =sizeof (struct drm_i915_query_memory_region_info ); +for (i =0 ; i <ARRAY_SIZE (dev_priv->regions); ++i) { +struct intel_memory_region *region = dev_priv->regions[i]; + +if (!region) +continue ; + + total_length +=sizeof (struct drm_i915_memory_region_info ); + } + + ret =copy_query_item (&query,sizeof (query), total_length, + query_item); +if (ret !=0 ) +return ret; + +if (query.num_regions || query.rsvd[0 ] || query.rsvd[1 ] || + query.rsvd[2 ]) +return -EINVAL ; + +for (i =0 ; i <ARRAY_SIZE (dev_priv->regions); ++i) { +struct intel_memory_region *region = dev_priv->regions[i]; + +if (!region) +continue ; + + info.id = region->id; + info.size =resource_size (®ion->region); + +if (__copy_to_user (info_ptr, &info,sizeof (info))) +return -EFAULT ; + + query.num_regions++; + info_ptr++; + } + +if (__copy_to_user (query_ptr, &query,sizeof (query))) +return -EFAULT ; + +return total_length; +} +static int (*const i915_query_funcs[])(struct drm_i915_private *dev_priv,struct drm_i915_query_item *query_item) = { query_topology_info, query_engine_info, + query_memregion_info, };int i915_query_ioctl (struct drm_device *dev,void *data,struct drm_file *file)
include/uapi/drm/i915_drm.h +39 -0
@@ -2038,6 +2038,7 @@ struct drm_i915_query_item {__u64 query_id;#define DRM_I915_QUERY_TOPOLOGY_INFO 1#define DRM_I915_QUERY_ENGINE_INFO 2 +#define DRM_I915_QUERY_MEMREGION_INFO 3/* Must be kept compact -- no holes and well documented */ /*
@@ -2177,6 +2178,44 @@ struct drm_i915_query_engine_info {struct drm_i915_engine_info engines[]; }; +struct drm_i915_memory_region_info { + +/** Base type of a region +*/ +#define I915_SYSTEM_MEMORY 0 +#define I915_DEVICE_MEMORY 1 + +/** The region id is encoded in a layout which makes it possible to +* retrieve the following information: +* +* Base type: log2(ID >> 16) +* Instance: log2(ID & 0xffff) +*/ +__u32 id; + +/** Reserved field. MBZ */ +__u32 rsvd0; + +/** Unused for now. MBZ */ +__u64 flags; + +__u64 size; + +/** Reserved fields must be cleared to zero. */ +__u64 rsvd1[4 ]; +}; + +struct drm_i915_query_memory_region_info { + +/** Number of struct drm_i915_memory_region_info structs */ +__u32 num_regions; + +/** MBZ */ +__u32 rsvd[3 ]; + +struct drm_i915_memory_region_info regions[]; +}; +#if defined(__cplusplus) }#endif
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v3 36/37] drm/i915/query: Expose memory regions through the query uAPI
Quoting Matthew Auld (2019-08-09 23:26:42)
Quoted 3 lines
From: Abdiel Janulgue <[email protected]>
Returns the available memory region areas supported by the HW.
And how does one use this information?
How does this relate to the information presented by Vulkan or OpenCL
Testcase: igt/...?
New uAPI should always come with a testcase.
Quoted 99 lines
Signed-off-by Abdiel Janulgue <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/i915_query.c | 57 +++++++++++++++++++++++++++++++ include/uapi/drm/i915_drm.h | 39 +++++++++++++++++++++ 2 files changed, 96 insertions(+)drivers/gpu/drm/i915/i915_query.c +57
-0@@ -142,10 +142,67 @@ query_engine_info(struct drm_i915_private *i915,return len; } +static int query_memregion_info (struct drm_i915_private *dev_priv, +struct drm_i915_query_item *query_item) +{ +struct drm_i915_query_memory_region_info __user *query_ptr = +u64_to_user_ptr (query_item->data_ptr); +struct drm_i915_memory_region_info __user *info_ptr = + &query_ptr->regions[0 ]; +struct drm_i915_memory_region_info info = { }; +struct drm_i915_query_memory_region_info query; +u32 total_length; +int ret, i; + +if (query_item->flags !=0 ) +return -EINVAL ; + + total_length =sizeof (struct drm_i915_query_memory_region_info ); +for (i =0 ; i <ARRAY_SIZE (dev_priv->regions); ++i) { +struct intel_memory_region *region = dev_priv->regions[i]; + +if (!region) +continue ; + + total_length +=sizeof (struct drm_i915_memory_region_info ); + } + + ret =copy_query_item (&query,sizeof (query), total_length, + query_item); +if (ret !=0 ) +return ret; + +if (query.num_regions || query.rsvd[0 ] || query.rsvd[1 ] || + query.rsvd[2 ]) +return -EINVAL ; + +for (i =0 ; i <ARRAY_SIZE (dev_priv->regions); ++i) { +struct intel_memory_region *region = dev_priv->regions[i]; + +if (!region) +continue ; + + info.id = region->id; + info.size =resource_size (®ion->region); + +if (__copy_to_user (info_ptr, &info,sizeof (info))) +return -EFAULT ; + + query.num_regions++; + info_ptr++; + } + +if (__copy_to_user (query_ptr, &query,sizeof (query))) +return -EFAULT ; + +return total_length; +} +static int (*const i915_query_funcs[])(struct drm_i915_private *dev_priv,struct drm_i915_query_item *query_item) = { query_topology_info, query_engine_info, + query_memregion_info, };int i915_query_ioctl (struct drm_device *dev,void *data,struct drm_file *file)include/uapi/drm/i915_drm.h +5
-0@@ -2038,6 +2038,7 @@ struct drm_i915_query_item {__u64 query_id;#define DRM_I915_QUERY_TOPOLOGY_INFO 1#define DRM_I915_QUERY_ENGINE_INFO 2 +#define DRM_I915_QUERY_MEMREGION_INFO 3/* Must be kept compact -- no holes and well documented */ /* @@ -2177,6 +2178,44 @@ struct drm_i915_query_engine_info {struct drm_i915_engine_info engines[]; }; +struct drm_i915_memory_region_info { + +/** Base type of a region +*/
include/uapi/drm/i915_drm.h struct drm_i915_query_engine_info { · line 2194
Quoted 10 lines
include/uapi/drm/i915_drm.h +10
-0+#define I915_SYSTEM_MEMORY 0 +#define I915_DEVICE_MEMORY 1 + +/** The region id is encoded in a layout which makes it possible to +* retrieve the following information: +* +* Base type: log2(ID >> 16) +* Instance: log2(ID & 0xffff) +*/ +__u32 id;
You still haven't given userspace the basics such as total size and chunk size.
Quoted 33 lines
include/uapi/drm/i915_drm.h +23
-0+/** Reserved field. MBZ */ +__u32 rsvd0; + +/** Unused for now. MBZ */ +__u64 flags; + +__u64 size; + +/** Reserved fields must be cleared to zero. */ +__u64 rsvd1[4 ]; +}; + +struct drm_i915_query_memory_region_info { + +/** Number of struct drm_i915_memory_region_info structs */ +__u32 num_regions; + +/** MBZ */ +__u32 rsvd[3 ]; + +struct drm_i915_memory_region_info regions[]; +}; +#if defined(__cplusplus) }#endif Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 37/37 HAX drm/i915: add the fake lmem region
In reply to Matthew AuldIntended for upstream testing so that we can still exercise the LMEM plumbing and !HAS_MAPPABLE_APERTURE paths. Smoke tested on Skull Canyon device. This works by allocating an intel_memory_region for a reserved portion of system memory, which we treat like LMEM. For the LMEMBAR we steal the aperture and 1:1 it map to the stolen region.
To enable simply set i915_fake_lmem_start= on the kernel cmdline with the start of reserved region(see memmap=). The size of the region we can use is determined by the size of the mappable aperture, so the size of reserved region should be >= mappable_end.
eg. memmap=2G$16G i915_fake_lmem_start=0x400000000
--- arch/x86/kernel/early-quirks.c | 26 ++++++++ drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 3 + drivers/gpu/drm/i915/i915_drv.c | 8 +++ drivers/gpu/drm/i915/i915_gem_gtt.c | 3 + drivers/gpu/drm/i915/intel_memory_region.h | 4 ++ drivers/gpu/drm/i915/intel_region_lmem.c | 69 ++++++++++++++++++++++ drivers/gpu/drm/i915/intel_region_lmem.h | 5 ++ include/drm/i915_drm.h | 3 + 8 files changed, 121 insertions(+)
arch/x86/kernel/early-quirks.c +26 -0
@@ -603,6 +603,32 @@ static void __init intel_graphics_quirks(int num, int slot, int func) } } +struct resource intel_graphics_fake_lmem_res__ro_after_init =DEFINE_RES_MEM (0 ,0 ); +EXPORT_SYMBOL (intel_graphics_fake_lmem_res); + +static int __init early_i915_fake_lmem_init (char *s) +{ +u64 start; +int ret; + +if (*s =='=' ) + s++; + + ret =kstrtoull (s,16 , &start); +if (ret) +return ret; + + intel_graphics_fake_lmem_res.start = start; + intel_graphics_fake_lmem_res.end =SZ_2G ;/* Placeholder; depends on aperture size */ + +printk (KERN_INFO "Intel graphics fake LMEM starts at %pa\n" , + &intel_graphics_fake_lmem_res.start); + +return 0 ; +} + +early_param ("i915_fake_lmem_start" , early_i915_fake_lmem_init); +static void __init force_disable_hpet (int num,int slot,int func) {#ifdef CONFIG_HPET_TIMER
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +3 -0
@@ -252,6 +252,7 @@ void __iomem *i915_gem_object_lmem_io_map_page(struct drm_i915_gem_object *obj,resource_size_t offset; offset =i915_gem_object_get_dma_address (obj, n); + offset -= intel_graphics_fake_lmem_res.start;return io_mapping_map_wc (&obj->mm.region->iomap, offset,PAGE_SIZE ); }
@@ -262,6 +263,7 @@ void __iomem *i915_gem_object_lmem_io_map_page_atomic(struct drm_i915_gem_objectresource_size_t offset; offset =i915_gem_object_get_dma_address (obj, n); + offset -= intel_graphics_fake_lmem_res.start;return io_mapping_map_atomic_wc (&obj->mm.region->iomap, offset); }
@@ -275,6 +277,7 @@ void __iomem *i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj,GEM_BUG_ON (!(obj->flags &I915_BO_ALLOC_CONTIGUOUS )); offset =i915_gem_object_get_dma_address (obj, n); + offset -= intel_graphics_fake_lmem_res.start;return io_mapping_map_wc (&obj->mm.region->iomap, offset, size); }
drivers/gpu/drm/i915/i915_drv.c +8 -0
@@ -1474,6 +1474,14 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (!i915_modparams.nuclear_pageflip && match_info->gen <5 ) dev_priv->drm.driver_features &= ~DRIVER_ATOMIC ; +/* Check if we support fake LMEM -- enable for live selftests */ +if (INTEL_GEN (dev_priv) >=9 && i915_selftest.live && + intel_graphics_fake_lmem_res.start) { +mkwrite_device_info (dev_priv)->memory_regions = +REGION_SMEM |REGION_LMEM ; +GEM_BUG_ON (!HAS_LMEM (dev_priv)); + } + ret =pci_enable_device (pdev);if (ret) goto out_fini;
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -0
@@ -2747,6 +2747,9 @@ int i915_gem_init_memory_regions(struct drm_i915_private *i915)case INTEL_STOLEN : mem =i915_gem_stolen_setup (i915);break ; +case INTEL_LMEM : + mem =intel_setup_fake_lmem (i915); +break ; }if (IS_ERR (mem)) {
drivers/gpu/drm/i915/intel_memory_region.h +4 -0
@@ -9,6 +9,7 @@#include <linux/ioport.h> #include <linux/mutex.h> #include <linux/io-mapping.h> +#include <drm/drm_mm.h> #include "i915_buddy.h"
@@ -69,6 +70,9 @@ struct intel_memory_region {struct io_mapping iomap;struct resource region; +/* For faking for lmem */ +struct drm_mm_node fake_mappable; +struct i915_buddy_mm mm;struct mutex mm_lock;
drivers/gpu/drm/i915/intel_region_lmem.c +69 -0
87 lines not on this page · raw message
drivers/gpu/drm/i915/intel_region_lmem.h +5 -0
@@ -6,6 +6,11 @@#ifndef __INTEL_REGION_LMEM_H#define __INTEL_REGION_LMEM_H +struct drm_i915_private ; +extern const struct intel_memory_region_ops intel_region_lmem_ops; +struct intel_memory_region * +intel_setup_fake_lmem (struct drm_i915_private *i915); +#endif /* !__INTEL_REGION_LMEM_H */
include/drm/i915_drm.h +3 -0
@@ -39,6 +39,9 @@ bool i915_gpu_turbo_disable(void);/* Exported from arch/x86/kernel/early-quirks.c */ extern struct resource intel_graphics_stolen_res; +/* Exported from arch/x86/kernel/early-printk.c */ +extern struct resource intel_graphics_fake_lmem_res; +/* * The Bridge device's PCI config space has information about the * fb aperture size and the amount of pre-reserved memory.
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Introduce memory region concept (including device local memory) (rev3)
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: Introduce memory region concept (including device local memory) (rev3)
URL : https://patchwork.freedesktop.org/series/56683/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 45cebf7cea76 drm/i915: buddy allocator -:29: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #29: new file mode 100644
-:456: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #456: FILE: drivers/gpu/drm/i915/i915_buddy.c:423:
+ if (buddy && (i915_buddy_block_is_free(block) &&
+ i915_buddy_block_is_free(buddy)))
total: 0 errors, 1 warnings, 1 checks, 1303 lines checkedfe10a81166ca drm/i915: introduce intel_memory_region
-:59: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #59:
new file mode 100644
-:167: ERROR:SPACING: spaces required around that '=' (ctx:VxW) #167: FILE: drivers/gpu/drm/i915/gem/i915_gem_region.c:104:
+ obj->mm.region= mem;
^
-:580: WARNING:TYPO_SPELLING: 'UKNOWN' may be misspelled - perhaps 'UNKNOWN'? #580: FILE: drivers/gpu/drm/i915/intel_memory_region.h:33:
+ INTEL_MEMORY_UKNOWN, /* Should be last */
-:589: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'r' may be better as '(r)' to avoid precedence issues #589: FILE: drivers/gpu/drm/i915/intel_memory_region.h:42:
+#define MEMORY_TYPE_FROM_REGION(r) (ilog2(r >> INTEL_MEMORY_TYPE_SHIFT))
-:590: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'r' may be better as '(r)' to avoid precedence issues #590: FILE: drivers/gpu/drm/i915/intel_memory_region.h:43:
+#define MEMORY_INSTANCE_FROM_REGION(r) (ilog2(r & 0xffff))
-:602: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct intel_memory_region *' should also have an identifier name #602: FILE: drivers/gpu/drm/i915/intel_memory_region.h:55:
+ int (*init)(struct intel_memory_region *);
-:603: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct intel_memory_region *' should also have an identifier name #603: FILE: drivers/gpu/drm/i915/intel_memory_region.h:56:
+ void (*release)(struct intel_memory_region *);
-:605: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct intel_memory_region *' should also have an identifier name #605: FILE: drivers/gpu/drm/i915/intel_memory_region.h:58:
+ struct drm_i915_gem_object *
-:605: WARNING:FUNCTION_ARGUMENTS: function definition argument 'resource_size_t' should also have an identifier name #605: FILE: drivers/gpu/drm/i915/intel_memory_region.h:58:
+ struct drm_i915_gem_object *
-:605: WARNING:FUNCTION_ARGUMENTS: function definition argument 'unsigned int' should also have an identifier name #605: FILE: drivers/gpu/drm/i915/intel_memory_region.h:58:
+ struct drm_i915_gem_object *
-:620: CHECK:UNCOMMENTED_DEFINITION: struct mutex definition without comment #620: FILE: drivers/gpu/drm/i915/intel_memory_region.h:73:
+ struct mutex mm_lock;
-:639: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #639: FILE: drivers/gpu/drm/i915/intel_memory_region.h:92:
+__intel_memory_region_get_block_buddy(struct intel_memory_region *mem,
+ resource_size_t size);
-:641: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #641: FILE: drivers/gpu/drm/i915/intel_memory_region.h:94:
+void __intel_memory_region_put_pages_buddy(struct intel_memory_region *mem,
+ struct list_head *blocks);
-:739: WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'igt_mock_fill', this function's name, in a string #739: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:70:
+ pr_err("igt_mock_fill failed, space still left in region\n");
total: 1 errors, 8 warnings, 5 checks, 785 lines checkedbdd5924075d5 drm/i915/region: support basic eviction3ddf8bf0a6da drm/i915/region: support continuous allocations9f4b2e059975 drm/i915/region: support volatile objects929250f59fbd drm/i915: Add memory region information to device_info0aec24bbc1d0 drm/i915: support creating LMEM objects
-:35: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #35:
new file mode 100644
-:117: WARNING:TYPO_SPELLING: 'UKNOWN' may be misspelled - perhaps 'UNKNOWN'? #117: FILE: drivers/gpu/drm/i915/i915_drv.h:1374:
+ struct intel_memory_region *regions[INTEL_MEMORY_UKNOWN];
total: 0 errors, 2 warnings, 0 checks, 219 lines checked 50a84a2e349b drm/i915: setup io-mapping for LMEM
-:7: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one
total: 0 errors, 1 warnings, 0 checks, 34 lines checked d4a527f69e88 drm/i915/lmem: support kernel mapping
-:289: ERROR:CODE_INDENT: code indent should use tabs where possible #289: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:422:
+^I^I^I val);$
-:289: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #289: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:422:
+ pr_err("vaddr[%u]=%u, val=%u\n", dword, vaddr[dword],
+ val);
-:301: ERROR:CODE_INDENT: code indent should use tabs where possible #301: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:434:
+^I^I^I val ^ 0xdeadbeaf);$
-:301: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #301: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:434:
+ pr_err("vaddr[%u]=%u, val=%u\n", dword, vaddr[dword],
+ val ^ 0xdeadbeaf);
total: 2 errors, 0 warnings, 2 checks, 263 lines checked5059064ee270 drm/i915/blt: don't assume pinned intel_contextfc37f3d7563b drm/i915/blt: bump size restriction090251f6400a drm/i915/blt: support copying objects
-:14: ERROR:BAD_SIGN_OFF: Unrecognized email address: 'Abdiel Janulgue <[email protected]' #14:
Cc: Abdiel Janulgue <[email protected]
-:266: WARNING:LINE_SPACING: Missing a blank line after declarations #266: FILE: drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c:112:
+ struct rnd_state prng;
+ IGT_TIMEOUT(end);
-:383: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #383: FILE: drivers/gpu/drm/i915/gt/intel_gpu_commands.h:191:
+#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22))
^
-:383: CHECK:SPACING: spaces preferred around that '|' (ctx:VxV) #383: FILE: drivers/gpu/drm/i915/gt/intel_gpu_commands.h:191:
+#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22))
^
-:383: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #383: FILE: drivers/gpu/drm/i915/gt/intel_gpu_commands.h:191:
+#define SRC_COPY_BLT_CMD ((2<<29)|(0x43<<22))
^
-:384: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #384: FILE: drivers/gpu/drm/i915/gt/intel_gpu_commands.h:192:
+#define GEN9_XY_FAST_COPY_BLT_CMD ((2<<29)|(0x42<<22))
^
-:384: CHECK:SPACING: spaces preferred around that '|' (ctx:VxV) #384: FILE: drivers/gpu/drm/i915/gt/intel_gpu_commands.h:192:
+#define GEN9_XY_FAST_COPY_BLT_CMD ((2<<29)|(0x42<<22))
^
-:384: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #384: FILE: drivers/gpu/drm/i915/gt/intel_gpu_commands.h:192:
+#define GEN9_XY_FAST_COPY_BLT_CMD ((2<<29)|(0x42<<22))
^
-:385: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #385: FILE: drivers/gpu/drm/i915/gt/intel_gpu_commands.h:193:
+#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22))
^
-:385: CHECK:SPACING: spaces preferred around that '|' (ctx:VxV) #385: FILE: drivers/gpu/drm/i915/gt/intel_gpu_commands.h:193:
+#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22))
^
-:385: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #385: FILE: drivers/gpu/drm/i915/gt/intel_gpu_commands.h:193:
+#define XY_SRC_COPY_BLT_CMD ((2<<29)|(0x53<<22))
^
total: 1 errors, 1 warnings, 9 checks, 361 lines checked bf62f531f60f drm/i915/selftests: move gpu-write-dw into utils 4989df0d0989 drm/i915/selftests: add write-dword test for LMEM -:19: CHECK:LINE_SPACING: Please don't use multiple blank lines #19: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:10:
+
-:99: WARNING:LINE_SPACING: Missing a blank line after declarations #99: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:420:
+ struct intel_engine_cs *engine;
+ IGT_TIMEOUT(end_time);
-:174: WARNING:LINE_SPACING: Missing a blank line after declarations #174: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:509:
+ struct drm_file *file;
+ I915_RND_STATE(prng);
total: 0 errors, 2 warnings, 1 checks, 212 lines checked 31452d13f1ef drm/i915/selftest: extend coverage to include LMEM huge-pages -:7: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one
total: 0 errors, 1 warnings, 0 checks, 151 lines checked 0dda88a816db drm/i915/lmem: support CPU relocations -:77: CHECK:SPACING: No space is necessary after a cast #77: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1086:
+ io_mapping_unmap_atomic((void __force __iomem *) unmask_page(cache->vaddr));
total: 0 errors, 0 warnings, 1 checks, 93 lines checked476823e2dfab drm/i915/lmem: support pread
-:126: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct drm_i915_gem_object *' should also have an identifier name #126: FILE: drivers/gpu/drm/i915/gem/i915_gem_object_types.h:56:
+ int (*pread)(struct drm_i915_gem_object *,
total: 0 errors, 1 warnings, 0 checks, 120 lines checked 3dc5a995e357 drm/i915/lmem: support pwrite
-:78: ERROR:POINTER_LOCATION: "(foo*)" should be "(foo *)" #78: FILE: drivers/gpu/drm/i915/gem/i915_gem_lmem.c:154:
+ unwritten = __copy_from_user_inatomic_nocache((void __force*)vaddr + offset,
-:83: ERROR:POINTER_LOCATION: "(foo*)" should be "(foo *)" #83: FILE: drivers/gpu/drm/i915/gem/i915_gem_lmem.c:159:
+ unwritten = copy_from_user((void __force*)vaddr + offset,
-:106: CHECK:LINE_SPACING: Please don't use multiple blank lines #106: FILE: drivers/gpu/drm/i915/gem/i915_gem_lmem.c:182:
+
+
total: 2 errors, 0 warnings, 1 checks, 99 lines checked 8cef4e8292c8 drm/i915: enumerate and init each supported region -:61: WARNING:TYPO_SPELLING: 'UKNOWN' may be misspelled - perhaps 'UNKNOWN'? #61: FILE: drivers/gpu/drm/i915/i915_gem_gtt.c:2743:
+ for (i = 0; i < INTEL_MEMORY_UKNOWN; i++) {
total: 0 errors, 1 warnings, 0 checks, 121 lines checked 4420ad77a9a8 drm/i915: treat shmem as a region
-:7: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one
-:117: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #117: FILE: drivers/gpu/drm/i915/gem/i915_gem_shmem.c:444:
+static int __create_shmem(struct drm_i915_private *i915,
struct drm_gem_object *obj,
-:129: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #129: FILE: drivers/gpu/drm/i915/gem/i915_gem_shmem.c:467:
+ unsigned flags)
-:191: WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (8, 17) #191: FILE: drivers/gpu/drm/i915/gem/i915_gem_shmem.c:591:
+ if (err)
+ DRM_NOTE("Unable to create a private tmpfs mount, hugepage support will be disabled(%d).\n", err);
-:192: WARNING:LONG_LINE: line over 100 characters #192: FILE: drivers/gpu/drm/i915/gem/i915_gem_shmem.c:592:
+ DRM_NOTE("Unable to create a private tmpfs mount, hugepage support will be disabled(%d).\n", err);
total: 0 errors, 4 warnings, 1 checks, 375 lines checkeda2c084b617a0 drm/i915: treat stolen as a region7fb550b94b53 drm/i915: define HAS_MAPPABLE_APERTURE
-:20: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'dev_priv' may be better as '(dev_priv)' to avoid precedence issues #20: FILE: drivers/gpu/drm/i915/i915_drv.h:2172:
+#define HAS_MAPPABLE_APERTURE(dev_priv) (dev_priv->ggtt.mappable_end > 0)
total: 0 errors, 0 warnings, 1 checks, 8 lines checked 6f3470dbe430 drm/i915: do not map aperture if it is not available. -:40: CHECK:SPACING: No space is necessary after a cast #40: FILE: drivers/gpu/drm/i915/i915_gem_gtt.c:3000:
+ (struct resource) DEFINE_RES_MEM(pci_resource_start(pdev, 2),
total: 0 errors, 0 warnings, 1 checks, 55 lines checked e9dec3064027 drm/i915: set num_fence_regs to 0 if there is no aperture 2dae95da01cb drm/i915/selftests: check for missing aperture 2d04d6a50e01 drm/i915: error capture with no ggtt slot -:173: WARNING:LINE_SPACING: Missing a blank line after declarations #173: FILE: drivers/gpu/drm/i915/i915_gpu_error.c:1708:
+ const u64 slot = ggtt->error_capture.start;
+ ggtt->vm.clear_range(&ggtt->vm, slot, PAGE_SIZE);
total: 0 errors, 1 warnings, 0 checks, 148 lines checked 559fa027bdcc drm/i915: Don't try to place HWS in non-existing mappable region 4ff7107a6666 drm/i915: check for missing aperture in insert_mappable_node -:7: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one
total: 0 errors, 1 warnings, 0 checks, 9 lines checkeda1c8f77dca7b drm/i915: Allow i915 to manage the vma offset nodes instead of drm core -:220: ERROR:CODE_INDENT: code indent should use tabs where possible #220: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.c:608:
+^I mmo = container_of(node, struct i915_mmap_offset,$
-:374: ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar" #374: FILE: drivers/gpu/drm/i915/gem/i915_gem_object_types.h:71:
+ struct drm_i915_gem_object* obj;
-:469: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #469: FILE: drivers/gpu/drm/i915/gt/intel_reset.c:654:
+ unmap_mapping_range(gt->i915->drm.anon_inode->i_mapping,
drm_vma_node_offset_addr(node) + vma_offset,
total: 2 errors, 0 warnings, 1 checks, 480 lines checked 5ce8923f1dc9 drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET -:124: WARNING:SPACE_BEFORE_TAB: please, no space before tabs #124: FILE: include/uapi/drm/i915_drm.h:362:
+#define DRM_I915_GEM_MMAP_OFFSET ^IDRM_I915_GEM_MMAP_GTT$
-:132: WARNING:LONG_LINE: line over 100 characters #132: FILE: include/uapi/drm/i915_drm.h:425:
+#define DRM_IOCTL_I915_GEM_MMAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_OFFSET, struct drm_i915_gem_mmap_offset)
total: 0 errors, 2 warnings, 0 checks, 129 lines checked 5dee6ce33011 drm/i915/lmem: add helper to get CPU accessible offset f88e51d2a13d drm/i915: Add cpu and lmem fault handlers -:154: WARNING:LINE_SPACING: Missing a blank line after declarations #154: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.c:398:
+ struct page *page = i915_gem_object_get_page(obj, i);
+ vmf_ret = vmf_insert_pfn(area,
total: 0 errors, 1 warnings, 0 checks, 312 lines checked a4deb0ce590e drm/i915: cpu-map based dumb buffers
-:35: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #35: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.c:608:
+i915_gem_mmap_dumb(struct drm_file *file,
+ struct drm_device *dev,
-:100: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #100: FILE: drivers/gpu/drm/i915/i915_drv.h:2368:
+int i915_gem_mmap_dumb(struct drm_file *file_priv, struct drm_device *dev,
u32 handle, u64 *offset);
total: 0 errors, 0 warnings, 2 checks, 65 lines checked db03d958880f drm/i915: support basic object migration -:33: CHECK:LINE_SPACING: Please don't use multiple blank lines #33: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:175:
+
-:36: WARNING:LEADING_SPACE: please, no spaces at the start of a line #36: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:178:
+ int err;$
-:38: WARNING:LEADING_SPACE: please, no spaces at the start of a line #38: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:180:
+ lockdep_assert_held(&obj->base.dev->struct_mutex);$
-:40: WARNING:LEADING_SPACE: please, no spaces at the start of a line #40: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:182:
+ if (obj->mm.madv != I915_MADV_WILLNEED)$
-:40: WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (7, 15) #40: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:182:
+ if (obj->mm.madv != I915_MADV_WILLNEED)
+ return -EINVAL;
-:41: ERROR:CODE_INDENT: code indent should use tabs where possible #41: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:183:
+ return -EINVAL;$
-:41: WARNING:LEADING_SPACE: please, no spaces at the start of a line #41: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:183:
+ return -EINVAL;$
-:43: WARNING:LEADING_SPACE: please, no spaces at the start of a line #43: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:185:
+ if (i915_gem_object_needs_bit17_swizzle(obj))$
-:43: WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (7, 15) #43: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:185:
+ if (i915_gem_object_needs_bit17_swizzle(obj))
+ return -EINVAL;
-:44: ERROR:CODE_INDENT: code indent should use tabs where possible #44: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:186:
+ return -EINVAL;$
-:44: WARNING:LEADING_SPACE: please, no spaces at the start of a line #44: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:186:
+ return -EINVAL;$
-:46: WARNING:LEADING_SPACE: please, no spaces at the start of a line #46: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:188:
+ if (atomic_read(&obj->mm.pages_pin_count) >$
-:46: WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (7, 15) #46: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:188:
+ if (atomic_read(&obj->mm.pages_pin_count) >
[...]
+ return -EBUSY;
-:47: ERROR:CODE_INDENT: code indent should use tabs where possible #47: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:189:
+ atomic_read(&obj->bind_count))$
-:47: WARNING:LEADING_SPACE: please, no spaces at the start of a line #47: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:189:
+ atomic_read(&obj->bind_count))$
-:48: ERROR:CODE_INDENT: code indent should use tabs where possible #48: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:190:
+ return -EBUSY;$
-:48: WARNING:LEADING_SPACE: please, no spaces at the start of a line #48: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:190:
+ return -EBUSY;$
-:50: WARNING:LEADING_SPACE: please, no spaces at the start of a line #50: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:192:
+ if (obj->pin_global)$
-:50: WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (7, 15) #50: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:192:
+ if (obj->pin_global)
+ return -EBUSY;
-:51: ERROR:CODE_INDENT: code indent should use tabs where possible #51: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:193:
+ return -EBUSY;$
-:51: WARNING:LEADING_SPACE: please, no spaces at the start of a line #51: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:193:
+ return -EBUSY;$
-:53: WARNING:LEADING_SPACE: please, no spaces at the start of a line #53: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:195:
+ i915_gem_object_release_mmap(obj);$
-:55: WARNING:LEADING_SPACE: please, no spaces at the start of a line #55: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:197:
+ GEM_BUG_ON(obj->mm.mapping);$
-:56: WARNING:LEADING_SPACE: please, no spaces at the start of a line #56: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:198:
+ GEM_BUG_ON(obj->base.filp && mapping_mapped(obj->base.filp->f_mapping));$
-:58: WARNING:LEADING_SPACE: please, no spaces at the start of a line #58: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:200:
+ err = i915_gem_object_wait(obj,$
-:59: ERROR:CODE_INDENT: code indent should use tabs where possible #59: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:201:
+ I915_WAIT_INTERRUPTIBLE |$
-:59: WARNING:LEADING_SPACE: please, no spaces at the start of a line #59: FILE: drivers/gpu/drm/i915/gem/i915_gem_object.c:201:
+ I915_WAIT_INTERRUPTIBLE |$
-:60: ERROR:CODE_INDENT: code indent should use tabs where possible
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for Introduce memory region concept (including device local memory) (rev3)
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: Introduce memory region concept (including device local memory) (rev3)
URL : https://patchwork.freedesktop.org/series/56683/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915: buddy allocator +drivers/gpu/drm/i915/selftests/i915_buddy.c:292:13: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/i915_buddy.c:292:13: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/i915_buddy.c:647:24: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/i915_buddy.c:647:24: warning: expression using sizeof(void) +./include/linux/slab.h:672:13: error: not a function <noident> +./include/linux/slab.h:672:13: error: undefined identifier '__builtin_mul_overflow' +./include/linux/slab.h:672:13: warning: call with no type!
Commit: drm/i915: introduce intel_memory_region +drivers/gpu/drm/i915/gem/i915_gem_region.c:65:21: error: undefined identifier '__builtin_add_overflow_p' +drivers/gpu/drm/i915/gem/i915_gem_region.c:65:21: warning: call with no type!
Commit: drm/i915/region: support basic eviction
Okay!
Commit: drm/i915/region: support continuous allocations Okay!
Commit: drm/i915/region: support volatile objects
Okay!
Commit: drm/i915: Add memory region information to device_info Okay!
Commit: drm/i915: support creating LMEM objects
Okay!
Commit: drm/i915: setup io-mapping for LMEM
Okay!
Commit: drm/i915/lmem: support kernel mapping+drivers/gpu/drm/i915/gem/i915_gem_pages.c:176:42: expected void [noderef] <asn:2>*vaddr+drivers/gpu/drm/i915/gem/i915_gem_pages.c:176:42: got void *[assigned] ptr+drivers/gpu/drm/i915/gem/i915_gem_pages.c:176:42: warning: incorrect type in argument 1 (different address spaces)+drivers/gpu/drm/i915/gem/i915_gem_pages.c:253:51: expected void *+drivers/gpu/drm/i915/gem/i915_gem_pages.c:253:51: got void [noderef] <asn:2>*+drivers/gpu/drm/i915/gem/i915_gem_pages.c:253:51: warning: incorrect type in return expression (different address spaces)+drivers/gpu/drm/i915/gem/i915_gem_pages.c:334:42: expected void [noderef] <asn:2>*vaddr+drivers/gpu/drm/i915/gem/i915_gem_pages.c:334:42: got void *[assigned] ptr+drivers/gpu/drm/i915/gem/i915_gem_pages.c:334:42: warning: incorrect type in argument 1 (different address spaces)
Commit: drm/i915/blt: don't assume pinned intel_context Okay!
Commit: drm/i915/blt: bump size restriction
-+drivers/gpu/drm/i915/gem/i915_gem_object_blt.c:47:28: warning: expression using sizeof(void) +drivers/gpu/drm/i915/gem/i915_gem_object_blt.c:47:28: warning: expression using sizeof(void) +drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c:29:26: warning: expression using sizeof(void) +drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c:29:26: warning: expression using sizeof(void) +drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c:35:26: warning: expression using sizeof(void) +drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c:35:26: warning: expression using sizeof(void)
Commit: drm/i915/blt: support copying objects +drivers/gpu/drm/i915/gem/i915_gem_object_blt.c:214:28: warning: expression using sizeof(void) +drivers/gpu/drm/i915/gem/i915_gem_object_blt.c:214:28: warning: expression using sizeof(void) +drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c:120:26: warning: expression using sizeof(void) +drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c:120:26: warning: expression using sizeof(void)
Commit: drm/i915/selftests: move gpu-write-dw into utils Okay!
Commit: drm/i915/selftests: add write-dword test for LMEM Okay!
Commit: drm/i915/selftest: extend coverage to include LMEM huge-pages Okay!
Commit: drm/i915/lmem: support CPU relocations+drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1104:15: expected void *vaddr+drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1104:15: got void [noderef] <asn:2>*+drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1104:15: warning: incorrect type in assignment (different address spaces) -drivers/gpu/drm/i915/gem/i915_gem_execbuffer.o: warning: objtool: .altinstr_replacement+0x41: redundant UACCESS disable +drivers/gpu/drm/i915/gem/i915_gem_execbuffer.o: warning: objtool: .altinstr_replacement+0x43: redundant UACCESS disable
Commit: drm/i915/lmem: support pread
Okay!
Commit: drm/i915/lmem: support pwrite
Okay!
Commit: drm/i915: enumerate and init each supported region Okay!
Commit: drm/i915: treat shmem as a region
Okay!
Commit: drm/i915: treat stolen as a region
Okay!
Commit: drm/i915: define HAS_MAPPABLE_APERTURE
Okay!
Commit: drm/i915: do not map aperture if it is not available. Okay!
Commit: drm/i915: set num_fence_regs to 0 if there is no aperture Okay!
Commit: drm/i915/selftests: check for missing aperture Okay!
Commit: drm/i915: error capture with no ggtt slot+drivers/gpu/drm/i915/i915_gpu_error.c:1017:27: expected void *s+drivers/gpu/drm/i915/i915_gpu_error.c:1017:27: got void [noderef] <asn:2>*+drivers/gpu/drm/i915/i915_gpu_error.c:1017:27: warning: incorrect type in assignment (different address spaces)+drivers/gpu/drm/i915/i915_gpu_error.c:1019:49: expected void [noderef] <asn:2>*vaddr+drivers/gpu/drm/i915/i915_gpu_error.c:1019:49: got void *s+drivers/gpu/drm/i915/i915_gpu_error.c:1019:49: warning: incorrect type in argument 1 (different address spaces)
Commit: drm/i915: Don't try to place HWS in non-existing mappable region Okay!
Commit: drm/i915: check for missing aperture in insert_mappable_node Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Introduce memory region concept (including device local memory) (rev3)
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: Introduce memory region concept (including device local memory) (rev3)
URL : https://patchwork.freedesktop.org/series/56683/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_6670 -> Patchwork_13957
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_13957 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_13957, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_13957:
### IGT changes ###
#### Possible regressions ####
* igt@gem_mmap_gtt@basic-copy:
- fi-skl-gvtdvm: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-skl-gvtdvm/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-skl-gvtdvm/igt@[email protected]
- fi-kbl-8809g: [PASS][3] -> [DMESG-WARN][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-kbl-8809g/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-kbl-8809g/igt@[email protected]
- fi-kbl-7500u: [PASS][5] -> [DMESG-WARN][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-kbl-7500u/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-kbl-7500u/igt@[email protected]
- fi-hsw-peppy: [PASS][7] -> [DMESG-WARN][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-hsw-peppy/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-hsw-peppy/igt@[email protected]
- fi-bdw-gvtdvm: [PASS][9] -> [DMESG-WARN][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-bdw-gvtdvm/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-bdw-gvtdvm/igt@[email protected]
- fi-bxt-j4205: [PASS][11] -> [DMESG-WARN][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-bxt-j4205/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-bxt-j4205/igt@[email protected]
- fi-gdg-551: [PASS][13] -> [DMESG-WARN][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-gdg-551/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-gdg-551/igt@[email protected]
- fi-kbl-guc: [PASS][15] -> [DMESG-WARN][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-kbl-guc/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-kbl-guc/igt@[email protected]
- fi-pnv-d510: [PASS][17] -> [DMESG-WARN][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-pnv-d510/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-pnv-d510/igt@[email protected]
- fi-skl-6600u: [PASS][19] -> [DMESG-WARN][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-skl-6600u/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-skl-6600u/igt@[email protected]
- fi-bwr-2160: [PASS][21] -> [DMESG-WARN][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-bwr-2160/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-bwr-2160/igt@[email protected]
- fi-apl-guc: [PASS][23] -> [DMESG-WARN][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-apl-guc/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-apl-guc/igt@[email protected]
- fi-blb-e6850: [PASS][25] -> [DMESG-WARN][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-blb-e6850/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-blb-e6850/igt@[email protected]
* igt@gem_mmap_gtt@basic-write:
- fi-snb-2520m: [PASS][27] -> [DMESG-WARN][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-snb-2520m/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-snb-2520m/igt@[email protected]
* igt@i915_selftest@live_mman:
- fi-skl-6260u: [PASS][29] -> [INCOMPLETE][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-skl-6260u/igt@i915_selftest@live_mman.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-skl-6260u/igt@i915_selftest@live_mman.html
- fi-ilk-650: [PASS][31] -> [INCOMPLETE][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-ilk-650/igt@i915_selftest@live_mman.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-ilk-650/igt@i915_selftest@live_mman.html
- fi-hsw-4770: [PASS][33] -> [INCOMPLETE][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-hsw-4770/igt@i915_selftest@live_mman.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-hsw-4770/igt@i915_selftest@live_mman.html
- fi-cfl-guc: [PASS][35] -> [INCOMPLETE][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-cfl-guc/igt@i915_selftest@live_mman.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-cfl-guc/igt@i915_selftest@live_mman.html
- fi-skl-guc: [PASS][37] -> [INCOMPLETE][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-skl-guc/igt@i915_selftest@live_mman.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-skl-guc/igt@i915_selftest@live_mman.html
- fi-ivb-3770: [PASS][39] -> [INCOMPLETE][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-ivb-3770/igt@i915_selftest@live_mman.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-ivb-3770/igt@i915_selftest@live_mman.html
- fi-cfl-8700k: [PASS][41] -> [INCOMPLETE][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-cfl-8700k/igt@i915_selftest@live_mman.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-cfl-8700k/igt@i915_selftest@live_mman.html
- fi-hsw-4770r: [PASS][43] -> [INCOMPLETE][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-hsw-4770r/igt@i915_selftest@live_mman.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-hsw-4770r/igt@i915_selftest@live_mman.html
- fi-bsw-kefka: [PASS][45] -> [INCOMPLETE][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-bsw-kefka/igt@i915_selftest@live_mman.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-bsw-kefka/igt@i915_selftest@live_mman.html
- fi-bdw-5557u: [PASS][47] -> [INCOMPLETE][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-bdw-5557u/igt@i915_selftest@live_mman.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-bdw-5557u/igt@i915_selftest@live_mman.html
- fi-cfl-8109u: [PASS][49] -> [INCOMPLETE][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-cfl-8109u/igt@i915_selftest@live_mman.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-cfl-8109u/igt@i915_selftest@live_mman.html
- fi-skl-6700k2: [PASS][51] -> [INCOMPLETE][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-skl-6700k2/igt@i915_selftest@live_mman.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-skl-6700k2/igt@i915_selftest@live_mman.html
- fi-kbl-7567u: [PASS][53] -> [INCOMPLETE][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-kbl-7567u/igt@i915_selftest@live_mman.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-kbl-7567u/igt@i915_selftest@live_mman.html
- fi-kbl-x1275: [PASS][55] -> [INCOMPLETE][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-kbl-x1275/igt@i915_selftest@live_mman.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-kbl-x1275/igt@i915_selftest@live_mman.html
- fi-kbl-r: [PASS][57] -> [INCOMPLETE][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-kbl-r/igt@i915_selftest@live_mman.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-kbl-r/igt@i915_selftest@live_mman.html
- fi-skl-6770hq: [PASS][59] -> [INCOMPLETE][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-skl-6770hq/igt@i915_selftest@live_mman.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-skl-6770hq/igt@i915_selftest@live_mman.html
- fi-skl-lmem: [PASS][61] -> [INCOMPLETE][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-skl-lmem/igt@i915_selftest@live_mman.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-skl-lmem/igt@i915_selftest@live_mman.html
* igt@prime_vgem@basic-fence-mmap:
- fi-skl-iommu: [PASS][63] -> [DMESG-WARN][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-skl-iommu/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-skl-iommu/igt@[email protected]
- fi-byt-n2820: [PASS][65] -> [DMESG-WARN][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-byt-n2820/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-byt-n2820/igt@[email protected]
- fi-cml-u: [PASS][67] -> [DMESG-WARN][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-cml-u/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-cml-u/igt@[email protected]
- fi-whl-u: [PASS][69] -> [DMESG-WARN][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-whl-u/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-whl-u/igt@[email protected]
* igt@runner@aborted:
- fi-bdw-gvtdvm: NOTRUN -> [FAIL][71]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-bdw-gvtdvm/igt@[email protected]
- fi-gdg-551: NOTRUN -> [FAIL][72]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-gdg-551/igt@[email protected]
- fi-byt-n2820: NOTRUN -> [FAIL][73]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-byt-n2820/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_6670 and Patchwork_13957:
### New IGT tests (1) ###
* igt@i915_selftest@live_memory_region:
- Statuses :
- Exec time: [None] s
Known issues
------------
Here are the changes found in Patchwork_13957 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_mman:
- fi-bxt-dsi: [PASS][74] -> [INCOMPLETE][75] ([fdo#103927])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-bxt-dsi/igt@i915_selftest@live_mman.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-bxt-dsi/igt@i915_selftest@live_mman.html
- fi-snb-2600: [PASS][76] -> [INCOMPLETE][77] ([fdo#105411])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-snb-2600/igt@i915_selftest@live_mman.html
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-snb-2600/igt@i915_selftest@live_mman.html
- fi-cml-u2: [PASS][78] -> [INCOMPLETE][79] ([fdo#110566])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-cml-u2/igt@i915_selftest@live_mman.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-cml-u2/igt@i915_selftest@live_mman.html
- fi-icl-u3: [PASS][80] -> [INCOMPLETE][81] ([fdo#107713])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-icl-u3/igt@i915_selftest@live_mman.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-icl-u3/igt@i915_selftest@live_mman.html
- fi-glk-dsi: [PASS][82] -> [INCOMPLETE][83] ([fdo#103359] / [k.org#198133])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-glk-dsi/igt@i915_selftest@live_mman.html
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-glk-dsi/igt@i915_selftest@live_mman.html
- fi-icl-u2: [PASS][84] -> [INCOMPLETE][85] ([fdo#107713])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-icl-u2/igt@i915_selftest@live_mman.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-icl-u2/igt@i915_selftest@live_mman.html
- fi-elk-e7500: [PASS][86] -> [INCOMPLETE][87] ([fdo#103989])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-elk-e7500/igt@i915_selftest@live_mman.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-elk-e7500/igt@i915_selftest@live_mman.html
* igt@i915_selftest@live_requests:
- fi-byt-j1900: [PASS][88] -> [INCOMPLETE][89] ([fdo#102657])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-byt-j1900/igt@i915_selftest@live_requests.html
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-byt-j1900/igt@i915_selftest@live_requests.html
* igt@kms_addfb_basic@basic-x-tiled:
- fi-icl-u3: [PASS][90] -> [DMESG-WARN][91] ([fdo#107724])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-icl-u3/igt@[email protected]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-icl-u3/igt@[email protected]
#### Possible fixes ####
* igt@gem_cpu_reloc@basic:
- fi-icl-u3: [DMESG-WARN][92] ([fdo#107724]) -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-icl-u3/igt@[email protected]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-icl-u3/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: [WARN][94] ([fdo#109380]) -> [PASS][95]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-kbl-7567u/igt@[email protected]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-kbl-7567u/igt@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- {fi-icl-u4}: [FAIL][96] ([fdo#111045] / [fdo#111046 ]) -> [PASS][97]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-icl-u4/igt@[email protected]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-icl-u4/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- fi-kbl-7567u: [SKIP][98] ([fdo#109271]) -> [PASS][99] +23 similar issues
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6670/fi-kbl-7567u/igt@[email protected]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/fi-kbl-7567u/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102505]: https://bugs.freedesktop.org/show_bug.cgi?id=102505
[fdo#102657]: https://bugs.freedesktop.org/show_bug.cgi?id=102657
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#103989]: https://bugs.freedesktop.org/show_bug.cgi?id=103989
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[fdo#110566]: https://bugs.freedesktop.org/show_bug.cgi?id=110566
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111046 ]: https://bugs.freedesktop.org/show_bug.cgi?id=111046
[fdo#111049]: https://bugs.freedesktop.org/show_bug.cgi?id=111049
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (53 -> 47)
------------------------------
Additional (1): fi-bsw-n3050
Missing (7): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6670 -> Patchwork_13957
CI-20190529: 20190529
CI_DRM_6670: dca4867439f21c056afbde56cd4eb241b50f35d4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5127: f43f5fa12ac1b93febfe3eeb9e9985f5f3e2eff0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13957: 831689bfddf242d71360ea4b4ebd9ba847695bc5 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
831689bfddf2 HAX drm/i915: add the fake lmem region6b7bfa904b05 drm/i915/query: Expose memory regions through the query uAPI 89056818108b drm/i915: Introduce GEM_OBJECT_SETPARAM with I915_PARAM_MEMORY_REGION db03d958880f drm/i915: support basic object migrationa4deb0ce590e drm/i915: cpu-map based dumb buffersf88e51d2a13d drm/i915: Add cpu and lmem fault handlers5dee6ce33011 drm/i915/lmem: add helper to get CPU accessible offset 5ce8923f1dc9 drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSETa1c8f77dca7b drm/i915: Allow i915 to manage the vma offset nodes instead of drm core 4ff7107a6666 drm/i915: check for missing aperture in insert_mappable_node 559fa027bdcc drm/i915: Don't try to place HWS in non-existing mappable region 2d04d6a50e01 drm/i915: error capture with no ggtt slot2dae95da01cb drm/i915/selftests: check for missing aperture e9dec3064027 drm/i915: set num_fence_regs to 0 if there is no aperture 6f3470dbe430 drm/i915: do not map aperture if it is not available. 7fb550b94b53 drm/i915: define HAS_MAPPABLE_APERTUREa2c084b617a0 drm/i915: treat stolen as a region4420ad77a9a8 drm/i915: treat shmem as a region8cef4e8292c8 drm/i915: enumerate and init each supported region 3dc5a995e357 drm/i915/lmem: support pwrite476823e2dfab drm/i915/lmem: support pread0dda88a816db drm/i915/lmem: support CPU relocations31452d13f1ef drm/i915/selftest: extend coverage to include LMEM huge-pages 4989df0d0989 drm/i915/selftests: add write-dword test for LMEM bf62f531f60f drm/i915/selftests: move gpu-write-dw into utils 090251f6400a drm/i915/blt: support copying objectsfc37f3d7563b drm/i915/blt: bump size restriction5059064ee270 drm/i915/blt: don't assume pinned intel_context d4a527f69e88 drm/i915/lmem: support kernel mapping50a84a2e349b drm/i915: setup io-mapping for LMEM0aec24bbc1d0 drm/i915: support creating LMEM objects929250f59fbd drm/i915: Add memory region information to device_info 9f4b2e059975 drm/i915/region: support volatile objects3ddf8bf0a6da drm/i915/region: support continuous allocations bdd5924075d5 drm/i915/region: support basic evictionfe10a81166ca drm/i915: introduce intel_memory_region45cebf7cea76 drm/i915: buddy allocator
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13957/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dave Airlie
maintainerQuoted 10 lines · Matthew Auld
In preparation for upcoming devices with device local memory, introduce the concept of different memory regions, and a simple buddy allocator to manage them in i915.
One of the concerns raised from v1 was around not using enough of TTM, which is a fair criticism, so trying to get better alignment here is something we are investigating, though currently that is still WIP so in the meantime v3 still continues to push more of the low-level details forward, but not yet the TTM interactions.
Can we bump the TTM work up the ladder here, as is I'm not willing to accept any of this code upstream without some serious analysis, this isn't a case of me making a nice suggestion and you having the option to ignore it. Don't make me shout.
Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerQuoting Dave Airlie (2019-08-13 22:20:52)
Quoted 12 lines · Matthew Auld
Quoted 10 lines
In preparation for upcoming devices with device local memory, introduce the concept of different memory regions, and a simple buddy allocator to manage them in i915.
One of the concerns raised from v1 was around not using enough of TTM, which is a fair criticism, so trying to get better alignment here is something we are investigating, though currently that is still WIP so in the meantime v3 still continues to push more of the low-level details forward, but not yet the TTM interactions.
Quoted 4 lines
Can we bump the TTM work up the ladder here, as is I'm not willing to accept any of this code upstream without some serious analysis, this isn't a case of me making a nice suggestion and you having the option to ignore it. Don't make me shout.
Thanks for a reminder. TTM analysis was ongoing on the background and we now reserved enough time to conclude on how to best align with TTM in short-term and long-term.
We decided to bite the bullet and apply dma_resv as the outer-most locking in i915 codepaths to align with the TTM locking. As a conclusion to those discussions we documented guidelines how to align with TTM locking:
https://patchwork.freedesktop.org/patch/328266/
As refactoring of locking fundamentals of the driver is a massive undergoing with many opens along the path, we'd like to propose a staged approach to avoid stalling the upstream work while it's being done.
Our first suggested step would be merging the i915 local memory related internal code reworks to unblock the display work. This step should not cause any conflicts with TTM.
Following step would be to merge proposed memory allocation/ management uAPIs with TTM related functionality behind them for early debug. They would be protected by DRM_I915_DEBUG_EARLY_API kernel config flag (depending on EXPERT & STAGING & BROKEN).
This would allow us to keep debugging these new IOCTLs with Mesa etc. while we rework the locking. The protection still leaving us a possibility to correcting the uAPIs if/when there is need after reworking the locking around dma_resv progresses. Draft of such proposal here:
https://patchwork.freedesktop.org/patch/327908/
The final step (a rather long one) would be then to complete the locking rework in the driver and lift the DEBUG_EARLY_API protection once the locking has been sorted.
If you could confirm the above plan sounds reasonable to you, we may then proceed with it.
Regards, Joonas
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerQuoted 50 lines · Joonas Lahtinen
Quoting Dave Airlie (2019-08-13 22:20:52)
Quoted 12 lines · Matthew Auld
Quoted 10 lines
In preparation for upcoming devices with device local memory, introduce the concept of different memory regions, and a simple buddy allocator to manage them in i915.
One of the concerns raised from v1 was around not using enough of TTM, which is a fair criticism, so trying to get better alignment here is something we are investigating, though currently that is still WIP so in the meantime v3 still continues to push more of the low-level details forward, but not yet the TTM interactions.
Quoted 4 lines
Can we bump the TTM work up the ladder here, as is I'm not willing to accept any of this code upstream without some serious analysis, this isn't a case of me making a nice suggestion and you having the option to ignore it. Don't make me shout.
Thanks for a reminder. TTM analysis was ongoing on the background and we now reserved enough time to conclude on how to best align with TTM in short-term and long-term.
We decided to bite the bullet and apply
dma_resvas the outer-most locking in i915 codepaths to align with the TTM locking. As a conclusion to those discussions we documented guidelines how to align with TTM locking:https://patchwork.freedesktop.org/patch/328266/
As refactoring of locking fundamentals of the driver is a massive undergoing with many opens along the path, we'd like to propose a staged approach to avoid stalling the upstream work while it's being done.
Our first suggested step would be merging the i915 local memory related internal code reworks to unblock the display work. This step should not cause any conflicts with TTM.
Following step would be to merge proposed memory allocation/ management uAPIs with TTM related functionality behind them for early debug. They would be protected by
DRM_I915_DEBUG_EARLY_APIkernel config flag (depending on EXPERT & STAGING & BROKEN).This would allow us to keep debugging these new IOCTLs with Mesa etc. while we rework the locking. The protection still leaving us a possibility to correcting the uAPIs if/when there is need after reworking the locking around
dma_resvprogresses. Draft of such proposal here:
Quoted 8 lines
https://patchwork.freedesktop.org/patch/327908/
The final step (a rather long one) would be then to complete the locking rework in the driver and lift the
DEBUG_EARLY_APIprotection once the locking has been sorted.If you could confirm the above plan sounds reasonable to you, we may then proceed with it.
Just travelling, but this sounds like a good way foward to me.
Dave.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel