LMEM basics
Subsystems (5)
v2 cover LMEM basics
The basic LMEM bits, minus the uAPI, pruning, etc. The goal is to support basic LMEM object creation within the kernel. From there we can start with the dumb buffer support, and then the other display related bits.
Abdiel Janulgue (4):
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
CQ Tang (1):
drm/i915/stolen: make the object creation interface consistent
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 (12):
drm/i915: introduce intel_memory_region drm/i915/region: support contiguous allocations drm/i915/region: support volatile objects
drm/i915: support creating LMEM objects drm/i915/selftests: add write-dword test for LMEM drm/i915/selftests: extend coverage to include LMEM huge-pages drm/i915: treat shmem as a region
drm/i915: treat stolen as a region
drm/i915: don't allocate the ring in stolen if we lack aperture drm/i915/selftests: fallback to using the gpu to trash stolen drm/i915/selftests: check for missing aperture
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 | 4 + drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 4 +- drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_internal.c | 17 +- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 70 ++ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 31 + drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 + .../gpu/drm/i915/gem/i915_gem_object_types.h | 29 +- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 28 +- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 5 +- drivers/gpu/drm/i915/gem/i915_gem_region.c | 168 +++++ drivers/gpu/drm/i915/gem/i915_gem_region.h | 29 + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 68 +- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 100 ++- drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 3 +- .../gpu/drm/i915/gem/selftests/huge_pages.c | 213 +++++- .../i915/gem/selftests/i915_gem_coherency.c | 5 +- .../drm/i915/gem/selftests/i915_gem_mman.c | 6 + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- drivers/gpu/drm/i915/gt/intel_rc6.c | 4 +- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 6 +- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 14 +- drivers/gpu/drm/i915/i915_drv.c | 8 + drivers/gpu/drm/i915/i915_drv.h | 15 + drivers/gpu/drm/i915/i915_gem.c | 9 - drivers/gpu/drm/i915/i915_gem_fence_reg.c | 6 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 119 +++- drivers/gpu/drm/i915/i915_gpu_error.c | 65 +- drivers/gpu/drm/i915/i915_pci.c | 29 +- drivers/gpu/drm/i915/intel_device_info.h | 2 + drivers/gpu/drm/i915/intel_memory_region.c | 212 ++++++ drivers/gpu/drm/i915/intel_memory_region.h | 125 ++++ drivers/gpu/drm/i915/intel_region_lmem.c | 157 +++++ drivers/gpu/drm/i915/intel_region_lmem.h | 16 + drivers/gpu/drm/i915/selftests/i915_gem.c | 95 ++- 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 | 1 + .../drm/i915/selftests/intel_memory_region.c | 617 ++++++++++++++++++ .../gpu/drm/i915/selftests/mock_gem_device.c | 9 +- drivers/gpu/drm/i915/selftests/mock_region.c | 59 ++ drivers/gpu/drm/i915/selftests/mock_region.h | 16 + include/drm/i915_drm.h | 3 + 46 files changed, 2253 insertions(+), 163 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/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/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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/22 drm/i915/stolen: make the object creation interface consistent
From: CQ Tang <[email protected]>
Our other backends return an actual error value upon failure. Do the same for stolen objects, which currently just return NULL on failure.
--- drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 4 +-- drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 36 +++++++++++--------- drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- drivers/gpu/drm/i915/gt/intel_rc6.c | 4 +-- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 2 +- 7 files changed, 28 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +1 -1
@@ -3071,7 +3071,7 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc, base_aligned, size_aligned);mutex_unlock (&dev->struct_mutex); -if (!obj) +if (IS_ERR (obj))return false;switch (plane_config->tiling) {
drivers/gpu/drm/i915/display/intel_fbdev.c +2 -2
@@ -141,10 +141,10 @@ static int intelfb_alloc(struct drm_fb_helper *helper,/* If the FB is too big, just don't use it since fbdev is not very * important and we should probably use that space with FBC or other * features. */ - obj =NULL ; + obj =ERR_PTR (-ENODEV );if (size *2 < dev_priv->stolen_usable_size) obj =i915_gem_object_create_stolen (dev_priv, size); -if (obj ==NULL ) +if (IS_ERR (obj)) obj =i915_gem_object_create_shmem (dev_priv, size);if (IS_ERR (obj)) {DRM_ERROR ("failed to allocate framebuffer\n" );
drivers/gpu/drm/i915/display/intel_overlay.c +1 -1
@@ -1306,7 +1306,7 @@ static int get_registers(struct intel_overlay *overlay, bool use_phys)mutex_lock (&i915->drm.struct_mutex); obj =i915_gem_object_create_stolen (i915,PAGE_SIZE ); -if (obj ==NULL ) +if (IS_ERR (obj)) obj =i915_gem_object_create_internal (i915,PAGE_SIZE );if (IS_ERR (obj)) { err =PTR_ERR (obj);
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +20 -16
@@ -585,28 +585,32 @@ i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,int ret;if (!drm_mm_initialized (&dev_priv->mm.stolen)) -return NULL ; +return ERR_PTR (-ENODEV );if (size ==0 ) -return NULL ; +return ERR_PTR (-EINVAL ); stolen =kzalloc (sizeof (*stolen),GFP_KERNEL );if (!stolen) -return NULL ; +return ERR_PTR (-ENOMEM ); ret =i915_gem_stolen_insert_node (dev_priv, stolen, size,4096 ); -if (ret) { -kfree (stolen); -return NULL ; - } +if (ret) + goto err_free; obj =_i915_gem_object_create_stolen (dev_priv, stolen); -if (obj) -return obj; +if (obj ==NULL ) { + ret = -ENOMEM ; + goto err_remove; + } +return obj; + +err_remove:i915_gem_stolen_remove_node (dev_priv, stolen); +err_free:kfree (stolen); -return NULL ; +return ERR_PTR (ret); } struct drm_i915_gem_object *
@@ -622,7 +626,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_privint ret;if (!drm_mm_initialized (&dev_priv->mm.stolen)) -return NULL ; +return ERR_PTR (-ENODEV );lockdep_assert_held (&dev_priv->drm.struct_mutex);
@@ -633,11 +637,11 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_privif (WARN_ON (size ==0 ) ||WARN_ON (!IS_ALIGNED (size,I915_GTT_PAGE_SIZE )) ||WARN_ON (!IS_ALIGNED (stolen_offset,I915_GTT_MIN_ALIGNMENT ))) -return NULL ; +return ERR_PTR (-EINVAL ); stolen =kzalloc (sizeof (*stolen),GFP_KERNEL );if (!stolen) -return NULL ; +return ERR_PTR (-ENOMEM ); stolen->start = stolen_offset; stolen->size = size;
@@ -647,7 +651,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_privif (ret) {DRM_DEBUG_DRIVER ("failed to allocate stolen space\n" );kfree (stolen); -return NULL ; +return ERR_PTR (ret); } obj =_i915_gem_object_create_stolen (dev_priv, stolen);
@@ -655,7 +659,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_privDRM_DEBUG_DRIVER ("failed to allocate stolen object\n" );i915_gem_stolen_remove_node (dev_priv, stolen);kfree (stolen); -return NULL ; +return ERR_PTR (-ENOMEM ); }/* Some objects just need physical mem from stolen space */
@@ -704,5 +708,5 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_privi915_gem_object_unpin_pages (obj); err:i915_gem_object_put (obj); -return NULL ; +return ERR_PTR (ret); }
drivers/gpu/drm/i915/gt/intel_gt.c +1 -1
@@ -331,7 +331,7 @@ static int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)int ret; obj =i915_gem_object_create_stolen (i915, size); -if (!obj) +if (IS_ERR (obj)) obj =i915_gem_object_create_internal (i915, size);if (IS_ERR (obj)) {DRM_ERROR ("Failed to allocate scratch page\n" );
drivers/gpu/drm/i915/gt/intel_rc6.c +2 -2
@@ -299,7 +299,7 @@ static int vlv_rc6_init(struct intel_rc6 *rc6) pcbr_offset,I915_GTT_OFFSET_NONE , pctx_size); -if (!pctx) +if (IS_ERR (pctx))return -ENOMEM ; goto out;
@@ -316,7 +316,7 @@ static int vlv_rc6_init(struct intel_rc6 *rc6)* memory, or any other relevant ranges. */ pctx =i915_gem_object_create_stolen (i915, pctx_size); -if (!pctx) { +if (IS_ERR (pctx)) {DRM_DEBUG ("not enough stolen space for PCTX, disabling\n" );return -ENOMEM ; }
drivers/gpu/drm/i915/gt/intel_ringbuffer.c +1 -1
@@ -1274,7 +1274,7 @@ static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size)struct i915_vma *vma; obj =i915_gem_object_create_stolen (i915, size); -if (!obj) +if (IS_ERR (obj)) obj =i915_gem_object_create_internal (i915, size);if (IS_ERR (obj))return ERR_CAST (obj);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/22 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 | 134 ++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_region.h | 28 +++ .../gpu/drm/i915/gem/selftests/huge_pages.c | 73 +++++++ drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_memory_region.c | 191 ++++++++++++++++++ drivers/gpu/drm/i915/intel_memory_region.h | 83 ++++++++ .../drm/i915/selftests/i915_mock_selftests.h | 1 + .../drm/i915/selftests/intel_memory_region.c | 118 +++++++++++ .../gpu/drm/i915/selftests/mock_gem_device.c | 1 + drivers/gpu/drm/i915/selftests/mock_region.c | 59 ++++++ drivers/gpu/drm/i915/selftests/mock_region.h | 16 ++ 13 files changed, 716 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 \
@@ -119,6 +120,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
@@ -159,6 +159,15 @@ struct drm_i915_gem_object {atomic_t pages_pin_count;atomic_t shrink_pin; +/** +* 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 +134 -0
134 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_region.h new file +28 -0
@@ -0,0 +1,28 @@ +/* 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); +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, +resource_size_t size, +unsigned int flags); + +#endif
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +73 -0
97 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -85,6 +85,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 +191 -0
191 lines not on this page · raw message
drivers/gpu/drm/i915/intel_memory_region.h new file +83 -0
83 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 +118 -0
118 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 +59 -0
59 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
PATCH v2 3/22 drm/i915/region: support contiguous allocations
In reply to Matthew AuldSome kernel internal objects may need to be allocated as a contiguous block, also thinking ahead the various kernel io_mapping interfaces seem to expect it, although this is purely a limitation in the kernel API...so perhaps something to be improved.
--- .../gpu/drm/i915/gem/i915_gem_object_types.h | 4 + drivers/gpu/drm/i915/gem/i915_gem_region.c | 15 +- drivers/gpu/drm/i915/gem/i915_gem_region.h | 3 +- .../gpu/drm/i915/gem/selftests/huge_pages.c | 63 ++++--- drivers/gpu/drm/i915/intel_memory_region.c | 9 +- drivers/gpu/drm/i915/intel_memory_region.h | 3 +- .../drm/i915/selftests/intel_memory_region.c | 165 ++++++++++++++++++ drivers/gpu/drm/i915/selftests/mock_region.c | 2 +- 8 files changed, 229 insertions(+), 35 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +4 -0
@@ -118,6 +118,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 +12 -3
@@ -23,10 +23,10 @@ i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj) {struct intel_memory_region *mem = obj->mm.region;struct list_head *blocks = &obj->mm.blocks; -unsigned int flags =I915_ALLOC_MIN_PAGE_SIZE ;resource_size_t size = obj->base.size;resource_size_t prev_end;struct i915_buddy_block *block; +unsigned int flags;struct sg_table *st;struct scatterlist *sg;unsigned int sg_page_sizes;
@@ -42,6 +42,10 @@ i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj)return -ENOMEM ; } + flags =I915_ALLOC_MIN_PAGE_SIZE ; +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;
@@ -56,7 +60,8 @@ i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj)list_for_each_entry (block, blocks, link) {u64 block_size, offset; - block_size =i915_buddy_block_size (&mem->mm, block); + block_size =min_t (u64, size, +i915_buddy_block_size (&mem->mm, block)); offset =i915_buddy_block_offset (block);GEM_BUG_ON (overflows_type (block_size, sg->length));
@@ -98,10 +103,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 =intel_memory_region_get (mem); + obj->flags = flags; }void i915_gem_object_release_memory_region (struct drm_i915_gem_object *obj)
@@ -116,6 +123,8 @@ i915_gem_object_create_region(struct intel_memory_region *mem, {struct drm_i915_gem_object *obj; +GEM_BUG_ON (flags & ~I915_BO_ALLOC_FLAGS ); +if (!mem)return ERR_PTR (-ENODEV );
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/gem/selftests/huge_pages.c +35 -28
82 lines not on this page · raw message
drivers/gpu/drm/i915/intel_memory_region.c +8 -1
@@ -47,8 +47,8 @@ __intel_memory_region_get_pages_buddy(struct intel_memory_region *mem,unsigned int flags, struct list_head *blocks) { - unsigned long n_pages = size >> ilog2(mem->mm.chunk_size); unsigned int min_order = 0; +unsigned long n_pages;GEM_BUG_ON (!IS_ALIGNED (size, mem->mm.chunk_size));GEM_BUG_ON (!list_empty (blocks));
@@ -58,6 +58,13 @@ __intel_memory_region_get_pages_buddy(struct intel_memory_region *mem,ilog2 (mem->mm.chunk_size); } +if (flags &I915_ALLOC_CONTIGUOUS ) { + size =roundup_pow_of_two (size); + min_order =ilog2 (size) -ilog2 (mem->mm.chunk_size); + } + + n_pages = size >>ilog2 (mem->mm.chunk_size); +mutex_lock (&mem->mm_lock); do {
drivers/gpu/drm/i915/intel_memory_region.h +2 -1
@@ -18,7 +18,8 @@ struct drm_i915_gem_object;struct intel_memory_region ;struct sg_table ; -#define I915_ALLOC_MIN_PAGE_SIZE BIT(0) +#define I915_ALLOC_MIN_PAGE_SIZE BIT(0) +#define I915_ALLOC_CONTIGUOUS BIT(1)struct intel_memory_region_ops {unsigned int flags;
drivers/gpu/drm/i915/selftests/intel_memory_region.c +165 -0
181 lines not on this page · raw message
drivers/gpu/drm/i915/selftests/mock_region.c +1 -1
@@ -36,7 +36,7 @@ mock_object_create(struct intel_memory_region *mem,i915_gem_object_set_cache_coherency (obj,I915_CACHE_NONE ); -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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/22 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. This is limited to kernel internal objects.
--- 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 | 9 ++++++++- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 6 ++++++ drivers/gpu/drm/i915/gem/i915_gem_region.c | 13 +++++++++++++ drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 12 ++++-------- drivers/gpu/drm/i915/intel_memory_region.c | 4 ++++ drivers/gpu/drm/i915/intel_memory_region.h | 5 +++++ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 5 ++--- 9 files changed, 57 insertions(+), 20 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 +8 -1
@@ -120,7 +120,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
@@ -171,6 +172,12 @@ struct drm_i915_gem_object {* List of memory region blocks allocated for this object. */ struct list_head blocks; +/** +* Element within memory_region->objects or region->purgeable +* if the object is marked as DONTNEED. Access is protected by +* region->obj_lock. +*/ +struct list_head region_link;struct sg_table *pages;void *mapping;
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 ;
@@ -160,6 +163,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 +13 -0
@@ -109,10 +109,23 @@ void i915_gem_object_init_memory_region(struct drm_i915_gem_object *obj,INIT_LIST_HEAD (&obj->mm.blocks); obj->mm.region =intel_memory_region_get (mem); obj->flags = flags; + +mutex_lock (&mem->obj_lock); + +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); }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); +intel_memory_region_put (obj->mm.region); }
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/intel_memory_region.c +4 -0
@@ -152,6 +152,10 @@ intel_memory_region_create(struct drm_i915_private *i915, mem->min_page_size = min_page_size; mem->ops = ops; +mutex_init (&mem->obj_lock); +INIT_LIST_HEAD (&mem->objects); +INIT_LIST_HEAD (&mem->purgeable); +mutex_init (&mem->mm_lock);if (ops->init) {
drivers/gpu/drm/i915/intel_memory_region.h +5 -0
@@ -52,6 +52,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/i915_gem_gtt.c +2 -3
@@ -91,8 +91,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 ;
@@ -104,7 +102,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 = {
@@ -131,6 +128,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 ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/22 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
@@ -2163,6 +2163,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
@@ -160,6 +160,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 pipe_mask;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/22 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_memory_region.c | 10 +++++ drivers/gpu/drm/i915/intel_memory_region.h | 30 +++++++++++++ drivers/gpu/drm/i915/intel_region_lmem.c | 43 ++++++++++++++++++ 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 +++++++++++++++++++ 10 files changed, 201 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
@@ -116,6 +116,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 \
@@ -144,6 +145,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->mm.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
@@ -100,6 +100,8 @@#include "i915_vma.h" #include "i915_irq.h" +#include "intel_region_lmem.h" +#include "intel_gvt.h" /* General customization:
@@ -679,6 +681,8 @@ struct i915_gem_mm {*/ struct vfsmount *gemfs; +struct intel_memory_region *regions[INTEL_MEMORY_UKNOWN ]; +struct notifier_block oom_notifier;struct notifier_block vmap_notifier;struct shrinker shrinker;
@@ -2164,6 +2168,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_memory_region.c +10 -0
@@ -6,6 +6,16 @@#include "intel_memory_region.h" #include "i915_drv.h" +/* XXX: Hysterical raisins. BIT(inst) needs to just be (inst) at some point. */ +#define REGION_MAP (type, inst) \ + BIT((type) + INTEL_MEMORY_TYPE_SHIFT) | BIT(inst) + +const u32 intel_region_map[] = { + [INTEL_MEMORY_SMEM ] =REGION_MAP (INTEL_SMEM ,0 ), + [INTEL_MEMORY_LMEM ] =REGION_MAP (INTEL_LMEM ,0 ), + [INTEL_MEMORY_STOLEN ] =REGION_MAP (INTEL_STOLEN ,0 ), +}; +static u64 intel_memory_region_free_pages (struct intel_memory_region *mem,struct list_head *blocks)
drivers/gpu/drm/i915/intel_memory_region.h +30 -0
@@ -18,9 +18,39 @@ struct drm_i915_gem_object;struct intel_memory_region ;struct sg_table ; +/** +* Base memory type +*/ +enum intel_memory_type { +INTEL_SMEM =0 , +INTEL_LMEM , +INTEL_STOLEN , +}; + +enum intel_region_id { +INTEL_MEMORY_SMEM =0 , +INTEL_MEMORY_LMEM , +INTEL_MEMORY_STOLEN , +INTEL_MEMORY_UKNOWN ,/* Should be last */ +}; + +#define REGION_SMEM BIT(INTEL_MEMORY_SMEM) +#define REGION_LMEM BIT(INTEL_MEMORY_LMEM) +#define REGION_STOLEN BIT(INTEL_MEMORY_STOLEN) + +#define INTEL_MEMORY_TYPE_SHIFT 16 + +#define MEMORY_TYPE_FROM_REGION (r) (ilog2(r >> INTEL_MEMORY_TYPE_SHIFT)) +#define MEMORY_INSTANCE_FROM_REGION (r) (ilog2(r & 0xffff)) +#define I915_ALLOC_MIN_PAGE_SIZE BIT(0)#define I915_ALLOC_CONTIGUOUS BIT(1) +/** +* Memory regions encoded as type | instance +*/ +extern const u32 intel_region_map[]; +struct intel_memory_region_ops {unsigned int flags;
drivers/gpu/drm/i915/intel_region_lmem.c new file +43 -0
43 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
@@ -32,6 +32,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
PATCH v2 7/22 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
@@ -36,8 +36,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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 8/22 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_lmem.c | 36 ++++++ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 8 ++ .../gpu/drm/i915/gem/i915_gem_object_types.h | 9 +- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 22 +++- .../drm/i915/selftests/intel_memory_region.c | 118 ++++++++++++++++++ 5 files changed, 185 insertions(+), 8 deletions(-)
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_HAS_IOMEM , + .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_types.h +5 -4
@@ -30,10 +30,11 @@ struct i915_lut_handle {struct drm_i915_gem_object_ops {unsigned int flags;#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_NO_GGTT BIT(3) -#define I915_GEM_OBJECT_ASYNC_CANCEL BIT(4) +#define I915_GEM_OBJECT_HAS_IOMEM BIT(1) +#define I915_GEM_OBJECT_IS_SHRINKABLE BIT(2) +#define I915_GEM_OBJECT_IS_PROXY BIT(3) +#define I915_GEM_OBJECT_NO_GGTT BIT(4) +#define I915_GEM_OBJECT_ASYNC_CANCEL BIT(5)/* 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 +18 -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,
@@ -172,7 +173,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));
@@ -231,7 +234,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 ;
@@ -244,6 +247,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));
@@ -285,11 +295,13 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj, enum i915_map_type type) {enum i915_map_type has_type; +unsigned int flags;bool pinned;void *ptr;int err; -if (unlikely (!i915_gem_object_has_struct_page (obj))) + flags =I915_GEM_OBJECT_HAS_STRUCT_PAGE |I915_GEM_OBJECT_HAS_IOMEM ; +if (!i915_gem_object_type_has (obj, flags))return ERR_PTR (-ENXIO ); err =mutex_lock_interruptible (&obj->mm.lock);
@@ -321,7 +333,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/selftests/intel_memory_region.c +118 -0
138 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 v2 9/22 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 | 171 ++++++++++++++++++ 1 file changed, 171 insertions(+)
drivers/gpu/drm/i915/selftests/intel_memory_region.c +171 -0
@@ -7,13 +7,16 @@#include "../i915_selftest.h" +#include "mock_drm.h" #include "mock_gem_device.h" #include "mock_region.h" +#include "gem/i915_gem_context.h" #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"
@@ -255,6 +258,125 @@ static int igt_mock_contiguous(void *arg)return err; } +static int igt_gpu_write_dw (struct intel_context *ce, +struct i915_vma *vma, +u32 dword, +u32 value) +{ +return igt_gpu_fill_dw (ce, vma, 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; +struct i915_gem_engines *engines; +struct i915_gem_engines_iter it; +struct intel_context *ce; +I915_RND_STATE (prng); +IGT_TIMEOUT (end_time); +unsigned int count; +struct i915_vma *vma; +int *order; +int i, n; +int err =0 ; + +GEM_BUG_ON (!i915_gem_object_has_pinned_pages (obj)); + + n =0 ; + count =0 ; +for_each_gem_engine (ce,i915_gem_context_lock_engines (ctx), it) { + count++; +if (!intel_engine_can_store_dword (ce->engine)) +continue ; + + n++; + } +i915_gem_context_unlock_engines (ctx); +if (!n) +return 0 ; + + order =i915_random_order (count * count, &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 ; + engines =i915_gem_context_lock_engines (ctx); +do { +u32 rng =prandom_u32_state (&prng); +u32 dword =offset_in_page (rng) /4 ; + + ce = engines->engines[order[i] % engines->num_engines]; + i = (i +1 ) % (count * count); +if (!ce || !intel_engine_can_store_dword (ce->engine)) +continue ; + + err =igt_gpu_write_dw (ce, vma, dword, rng); +if (err) +break ; + + err =igt_cpu_check (obj, dword, rng); +if (err) +break ; + }while (!__igt_timeout (end_time,NULL )); +i915_gem_context_unlock_engines (ctx); + +out_free: +kfree (order); + +if (err == -ENOMEM ) + err =0 ; + +return err; +} +static int igt_lmem_create (void *arg) {struct drm_i915_private *i915 = arg;
@@ -276,6 +398,54 @@ 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; + } + + 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;
@@ -427,6 +597,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 v2 10/22 drm/i915/selftests: 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"
@@ -971,7 +972,7 @@ static int gpu_write(struct intel_context *ce, 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;
@@ -1003,6 +1004,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 intel_context *ce, struct drm_i915_gem_object *obj, u64 size, u64 offset,
@@ -1387,6 +1433,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;
@@ -1743,6 +1861,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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 11/22 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
@@ -2387,6 +2387,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);
@@ -218,6 +220,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
PATCH v2 12/22 drm/i915: treat shmem as a region
In reply to Matthew Auld--- drivers/gpu/drm/i915/gem/i915_gem_phys.c | 5 +- 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.h | 2 + drivers/gpu/drm/i915/i915_gem.c | 9 --- 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 +- 8 files changed, 95 insertions(+), 41 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_phys.c +4 -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,10 @@ 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); +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,
@@ -146,11 +147,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.h +2 -0
@@ -2256,6 +2256,8 @@ 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 +0 -9
@@ -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"
@@ -1538,16 +1537,10 @@ static void i915_gem_init__mm(struct drm_i915_private *i915)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); }void i915_gem_cleanup_early (struct drm_i915_private *dev_priv)
@@ -1556,8 +1549,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
@@ -2780,7 +2780,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
@@ -151,6 +151,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, \
@@ -168,7 +171,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), \
@@ -185,7 +189,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 ,
@@ -219,7 +224,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 ,
@@ -304,7 +310,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 ,
@@ -354,7 +361,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 ,
@@ -384,7 +392,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, \
@@ -432,7 +441,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, \
@@ -493,6 +503,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 \
@@ -587,6 +598,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 \
@@ -661,7 +673,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);
@@ -218,8 +218,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 v2 13/22 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_stolen.c | 66 +++++++++++++++++++--- 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 +- 4 files changed, 62 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +57 -9
@@ -10,6 +10,7 @@#include <drm/drm_mm.h> #include <drm/i915_drm.h> +#include "gem/i915_gem_region.h" #include "i915_drv.h" #include "i915_gem_stolen.h"
@@ -150,7 +151,7 @@ static int i915_adjust_stolen(struct drm_i915_private *dev_priv,return 0 ; } -void i915_gem_cleanup_stolen (struct drm_i915_private *dev_priv) +static void i915_gem_cleanup_stolen (struct drm_i915_private *dev_priv) {if (!drm_mm_initialized (&dev_priv->mm.stolen))return ;
@@ -355,7 +356,7 @@ static void icl_get_stolen_reserved(struct drm_i915_private *i915, } } -int i915_gem_init_stolen (struct drm_i915_private *dev_priv) +static int i915_gem_init_stolen (struct drm_i915_private *dev_priv) {resource_size_t reserved_base, stolen_top;resource_size_t reserved_total, reserved_size;
@@ -539,6 +540,9 @@ i915_gem_object_release_stolen(struct drm_i915_gem_object *obj)i915_gem_stolen_remove_node (dev_priv, stolen);kfree (stolen); + +if (obj->mm.region) +i915_gem_object_release_memory_region (obj); }static const struct drm_i915_gem_object_ops i915_gem_object_stolen_ops = {
@@ -548,8 +552,9 @@ static const struct drm_i915_gem_object_ops i915_gem_object_stolen_ops = { };static struct drm_i915_gem_object * -_i915_gem_object_create_stolen (struct drm_i915_private *dev_priv, -struct drm_mm_node *stolen) +__i915_gem_object_create_stolen (struct drm_i915_private *dev_priv, +struct drm_mm_node *stolen, +struct intel_memory_region *mem) {struct drm_i915_gem_object *obj;unsigned int cache_level;
@@ -566,6 +571,9 @@ _i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, cache_level =HAS_LLC (dev_priv) ?I915_CACHE_LLC :I915_CACHE_NONE ;i915_gem_object_set_cache_coherency (obj, cache_level); +if (mem) +i915_gem_object_init_memory_region (obj, mem,0 ); +if (i915_gem_object_pin_pages (obj)) goto cleanup;
@@ -576,10 +584,12 @@ _i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,return NULL ; } -struct drm_i915_gem_object * -i915_gem_object_create_stolen (struct drm_i915_private *dev_priv, -resource_size_t size) +static struct drm_i915_gem_object * +_i915_gem_object_create_stolen (struct intel_memory_region *mem, +resource_size_t size, +unsigned int flags) { +struct drm_i915_private *dev_priv = mem->i915;struct drm_i915_gem_object *obj;struct drm_mm_node *stolen;int ret;
@@ -598,7 +608,7 @@ i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,if (ret) goto err_free; - obj =_i915_gem_object_create_stolen (dev_priv, stolen); + obj =__i915_gem_object_create_stolen (dev_priv, stolen, mem);if (obj ==NULL ) { ret = -ENOMEM ; goto err_remove;
@@ -613,6 +623,44 @@ i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,return ERR_PTR (ret); } +struct drm_i915_gem_object * +i915_gem_object_create_stolen (struct drm_i915_private *dev_priv, +resource_size_t size) +{ + +return i915_gem_object_create_region (dev_priv->mm.regions[INTEL_MEMORY_STOLEN ], + size,I915_BO_ALLOC_CONTIGUOUS ); +} + +static int init_stolen (struct intel_memory_region *mem) +{ +/* +* Initialise stolen early so that we may reserve preallocated +* objects for the BIOS to KMS transition. +*/ +return i915_gem_init_stolen (mem->i915); +} + +static void release_stolen (struct intel_memory_region *mem) +{ +i915_gem_cleanup_stolen (mem->i915); +} + +static const struct intel_memory_region_ops i915_region_stolen_ops = { + .init = init_stolen, + .release = release_stolen, + .create_object = _i915_gem_object_create_stolen, +}; + +struct intel_memory_region *i915_gem_stolen_setup (struct drm_i915_private *i915) +{ +return intel_memory_region_create (i915, + intel_graphics_stolen_res.start, +resource_size (&intel_graphics_stolen_res), +I915_GTT_PAGE_SIZE_4K ,0 , + &i915_region_stolen_ops); +} +struct drm_i915_gem_object * i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv, resource_size_t stolen_offset,
@@ -654,7 +702,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_privreturn ERR_PTR (ret); } - obj =_i915_gem_object_create_stolen (dev_priv, stolen); + obj =__i915_gem_object_create_stolen (dev_priv, stolen,NULL );if (obj ==NULL ) {DRM_DEBUG_DRIVER ("failed to allocate stolen object\n" );i915_gem_stolen_remove_node (dev_priv, stolen);
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
@@ -2748,8 +2748,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->mm.regions); i++) {struct intel_memory_region *region = i915->mm.regions[i];
@@ -2762,15 +2760,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 <ARRAY_SIZE (i915->mm.regions); i++) {struct intel_memory_region *mem =NULL ;u32 type;
@@ -2783,6 +2772,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
@@ -152,7 +152,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 v2 14/22 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
@@ -2119,6 +2119,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 v2 15/22 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 | 34 ++++++++++++++++++----------- 1 file changed, 21 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +21 -13
@@ -2827,7 +2827,9 @@ 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 (ggtt->iomap.size) +io_mapping_fini (&ggtt->iomap); }/**
@@ -3038,10 +3040,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)
@@ -3267,15 +3272,18 @@ static int ggtt_init_hw(struct i915_ggtt *ggtt)if (!HAS_LLC (i915) && !HAS_PPGTT (i915)) ggtt->vm.mm.color_adjust = i915_ggtt_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 (ggtt->mappable_end) { +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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 16/22 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
@@ -828,8 +828,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 (!ggtt->mappable_end) + 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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 17/22 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 | 65 ++++++++++++++++++++++----- 2 files changed, 64 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +11 -8
@@ -2661,7 +2661,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)
@@ -2692,13 +2693,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 (ggtt->mappable_end) { +/* 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 +53 -12
118 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 v2 18/22 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
@@ -513,7 +513,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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 19/22 drm/i915: don't allocate the ring in stolen if we lack aperture
In reply to Matthew AuldSince we have no way access it from the CPU. For such cases just fallback to internal objects.
--- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_ringbuffer.c +3 -1
@@ -1273,7 +1273,9 @@ static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size)struct drm_i915_gem_object *obj;struct i915_vma *vma; - obj =i915_gem_object_create_stolen (i915, size); + obj =ERR_PTR (-ENODEV ); +if (HAS_MAPPABLE_APERTURE (i915)) + obj =i915_gem_object_create_stolen (i915, size);if (IS_ERR (obj)) obj =i915_gem_object_create_internal (i915, size);if (IS_ERR (obj))
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 20/22 drm/i915/selftests: fallback to using the gpu to trash stolen
In reply to Matthew AuldIf we lack a mappable aperture, opt for nuking stolen memory with the blitter engine.
--- drivers/gpu/drm/i915/selftests/i915_gem.c | 95 +++++++++++++++++++---- 1 file changed, 80 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/selftests/i915_gem.c +80 -15
@@ -6,6 +6,8 @@#include <linux/random.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"
@@ -34,14 +36,25 @@ static int switch_to_context(struct drm_i915_private *i915,return 0 ; } -static void trash_stolen (struct drm_i915_private *i915) +static void trash_stolen_cpu (struct drm_i915_private *i915) {struct i915_ggtt *ggtt = &i915->ggtt;const u64 slot = ggtt->error_capture.start;const resource_size_t size =resource_size (&i915->dsm); +intel_wakeref_t wakeref;unsigned long page;u32 prng =0x12345678 ; +/* +* As a final sting in the tail, invalidate stolen. Under a real S4, +* stolen is lost and needs to be refilled on resume. However, under +* CI we merely do S4-device testing (as full S4 is too unreliable +* for automated testing across a cluster), so to simulate the effect +* of stolen being trashed across S4, we trash it ourselves. +*/ + + wakeref =intel_runtime_pm_get (&i915->runtime_pm); +for (page =0 ; page < size; page +=PAGE_SIZE ) {const dma_addr_t dma = i915->dsm.start + page;u32 __iomem *s;
@@ -58,24 +71,53 @@ static void trash_stolen(struct drm_i915_private *i915) } ggtt->vm.clear_range (&ggtt->vm, slot,PAGE_SIZE ); + +intel_runtime_pm_put (&i915->runtime_pm, wakeref); } -static void simulate_hibernate (struct drm_i915_private *i915) +static int trash_stolen_gpu (struct i915_gem_context *ctx) { -intel_wakeref_t wakeref; +struct drm_i915_private *i915 = ctx->vm->i915; +const resource_size_t size =resource_size (&i915->dsm); +struct intel_memory_region *clone; +struct drm_i915_gem_object *obj; +struct intel_context *ce; +u32 prng =0x12345678 ; +int err; - wakeref =intel_runtime_pm_get (&i915->runtime_pm); +if (!HAS_ENGINE (i915,BCS0 )) +return 0 ; -/* -* As a final sting in the tail, invalidate stolen. Under a real S4, -* stolen is lost and needs to be refilled on resume. However, under -* CI we merely do S4-device testing (as full S4 is too unreliable -* for automated testing across a cluster), so to simulate the effect -* of stolen being trashed across S4, we trash it ourselves. -*/ -trash_stolen (i915); +if (!size) +return 0 ; -intel_runtime_pm_put (&i915->runtime_pm, wakeref); + clone =mock_region_create (i915, i915->dsm.start, size,PAGE_SIZE ,0 ); +if (IS_ERR (clone)) +return PTR_ERR (clone); + + obj =i915_gem_object_create_region (clone, size,0 ); +if (IS_ERR (obj)) { + err =PTR_ERR (obj); + goto out_region; + } + + ce =i915_gem_context_get_engine (ctx,BCS0 ); +if (IS_ERR (ce)) { + err =PTR_ERR (ce); + goto out_put; + } + +mutex_lock (&i915->drm.struct_mutex); + err =i915_gem_object_fill_blt (obj, ce, prng); +mutex_unlock (&i915->drm.struct_mutex); + +intel_context_put (ce); +out_put: +i915_gem_object_put (obj); +out_region: +intel_memory_region_put (clone); + +return err; }static int pm_prepare (struct drm_i915_private *i915)
@@ -148,6 +190,21 @@ static int igt_gem_suspend(void *arg)if (err) goto out; +/* +* If we lack the mappable aperture we can't really access stolen from +* the cpu, but we can always trash it from the gpu, we just need to do +* so early, before we start suspending stuff. We shouldn't see any +* hangs doing this so early, since things like ring state won't be +* allocated in stolen if we can't access it from the cpu. Although if +* that's the case maybe there is not much point in bothering with this +* anyway... +*/ +if (!HAS_MAPPABLE_APERTURE (i915)) { + err =trash_stolen_gpu (ctx); +if (err) + goto out; + } + err =pm_prepare (i915);if (err) goto out;
@@ -155,7 +212,8 @@ static int igt_gem_suspend(void *arg)pm_suspend (i915);/* Here be dragons! Note that with S3RST any S3 may become S4! */ -simulate_hibernate (i915); +if (HAS_MAPPABLE_APERTURE (i915)) +trash_stolen_cpu (i915);pm_resume (i915);
@@ -187,6 +245,12 @@ static int igt_gem_hibernate(void *arg)if (err) goto out; +if (!HAS_MAPPABLE_APERTURE (i915)) { + err =trash_stolen_gpu (ctx); +if (err) + goto out; + } + err =pm_prepare (i915);if (err) goto out;
@@ -194,7 +258,8 @@ static int igt_gem_hibernate(void *arg)pm_hibernate (i915);/* Here be dragons! */ -simulate_hibernate (i915); +if (HAS_MAPPABLE_APERTURE (i915)) +trash_stolen_cpu (i915);pm_resume (i915);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 21/22 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 | 6 ++++++ drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 14 ++++++++++---- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 3 +++ 4 files changed, 23 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gem/selftests/i915_gem_coherency.c +4 -1
@@ -246,7 +246,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 +6 -0
@@ -301,6 +301,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.
@@ -433,6 +436,9 @@ static int igt_smoke_tiling(void *arg)IGT_TIMEOUT (end);int err; +if (!HAS_MAPPABLE_APERTURE (i915)) +return 0 ; +/* * igt_partial_tiling() does an exhastive check of partial tiling * chunking, but will undoubtably run out of time. Here, we do a
drivers/gpu/drm/i915/gt/selftest_hangcheck.c +10 -4
@@ -1189,8 +1189,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 ;
@@ -1227,10 +1231,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_gtt.c +3 -0
@@ -1152,6 +1152,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 v2 22/22 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 | 6 ++ drivers/gpu/drm/i915/intel_region_lmem.c | 90 ++++++++++++++++++++++ drivers/gpu/drm/i915/intel_region_lmem.h | 5 ++ include/drm/i915_drm.h | 3 + 8 files changed, 144 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
@@ -23,6 +23,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 -= obj->mm.region->region.start;return io_mapping_map_wc (&obj->mm.region->iomap, offset,PAGE_SIZE ); }
@@ -33,6 +34,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 -= obj->mm.region->region.start;return io_mapping_map_atomic_wc (&obj->mm.region->iomap, offset); }
@@ -46,6 +48,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 -= obj->mm.region->region.start;return io_mapping_map_wc (&obj->mm.region->iomap, offset, size); }
drivers/gpu/drm/i915/i915_drv.c +8 -0
@@ -1526,6 +1526,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 |REGION_STOLEN ; +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
@@ -2778,6 +2778,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 +6 -0
@@ -10,6 +10,7 @@#include <linux/ioport.h> #include <linux/mutex.h> #include <linux/io-mapping.h> +#include <drm/drm_mm.h> #include "i915_buddy.h"
@@ -71,6 +72,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;
@@ -83,6 +87,8 @@ struct intel_memory_region {unsigned int instance;unsigned int id; +dma_addr_t remap_addr; +/* Protects access to objects and purgeable */ struct mutex obj_lock;struct list_head objects;
drivers/gpu/drm/i915/intel_region_lmem.c +90 -0
108 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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 01/22] drm/i915/stolen: make the object creation interface consistent
In reply to Matthew AuldQuoting Matthew Auld (2019-10-03 20:24:23)
Quoted 14 lines
drivers/gpu/drm/i915/gt/intel_rc6.c +1
-1@@ -299,7 +299,7 @@ static int vlv_rc6_init(struct intel_rc6 *rc6) pcbr_offset,I915_GTT_OFFSET_NONE , pctx_size); -if (!pctx) +if (IS_ERR (pctx))return -ENOMEM ; goto out;
drivers/gpu/drm/i915/gt/intel_rc6.c static int vlv_rc6_init(struct intel_rc6 *rc6) · line 321
Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_rc6.c +1
-1@@ -316,7 +316,7 @@ static int vlv_rc6_init(struct intel_rc6 *rc6)* memory, or any other relevant ranges. */ pctx =i915_gem_object_create_stolen (i915, pctx_size); -if (!pctx) { +if (IS_ERR (pctx)) {DRM_DEBUG ("not enough stolen space for PCTX, disabling\n" );return -ENOMEM ;
You might as well make use of the actual error now that you know it.
With that minor tweak,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 19/22] drm/i915: don't allocate the ring in stolen if we lack aperture
In reply to Matthew AuldQuoted 24 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Matthew Auld
Sent: Thursday, October 3, 2019 12:25 PM
To: [email protected]
Subject: [Intel-gfx] [PATCH v2 19/22] drm/i915: don't allocate the ring in stolen if we lack apertureSince we have no way access it from the CPU. For such cases just fallback to internal objects.
Signed-off-by Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/gt/intel_ringbuffer.c +0
-0
drivers/gpu/drm/i915/gt/intel_ringbuffer.c static struct i915_vma *create_ring_vma(struct · line 1279
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_ringbuffer.c +3
-1@@ -1273,7 +1273,9 @@ static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size)struct drm_i915_gem_object *obj;struct i915_vma *vma; - obj =i915_gem_object_create_stolen (i915, size); + obj =ERR_PTR (-ENODEV ); +if (HAS_MAPPABLE_APERTURE (i915)) + obj =i915_gem_object_create_stolen (i915, size);
Don't we already support local stolen memory region? In this case, if it has aperture, it is bios stolen system memory, if no aperture, it is local stolen memory, the same call to i915_gem_object_create_stolen() will work in both cases.
--CQ
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_ringbuffer.c +0
-0if (IS_ERR (obj)) obj =i915_gem_object_create_internal (i915, size);if (
IS_ERR(obj))
--
2.20.1_______________________________________________
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
Re: [PATCH v2 04/22] drm/i915/region: support volatile objects
In reply to Matthew AuldQuoting Matthew Auld (2019-10-03 20:24:26)
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c fake_dma_object(struct drm_i915_private *i915, u64 size) · line 131
Quoted 6 lines
static const struct
drm_i915_gem_object_opsfake_ops= {drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1
-0@@ -131,6 +128,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->flags |= I915_BO_ALLOC_VOLATILE
even during early init, then we will not be caught out if we add an earlier flag.
i915_gem_object_set_volatile() i915_gem_object_is_volatile()
helpers?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 13/22] drm/i915: treat stolen as a region
In reply to Matthew AuldQuoted 58 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Matthew Auld
Sent: Thursday, October 3, 2019 12:25 PM
To: [email protected]
Subject: [Intel-gfx] [PATCH v2 13/22] drm/i915: treat stolen as a regionConvert stolen memory over to a region object. Still leaves open the question with what to do with pre-allocated objects...
Signed-off-by Matthew Auld <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Abdiel Janulgue <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 66 +++++++++++++++++++--- 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 +- 4 files changed, 62 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_stolen.c +2
-1@@ -10,6 +10,7 @@#include <drm/drm_mm.h> #include <drm/i915_drm.h> +#include "gem/i915_gem_region.h" #include "i915_drv.h" #include "i915_gem_stolen.h" @@ -150,7 +151,7 @@ static int i915_adjust_stolen(struct drm_i915_private *dev_priv, return 0; } -void i915_gem_cleanup_stolen (struct drm_i915_private *dev_priv) +static void i915_gem_cleanup_stolen (struct drm_i915_private *dev_priv) {if (!drm_mm_initialized (&dev_priv->mm.stolen))drivers/gpu/drm/i915/gem/i915_gem_stolen.c +1
-1return ;@@ -355,7 +356,7 @@ static void icl_get_stolen_reserved(struct drm_i915_private *i915, } } -int i915_gem_init_stolen (struct drm_i915_private *dev_priv) +static int i915_gem_init_stolen (struct drm_i915_private *dev_priv) {resource_size_t reserved_base, stolen_top;
resource_size_treserved_total,reserved_size; @@ -539,6 +540,9
@@i915_gem_object_release_stolen(struct drm_i915_gem_object *obj)
drivers/gpu/drm/i915/gem/i915_gem_stolen.c i915_gem_object_release_stolen(struct drm_i915_gem_object *obj) · line 545
Quoted 5 lines
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +3
-0i915_gem_stolen_remove_node (dev_priv, stolen);kfree (stolen); + +if (obj->mm.region) +i915_gem_object_release_memory_region (obj);
We fully support memory region concept for both bios stolen system memory and local stolen memory, we don't need such kind of checking. This looks to upstream code before latest DG1 code. I am not sure if we want to upstream this intermediate code.
--CQ
Quoted 185 lines
}
static const struct
drm_i915_gem_object_opsi915_gem_object_stolen_ops
= { @@ -548,8 +552,9 @@ static const structdrm_i915_gem_object_opsi915_gem_object_stolen_ops= { };static struct
drm_i915_gem_object*drivers/gpu/drm/i915/gem/i915_gem_stolen.c +6
-2-_i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, - struct drm_mm_node *stolen) +__i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, + struct drm_mm_node *stolen, + struct intel_memory_region *mem) { struct drm_i915_gem_object *obj;unsigned int cache_level;@@ -566,6 +571,9 @@ _i915_gem_object_create_stolen(structdrm_i915_private *dev_priv, cache_level =HAS_LLC (dev_priv) ?I915_CACHE_LLC :I915_CACHE_NONE ;i915_gem_object_set_cache_coherency (obj, cache_level); +if (mem) +i915_gem_object_init_memory_region (obj, mem,0 ); +if (i915_gem_object_pin_pages (obj))drivers/gpu/drm/i915/gem/i915_gem_stolen.c +5
-3goto cleanup;@@ -576,10 +584,12 @@ _i915_gem_object_create_stolen(structdrm_i915_private *dev_priv, return NULL; } -struct drm_i915_gem_object * -i915_gem_object_create_stolen (struct drm_i915_private *dev_priv, -resource_size_t size) +static struct drm_i915_gem_object * +_i915_gem_object_create_stolen (struct intel_memory_region *mem, +resource_size_t size, +unsigned int flags) { +struct drm_i915_private *dev_priv = mem->i915;struct drm_i915_gem_object *obj;struct drm_mm_node *stolen;drivers/gpu/drm/i915/gem/i915_gem_stolen.c +1
-1int ret;@@ -598,7 +608,7 @@ i915_gem_object_create_stolen(structdrm_i915_private *dev_priv, if (ret) goto err_free; - obj =_i915_gem_object_create_stolen (dev_priv, stolen); + obj =__i915_gem_object_create_stolen (dev_priv, stolen, mem);if (obj ==NULL ) { ret = -ENOMEM ;drivers/gpu/drm/i915/gem/i915_gem_stolen.c +29
-0goto err_remove;@@ -613,6 +623,44 @@ i915_gem_object_create_stolen(structdrm_i915_private *dev_priv, return ERR_PTR(ret); } +struct drm_i915_gem_object * +i915_gem_object_create_stolen (struct drm_i915_private *dev_priv, +resource_size_t size) +{ + +return i915_gem_object_create_region (dev_priv- >mm.regions[INTEL_MEMORY_STOLEN], + size,I915_BO_ALLOC_CONTIGUOUS ); } + +static int init_stolen (struct intel_memory_region *mem) { +/* +* Initialise stolen early so that we may reserve preallocated +* objects for the BIOS to KMS transition. +*/ +return i915_gem_init_stolen (mem->i915); } + +static void release_stolen (struct intel_memory_region *mem) { +i915_gem_cleanup_stolen (mem->i915); +} + +static const struct intel_memory_region_ops i915_region_stolen_ops = { + .init = init_stolen, + .release = release_stolen, + .create_object = _i915_gem_object_create_stolen, }; + +struct intel_memory_region *i915_gem_stolen_setup (struct +drm_i915_private *i915) { + return intel_memory_region_create(i915, + intel_graphics_stolen_res.start, +
resource_size(&intel_graphics_stolen_res),drivers/gpu/drm/i915/gem/i915_gem_stolen.c +4
-0+I915_GTT_PAGE_SIZE_4K ,0 , + &i915_region_stolen_ops); +} +struct drm_i915_gem_object * i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/gem/i915_gem_stolen.c +0
-0resource_size_t stolen_offset,@@ -654,7 +702,7 @@i915_gem_object_create_stolen_for_preallocated(struct
drm_i915_private*dev_privdrivers/gpu/drm/i915/gem/i915_gem_stolen.c +1
-1return ERR_PTR (ret); } - obj =_i915_gem_object_create_stolen (dev_priv, stolen); + obj =__i915_gem_object_create_stolen (dev_priv, stolen,NULL );if (obj ==NULL ) {DRM_DEBUG_DRIVER ("failed to allocate stolen object\n" ); i915_gem_stolen_remove_node(dev_priv, stolen); diff --git
a/drivers/gpu/drm/i915/gem/i915_gem_stolen.hb/drivers/gpu/drm/i915/gem/i915_gem_stolen.h
index2289644d8604..c1040627fbf3100644drivers/gpu/drm/i915/gem/i915_gem_stolen.h +2
-1@@ -21,8 +21,7 @@ int i915_gem_stolen_insert_node_in_range(structdrm_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@@ -2748,8 +2748,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->mm.regions); i++) {struct intel_memory_region *region = i915->mm.regions[i];@@ -2762,15 +2760,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 <ARRAY_SIZE (i915->mm.regions); i++) {struct intel_memory_region *mem =NULL ;u32 type;@@ -2783,6 +2772,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 ; }drivers/gpu/drm/i915/i915_gem_gtt.c +0
-0if (IS_ERR (mem)) {(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_pci.cindexe55ab2724996..f9a3bfe68689100644drivers/gpu/drm/i915/i915_pci.c +1
-2@@ -152,7 +152,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), \ --2.20.1
Quoted 4 lines
_______________________________________________
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
Re: [PATCH v2 06/22] drm/i915: support creating LMEM objects
In reply to Matthew AuldQuoting Matthew Auld (2019-10-03 20:24:28)
drivers/gpu/drm/i915/gem/i915_gem_lmem.c line 21
Quoted 11 lines
drivers/gpu/drm/i915/gem/i915_gem_lmem.c new file +11
-0+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 ;
Hmm, a more classic approach would be
return obj->ops == &lmem_obj_ops;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 08/22] drm/i915/lmem: support kernel mapping
In reply to Matthew AuldQuoting Matthew Auld (2019-10-03 20:24:30)
drivers/gpu/drm/i915/gem/i915_gem_lmem.c line 46
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +7
-0+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 ));
GEM_BUG_ON(!i915_gem_object_is_contiguous(obj));
Just reads more clearly for me. Might just be me.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 14/22] drm/i915: define HAS_MAPPABLE_APERTURE
In reply to Matthew AuldQuoting Matthew Auld (2019-10-03 20:24:36)
Quoted 16 lines
From: 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.
Signed-off-by Daniele Ceraolo Spurio <[email protected]>Cc Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 ++ 1 file changed, 2 insertions(+)drivers/gpu/drm/i915/i915_drv.h +0
-0
drivers/gpu/drm/i915/i915_drv.h IS_SUBPLATFORM(const struct drm_i915_private *i915, · line 2122
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -2119,6 +2119,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)
I'm just not liking tying this to i915 and not ggtt. :| Also (dev_priv)
-Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 19/22] drm/i915: don't allocate the ring in stolen if we lack aperture
In reply to Matthew AuldQuoting Matthew Auld (2019-10-03 20:24:41)
drivers/gpu/drm/i915/gt/intel_ringbuffer.c static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size)
Quoted 13 lines
Since we have no way access it from the CPU. For such cases just fallback to internal objects.
Signed-off-by Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/gt/intel_ringbuffer.c +0
-0@@ -1273,7 +1273,9 @@ static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size)
^
There's a ggtt right there --------------------------------------
Quoted 13 lines
drivers/gpu/drm/i915/gt/intel_ringbuffer.c +3
-1struct drm_i915_gem_object *obj;struct i915_vma *vma; - obj =i915_gem_object_create_stolen (i915, size); + obj =ERR_PTR (-ENODEV ); +if (HAS_MAPPABLE_APERTURE (i915)) + obj =i915_gem_object_create_stolen (i915, size);if (IS_ERR (obj)) obj =i915_gem_object_create_internal (i915, size);if (IS_ERR (obj))Signature · 1 line
2.20.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 20/22] drm/i915/selftests: fallback to using the gpu to trash stolen
In reply to Matthew AuldQuoting Matthew Auld (2019-10-03 20:24:42)
Quoted 8 lines
drivers/gpu/drm/i915/selftests/i915_gem.c +4
-0@@ -148,6 +190,21 @@ static int igt_gem_suspend(void *arg)if (err) goto out; +/* +* If we lack the mappable aperture we can't really access stolen from +* the cpu, but we can always trash it from the gpu, we just need to do +* so early, before we start suspending stuff. We shouldn't see any
drivers/gpu/drm/i915/selftests/i915_gem.c static int igt_gem_suspend(void *arg) · line 206
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem.c +10
-0+* hangs doing this so early, since things like ring state won't be +* allocated in stolen if we can't access it from the cpu. Although if +* that's the case maybe there is not much point in bothering with this +* anyway... +*/ +if (!HAS_MAPPABLE_APERTURE (i915)) { + err =trash_stolen_gpu (ctx); +if (err) + goto out; + }
The goal here is that later on we will need to migrate anything in lmem to swap over suspend/hibernation and restore it on resume. The challenge is then to corrupt state such that we can detect forgotten objects. (So there will be usually a bug or two where we redesign the test to cover more corner cases.) I'm not yet convinced trashing before suspend does what I want it to do. I think we may need to do a minimal resume cycle in the middle of the full suspend/resume test that bypasses the GEM layer to do the trashing. :|
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for LMEM basics (rev2)
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: LMEM basics (rev2)
URL : https://patchwork.freedesktop.org/series/67350/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
617461d66e9a drm/i915/stolen: make the object creation interface consistent
-:89: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!obj"
#89: FILE: drivers/gpu/drm/i915/gem/i915_gem_stolen.c:602:
+ if (obj == NULL) {total: 0 errors, 0 warnings, 1 checks, 145 lines checked26e73b4fb28d 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
-:577: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct intel_memory_region *' should also have an identifier name #577: FILE: drivers/gpu/drm/i915/intel_memory_region.h:26:
+ int (*init)(struct intel_memory_region *);
-:578: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct intel_memory_region *' should also have an identifier name #578: FILE: drivers/gpu/drm/i915/intel_memory_region.h:27:
+ void (*release)(struct intel_memory_region *);
-:580: WARNING:FUNCTION_ARGUMENTS: function definition argument 'struct intel_memory_region *' should also have an identifier name #580: FILE: drivers/gpu/drm/i915/intel_memory_region.h:29:
+ struct drm_i915_gem_object *
-:580: WARNING:FUNCTION_ARGUMENTS: function definition argument 'resource_size_t' should also have an identifier name #580: FILE: drivers/gpu/drm/i915/intel_memory_region.h:29:
+ struct drm_i915_gem_object *
-:580: WARNING:FUNCTION_ARGUMENTS: function definition argument 'unsigned int' should also have an identifier name #580: FILE: drivers/gpu/drm/i915/intel_memory_region.h:29:
+ struct drm_i915_gem_object *
-:595: CHECK:UNCOMMENTED_DEFINITION: struct mutex definition without comment #595: FILE: drivers/gpu/drm/i915/intel_memory_region.h:44:
+ struct mutex mm_lock;
-:616: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #616: FILE: drivers/gpu/drm/i915/intel_memory_region.h:65:
+__intel_memory_region_get_block_buddy(struct intel_memory_region *mem,
+ resource_size_t size,
-:619: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #619: FILE: drivers/gpu/drm/i915/intel_memory_region.h:68:
+void __intel_memory_region_put_pages_buddy(struct intel_memory_region *mem,
+ struct list_head *blocks);
-:727: WARNING:EMBEDDED_FUNCTION_NAME: Prefer using '"%s...", __func__' to using 'igt_mock_fill', this function's name, in a string #727: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:78:
+ pr_err("igt_mock_fill failed, space still left in region\n");
total: 0 errors, 7 warnings, 3 checks, 773 lines checked 00c236d8b5a6 drm/i915/region: support contiguous allocations -:291: WARNING:LINE_SPACING: Missing a blank line after declarations #291: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:131:
+ LIST_HEAD(holes);
+ I915_RND_STATE(prng);
total: 0 errors, 1 warnings, 0 checks, 372 lines checkedb68b1af935fc drm/i915/region: support volatile objects7aa479268146 drm/i915: Add memory region information to device_infoe89ff1eeb7bc 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:684:
+ struct intel_memory_region *regions[INTEL_MEMORY_UKNOWN];
-:139: ERROR:COMPLEX_MACRO: Macros with complex values should be enclosed in parentheses #139: FILE: drivers/gpu/drm/i915/intel_memory_region.c:10:
+#define REGION_MAP(type, inst) \
+ BIT((type) + INTEL_MEMORY_TYPE_SHIFT) | BIT(inst)
-:172: WARNING:TYPO_SPELLING: 'UKNOWN' may be misspelled - perhaps 'UNKNOWN'? #172: FILE: drivers/gpu/drm/i915/intel_memory_region.h:34:
+ INTEL_MEMORY_UKNOWN, /* Should be last */
-:181: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'r' may be better as '(r)' to avoid precedence issues #181: FILE: drivers/gpu/drm/i915/intel_memory_region.h:43:
+#define MEMORY_TYPE_FROM_REGION(r) (ilog2(r >> INTEL_MEMORY_TYPE_SHIFT))
-:182: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'r' may be better as '(r)' to avoid precedence issues #182: FILE: drivers/gpu/drm/i915/intel_memory_region.h:44:
+#define MEMORY_INSTANCE_FROM_REGION(r) (ilog2(r & 0xffff))
total: 1 errors, 3 warnings, 2 checks, 269 lines checked 141deddcedec 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 22b5c737a2e5 drm/i915/lmem: support kernel mapping
-:200: WARNING:LINE_SPACING: Missing a blank line after declarations #200: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:283:
+ struct drm_i915_gem_object *obj;
+ I915_RND_STATE(prng);
total: 0 errors, 1 warnings, 0 checks, 276 lines checked 8b2329a12640 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:
+
-:88: WARNING:LINE_SPACING: Missing a blank line after declarations #88: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:313:
+ struct intel_context *ce;
+ I915_RND_STATE(prng);
-:168: WARNING:LINE_SPACING: Missing a blank line after declarations #168: FILE: drivers/gpu/drm/i915/selftests/intel_memory_region.c:407:
+ struct drm_file *file;
+ I915_RND_STATE(prng);
total: 0 errors, 2 warnings, 1 checks, 202 lines checked a086cd8917d0 drm/i915/selftests: extend coverage to include LMEM huge-pages -:8: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one
total: 0 errors, 1 warnings, 0 checks, 151 lines checked 874fcc02b951 drm/i915: enumerate and init each supported region 69d9fee29592 drm/i915: treat shmem as a region
-:7: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one
-:116: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #116: FILE: drivers/gpu/drm/i915/gem/i915_gem_shmem.c:443:
+static int __create_shmem(struct drm_i915_private *i915,
struct drm_gem_object *obj,
-:128: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #128: FILE: drivers/gpu/drm/i915/gem/i915_gem_shmem.c:466:
+ unsigned flags)
-:190: WARNING:SUSPECT_CODE_INDENT: suspect code indent for conditional statements (8, 17) #190: FILE: drivers/gpu/drm/i915/gem/i915_gem_shmem.c:590:
+ if (err)
+ DRM_NOTE("Unable to create a private tmpfs mount, hugepage support will be disabled(%d).\n", err);
-:191: WARNING:LONG_LINE: line over 100 characters #191: FILE: drivers/gpu/drm/i915/gem/i915_gem_shmem.c:591:
+ DRM_NOTE("Unable to create a private tmpfs mount, hugepage support will be disabled(%d).\n", err);
total: 0 errors, 4 warnings, 1 checks, 346 lines checked dd23d57731f5 drm/i915: treat stolen as a region
-:108: CHECK:BRACES: Blank lines aren't necessary after an open brace '{' #108: FILE: drivers/gpu/drm/i915/gem/i915_gem_stolen.c:630:
+{
+
total: 0 errors, 0 warnings, 1 checks, 176 lines checkedd16cdaa6c6e7 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:2122:
+#define HAS_MAPPABLE_APERTURE(dev_priv) (dev_priv->ggtt.mappable_end > 0)
total: 0 errors, 0 warnings, 1 checks, 8 lines checked cc9d79ef7bd0 drm/i915: do not map aperture if it is not available. -:38: CHECK:SPACING: No space is necessary after a cast #38: FILE: drivers/gpu/drm/i915/i915_gem_gtt.c:3046:
+ (struct resource) DEFINE_RES_MEM(pci_resource_start(pdev, 2),
total: 0 errors, 0 warnings, 1 checks, 53 lines checked 908263a2b6a3 drm/i915: set num_fence_regs to 0 if there is no aperture b3003a848d99 drm/i915: error capture with no ggtt slot -:175: WARNING:LINE_SPACING: Missing a blank line after declarations #175: FILE: drivers/gpu/drm/i915/i915_gpu_error.c:1720:
+ const u64 slot = ggtt->error_capture.start;
+ ggtt->vm.clear_range(&ggtt->vm, slot, PAGE_SIZE);
total: 0 errors, 1 warnings, 0 checks, 149 lines checked9f8c8b13f035 drm/i915: Don't try to place HWS in non-existing mappable regionf38b0f688e31 drm/i915: don't allocate the ring in stolen if we lack aperturec2ea0b63ac44 drm/i915/selftests: fallback to using the gpu to trash stolen9a338d43fab2 drm/i915/selftests: check for missing aperture5d9f53513a22 HAX drm/i915: add the fake lmem region
-:49: WARNING:PREFER_PR_LEVEL: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ... #49: FILE: arch/x86/kernel/early-quirks.c:624:
+ printk(KERN_INFO "Intel graphics fake LMEM starts at %pa\n",
total: 0 errors, 1 warnings, 0 checks, 228 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for LMEM basics (rev2)
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: LMEM basics (rev2)
URL : https://patchwork.freedesktop.org/series/67350/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.6.0 Commit: drm/i915/stolen: make the object creation interface consistent Okay!
Commit: drm/i915: introduce intel_memory_region
Okay!
Commit: drm/i915/region: support contiguous allocations +drivers/gpu/drm/i915/selftests/intel_memory_region.c:116:6: warning: symbol 'igt_object_release' was not declared. Should it be static?
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:177:42: expected void [noderef] <asn:2> *vaddr+drivers/gpu/drm/i915/gem/i915_gem_pages.c:177:42: got void *[assigned] ptr+drivers/gpu/drm/i915/gem/i915_gem_pages.c:177:42: warning: incorrect type in argument 1 (different address spaces)+drivers/gpu/drm/i915/gem/i915_gem_pages.c:254:51: expected void *+drivers/gpu/drm/i915/gem/i915_gem_pages.c:254:51: got void [noderef] <asn:2> *+drivers/gpu/drm/i915/gem/i915_gem_pages.c:254:51: warning: incorrect type in return expression (different address spaces)+drivers/gpu/drm/i915/gem/i915_gem_pages.c:337:42: expected void [noderef] <asn:2> *vaddr+drivers/gpu/drm/i915/gem/i915_gem_pages.c:337:42: got void *[assigned] ptr+drivers/gpu/drm/i915/gem/i915_gem_pages.c:337:42: warning: incorrect type in argument 1 (different address spaces)
Commit: drm/i915/selftests: add write-dword test for LMEM Okay!
Commit: drm/i915/selftests: extend coverage to include LMEM huge-pages 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: error capture with no ggtt slot
-+drivers/gpu/drm/i915/i915_gpu_error.c:1027:55: expected void *src+drivers/gpu/drm/i915/i915_gpu_error.c:1027:55: got void [noderef] <asn:2> *[assigned] s+drivers/gpu/drm/i915/i915_gpu_error.c:1027:55: warning: incorrect type in argument 2 (different address spaces)
Commit: drm/i915: Don't try to place HWS in non-existing mappable region Okay!
Commit: drm/i915: don't allocate the ring in stolen if we lack aperture Okay!
Commit: drm/i915/selftests: fallback to using the gpu to trash stolen Okay!
Commit: drm/i915/selftests: check for missing aperture Okay!
Commit: HAX drm/i915: add the fake lmem region
Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for LMEM basics (rev2)
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: LMEM basics (rev2)
URL : https://patchwork.freedesktop.org/series/67350/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7000 -> Patchwork_14658
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/index.html
New tests
---------
New tests have been introduced between CI_DRM_7000 and Patchwork_14658:
### New IGT tests (1) ###
* igt@i915_selftest@live_memory_region:
- Statuses : 44 pass(s)
- Exec time: [0.39, 2.61] s
Known issues
------------
Here are the changes found in Patchwork_14658 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: [PASS][1] -> [INCOMPLETE][2] ([fdo#107718])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/fi-blb-e6850/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/fi-blb-e6850/igt@[email protected]
* igt@gem_flink_basic@double-flink:
- fi-icl-u3: [PASS][3] -> [DMESG-WARN][4] ([fdo#107724]) +4 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/fi-icl-u3/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/fi-icl-u3/igt@[email protected]
* igt@kms_chamelium@hdmi-edid-read:
- fi-icl-u2: [PASS][5] -> [FAIL][6] ([fdo#109483])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/fi-icl-u2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_create@basic-files:
- {fi-tgl-u}: [INCOMPLETE][7] ([fdo#111735]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/fi-tgl-u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/fi-tgl-u/igt@[email protected]
- {fi-icl-dsi}: [INCOMPLETE][9] ([fdo#107713] / [fdo#109100]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/fi-icl-dsi/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/fi-icl-dsi/igt@[email protected]
* igt@i915_selftest@live_execlists:
- {fi-icl-guc}: [INCOMPLETE][11] ([fdo#107713]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/fi-icl-guc/igt@i915_selftest@live_execlists.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/fi-icl-guc/igt@i915_selftest@live_execlists.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: [FAIL][13] ([fdo#109483]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/fi-icl-u2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/fi-icl-u2/igt@[email protected]
- fi-kbl-7500u: [FAIL][15] ([fdo#111045] / [fdo#111096]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/fi-kbl-7500u/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/fi-kbl-7500u/igt@[email protected]
* igt@prime_self_import@basic-with_fd_dup:
- fi-icl-u3: [DMESG-WARN][17] ([fdo#107724]) -> [PASS][18] +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/fi-icl-u3/igt@prime_self_import@basic-with_fd_dup.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/fi-icl-u3/igt@prime_self_import@basic-with_fd_dup.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111735]: https://bugs.freedesktop.org/show_bug.cgi?id=111735
Participating hosts (52 -> 45)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7000 -> Patchwork_14658
CI-20190529: 20190529
CI_DRM_7000: a6af6b11a94cbffff1c70dbab04ef1e13d79e4ae @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5211: 1601e1571eb0f29a06b64494040b3ea7859a650f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14658: 5d9f53513a22450a4c0c2a402cd8058cd2932411 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5d9f53513a22 HAX drm/i915: add the fake lmem region9a338d43fab2 drm/i915/selftests: check for missing aperture c2ea0b63ac44 drm/i915/selftests: fallback to using the gpu to trash stolen f38b0f688e31 drm/i915: don't allocate the ring in stolen if we lack aperture 9f8c8b13f035 drm/i915: Don't try to place HWS in non-existing mappable region b3003a848d99 drm/i915: error capture with no ggtt slot 908263a2b6a3 drm/i915: set num_fence_regs to 0 if there is no aperture cc9d79ef7bd0 drm/i915: do not map aperture if it is not available. d16cdaa6c6e7 drm/i915: define HAS_MAPPABLE_APERTUREdd23d57731f5 drm/i915: treat stolen as a region69d9fee29592 drm/i915: treat shmem as a region874fcc02b951 drm/i915: enumerate and init each supported region a086cd8917d0 drm/i915/selftests: extend coverage to include LMEM huge-pages 8b2329a12640 drm/i915/selftests: add write-dword test for LMEM 22b5c737a2e5 drm/i915/lmem: support kernel mapping141deddcedec drm/i915: setup io-mapping for LMEMe89ff1eeb7bc drm/i915: support creating LMEM objects7aa479268146 drm/i915: Add memory region information to device_info b68b1af935fc drm/i915/region: support volatile objects 00c236d8b5a6 drm/i915/region: support contiguous allocations 26e73b4fb28d drm/i915: introduce intel_memory_region617461d66e9a drm/i915/stolen: make the object creation interface consistent
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for LMEM basics (rev2)
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: LMEM basics (rev2)
URL : https://patchwork.freedesktop.org/series/67350/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7000_full -> Patchwork_14658_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_14658_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_14658_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_14658_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_mmap_gtt@hang:
- shard-kbl: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-kbl3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-kbl6/igt@[email protected]
- shard-glk: [PASS][3] -> [DMESG-WARN][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-glk5/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-glk8/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_exec_schedule@preemptive-hang-bsd1:
- {shard-tglb}: [PASS][5] -> [INCOMPLETE][6] +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-tglb3/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-tglb1/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_7000_full and Patchwork_14658_full:
### New IGT tests (2) ###
* igt@i915_selftest@live_memory_region:
- Statuses : 8 pass(s)
- Exec time: [0.29, 2.31] s
* igt@i915_selftest@mock_memory_region:
- Statuses : 8 pass(s)
- Exec time: [0.94, 15.94] s
Known issues
------------
Here are the changes found in Patchwork_14658_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@vcs1-s3:
- shard-kbl: [PASS][7] -> [INCOMPLETE][8] ([fdo#103665])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-kbl1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-kbl4/igt@[email protected]
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#110841])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb6/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@fifo-bsd1:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#109276]) +13 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb4/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb7/igt@[email protected]
* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#111325]) +4 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb8/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb1/igt@[email protected]
* igt@gem_userptr_blits@map-fixed-invalidate-busy-gup:
- shard-apl: [PASS][15] -> [DMESG-WARN][16] ([fdo#109385] / [fdo#111870])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-apl3/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-apl6/igt@[email protected]
- shard-kbl: [PASS][17] -> [DMESG-WARN][18] ([fdo#111870])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-kbl4/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-kbl1/igt@[email protected]
- shard-hsw: [PASS][19] -> [DMESG-WARN][20] ([fdo#110789] / [fdo#111870])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-hsw7/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-hsw4/igt@[email protected]
* igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy:
- shard-iclb: [PASS][21] -> [DMESG-WARN][22] ([fdo#111870])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb2/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb3/igt@[email protected]
* igt@gem_userptr_blits@sync-unmap-after-close:
- shard-skl: [PASS][23] -> [DMESG-WARN][24] ([fdo#111870])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-skl5/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-skl3/igt@[email protected]
* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [PASS][25] -> [DMESG-WARN][26] ([fdo#108566]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-apl3/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-apl4/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt:
- shard-iclb: [PASS][27] -> [FAIL][28] ([fdo#103167]) +5 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][29] -> [FAIL][30] ([fdo#108145] / [fdo#110403])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-skl10/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-skl9/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [PASS][31] -> [FAIL][32] ([fdo#108145])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-skl10/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-skl10/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-iclb: [PASS][33] -> [SKIP][34] ([fdo#109642] / [fdo#111068])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb2/igt@kms_psr2_su@page_flip.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb3/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_cursor_blt:
- shard-iclb: [PASS][35] -> [SKIP][36] ([fdo#109441]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb3/igt@kms_psr@psr2_cursor_blt.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][37] -> [FAIL][38] ([fdo#99912])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-apl1/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-apl3/igt@[email protected]
* igt@kms_vblank@pipe-b-ts-continuation-modeset-hang:
- shard-snb: [PASS][39] -> [SKIP][40] ([fdo#109271]) +5 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-snb2/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-snb4/igt@[email protected]
* igt@perf@blocking:
- shard-skl: [PASS][41] -> [FAIL][42] ([fdo#110728])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-skl3/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-skl1/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_schedule@preempt-bsd:
- shard-iclb: [SKIP][43] ([fdo#111325]) -> [PASS][44] +6 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb2/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb8/igt@[email protected]
* igt@gem_userptr_blits@dmabuf-unsync:
- shard-hsw: [DMESG-WARN][45] ([fdo#111870]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-hsw7/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-hsw1/igt@[email protected]
* igt@gem_userptr_blits@map-fixed-invalidate-busy:
- shard-glk: [DMESG-WARN][47] ([fdo#111870]) -> [PASS][48] +2 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-glk2/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-glk3/igt@[email protected]
* igt@gem_userptr_blits@map-fixed-invalidate-busy-gup:
- shard-skl: [DMESG-WARN][49] ([fdo#111870]) -> [PASS][50] +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-skl4/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-skl5/igt@[email protected]
* igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy:
- shard-kbl: [DMESG-WARN][51] ([fdo#111870]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-kbl1/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-kbl4/igt@[email protected]
* {igt@i915_pm_dc@dc6-psr}:
- shard-iclb: [FAIL][53] ([fdo#110548]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb2/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb3/igt@[email protected]
* igt@i915_pm_rpm@system-suspend:
- {shard-tglb}: [INCOMPLETE][55] ([fdo#111747]) -> [PASS][56] +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-tglb1/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-tglb1/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [DMESG-WARN][57] ([fdo#108566]) -> [PASS][58] +6 similar issues
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-apl8/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-apl3/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-64x64-sliding:
- shard-snb: [INCOMPLETE][59] ([fdo#105411]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-snb1/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-snb2/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-alpha-opaque:
- {shard-tglb}: [DMESG-WARN][61] ([fdo#111600]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-tglb2/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-tglb2/igt@[email protected]
* igt@kms_flip@flip-vs-modeset-vs-hang:
- shard-apl: [INCOMPLETE][63] ([fdo#103927]) -> [PASS][64] +4 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-apl2/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-apl8/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-skl: [INCOMPLETE][65] ([fdo#109507]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-skl6/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-skl2/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-kbl: [DMESG-WARN][67] ([fdo#103313]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-kbl4/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-kbl3/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-blt:
- shard-iclb: [FAIL][69] ([fdo#103167]) -> [PASS][70] +3 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb2/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb3/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-mmap-wc:
- {shard-tglb}: [FAIL][71] ([fdo#103167]) -> [PASS][72] +5 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-tglb6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-mmap-wc.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-tglb6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-mmap-wc.html
* igt@kms_frontbuffer_tracking@psr-rgb565-draw-render:
- shard-skl: [FAIL][73] ([fdo#103167]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-skl10/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-skl10/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-suspend:
- {shard-tglb}: [INCOMPLETE][75] ([fdo#111832]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-tglb3/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-tglb6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][77] ([fdo#108145]) -> [PASS][78] +1 similar issue
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-skl10/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-skl10/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [FAIL][79] ([fdo#103166]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb6/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb4/igt@[email protected]
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][81] ([fdo#109642] / [fdo#111068]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb1/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb2/igt@[email protected]
* igt@kms_psr@psr2_sprite_render:
- shard-iclb: [SKIP][83] ([fdo#109441]) -> [PASS][84] +1 similar issue
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb3/igt@kms_psr@psr2_sprite_render.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb2/igt@kms_psr@psr2_sprite_render.html
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- {shard-tglb}: [INCOMPLETE][85] ([fdo#111832] / [fdo#111850]) -> [PASS][86]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-tglb4/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-tglb3/igt@[email protected]
- shard-skl: [INCOMPLETE][87] ([fdo#104108]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-skl5/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-skl8/igt@[email protected]
* igt@perf@polling:
- shard-skl: [FAIL][89] ([fdo#110728]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-skl10/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-skl4/igt@[email protected]
* igt@prime_busy@hang-bsd2:
- shard-iclb: [SKIP][91] ([fdo#109276]) -> [PASS][92] +19 similar issues
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb7/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb1/igt@[email protected]
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [FAIL][93] ([fdo#111329]) -> [SKIP][94] ([fdo#109276])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb2/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb3/igt@[email protected]
* igt@gem_mocs_settings@mocs-reset-dirty-render:
- shard-iclb: [INCOMPLETE][95] ([fdo#107713]) -> [SKIP][96] ([fdo#110206])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb1/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb7/igt@[email protected]
* igt@gem_mocs_settings@mocs-settings-bsd2:
- shard-iclb: [SKIP][97] ([fdo#109276]) -> [FAIL][98] ([fdo#111330]) +2 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-iclb3/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-iclb4/igt@[email protected]
* igt@gem_userptr_blits@sync-unmap-after-close:
- shard-hsw: [DMESG-WARN][99] ([fdo#110789] / [fdo#111870]) -> [DMESG-WARN][100] ([fdo#111870])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-hsw8/igt@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-hsw2/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#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103313]: https://bugs.freed
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.IGT: failure for LMEM basics (rev2)
Hey,
Quoted 1 line · Patchwork
[...]
Quoted 4 lines
**FAILURE**
Serious unknown changes coming with
Patchwork_14658_fullabsolutely need to be verified manually.
[...]
Quoted 4 lines
* igt@gem_mmap_gtt@hang:
- shard-kbl: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-kbl3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-kbl6/igt@[email protected]
I'm getting same igt@gem_mmap_gtt@hang failure on my display audio related patchset:
https://patchwork.freedesktop.org/series/67528/
... so this seems to be happening in the baseline as well...?
Br, Kai
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.IGT: failure for LMEM basics (rev2)
Quoting Kai Vehmanen (2019-10-04 13:06:43)
Quoted 16 lines
Hey,
Quoted 1 line · Patchwork
[...]
Quoted 4 lines
**FAILURE**
Serious unknown changes coming with
Patchwork_14658_fullabsolutely need to be verified manually.[...]
Quoted 4 lines
* igt@gem_mmap_gtt@hang:
- shard-kbl: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7000/shard-kbl3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14658/shard-kbl6/igt@[email protected]
Quoted 6 lines
I'm getting same igt@gem_mmap_gtt@hang failure on my display audio related patchset:
https://patchwork.freedesktop.org/series/67528/
... so this seems to be happening in the baseline as well...?
An artifact brought in by rc1, should be gone in a jiffie. -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx