drm/i915: Fix the sgt.pfn sanity check
Subsystems (2)
PATCH 1/3 drm/i915: Fix the sgt.pfn sanity check
From: Kui Wen <[email protected]>
For the device local-memory case, sgt.pfn will always be equal to zero, since we instead use sgt.dma. Also, for device local-memory it is perfectly valid for it to start from zero anyway, so no need to add a new check for that either.
--- drivers/gpu/drm/i915/i915_mm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_mm.c +1 -1
@@ -62,7 +62,7 @@ static int remap_sg(pte_t *pte, unsigned long addr, void *data) {struct remap_pfn *r = data; -if (GEM_WARN_ON (!r->sgt.pfn)) +if (GEM_WARN_ON (!r->sgt.sgp))return -EINVAL ;/* Special PTE are not associated with any struct page */
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915/error: Fix object page offset within a region
From: CQ Tang <[email protected]>
io_mapping_map_wc() expects the offset to be relative to the iomapping base address. Currently we just pass in the physical address for the page which only works if the region.start starts at zero.
--- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gpu_error.c +3 -1
@@ -1051,7 +1051,9 @@ i915_vma_coredump_create(const struct intel_gt *gt,for_each_sgt_daddr (dma, iter, vma->pages) {void __iomem *s; - s =io_mapping_map_wc (&mem->iomap, dma,PAGE_SIZE ); + s =io_mapping_map_wc (&mem->iomap, + dma - mem->region.start, +PAGE_SIZE ); ret =compress_page (compress, (void __force *)s, dst, true);
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915/pool: constrain pool objects by mapping type
In reply to Matthew AuldIn a few places we always end up mapping the pool object with the FORCE constraint(to prevent hitting -EBUSY) which will destroy the cached mapping if it has a different type. As a simple first step, make the mapping type part of the pool interface, where the behaviour is to only give out pool objects which match the requested mapping type.
--- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 14 ++++++++------ drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 8 ++++---- drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 12 +++++++++--- drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.h | 3 ++- .../gpu/drm/i915/gt/intel_gt_buffer_pool_types.h | 4 ++-- drivers/gpu/drm/i915/i915_cmd_parser.c | 2 +- 6 files changed, 26 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +8 -6
@@ -1275,8 +1275,12 @@ static int __reloc_gpu_alloc(struct i915_execbuffer *eb,u32 *cmd;int err; +if (!pool) { - pool =intel_gt_get_buffer_pool (engine->gt,PAGE_SIZE ); + pool =intel_gt_get_buffer_pool (engine->gt,PAGE_SIZE , + cache->has_llc ? +I915_MAP_WB : +I915_MAP_WC );if (IS_ERR (pool))return PTR_ERR (pool); }
@@ -1286,10 +1290,7 @@ static int __reloc_gpu_alloc(struct i915_execbuffer *eb,if (err) goto err_pool; - cmd =i915_gem_object_pin_map (pool->obj, - cache->has_llc ? -I915_MAP_FORCE_WB : -I915_MAP_FORCE_WC ); + cmd =i915_gem_object_pin_map (pool->obj, pool->type);if (IS_ERR (cmd)) { err =PTR_ERR (cmd); goto err_pool;
@@ -2458,7 +2459,8 @@ static int eb_parse(struct i915_execbuffer *eb)return -EINVAL ;if (!pool) { - pool =intel_gt_get_buffer_pool (eb->engine->gt, len); + pool =intel_gt_get_buffer_pool (eb->engine->gt, len, +I915_MAP_WB );if (IS_ERR (pool))return PTR_ERR (pool); eb->batch_pool = pool;
drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +4 -4
@@ -35,7 +35,7 @@ struct i915_vma *intel_emit_vma_fill_blt(struct intel_context *ce, count =div_u64 (round_up (vma->size, block_size), block_size); size = (1 +8 * count) *sizeof (u32); size =round_up (size,PAGE_SIZE ); - pool =intel_gt_get_buffer_pool (ce->engine->gt, size); + pool =intel_gt_get_buffer_pool (ce->engine->gt, size,I915_MAP_WC );if (IS_ERR (pool)) { err =PTR_ERR (pool); goto out_pm;
@@ -55,7 +55,7 @@ struct i915_vma *intel_emit_vma_fill_blt(struct intel_context *ce,if (unlikely (err)) goto out_put; - cmd =i915_gem_object_pin_map (pool->obj,I915_MAP_WC ); + cmd =i915_gem_object_pin_map (pool->obj, pool->type);if (IS_ERR (cmd)) { err =PTR_ERR (cmd); goto out_unpin;
@@ -257,7 +257,7 @@ struct i915_vma *intel_emit_vma_copy_blt(struct intel_context *ce, count =div_u64 (round_up (dst->size, block_size), block_size); size = (1 +11 * count) *sizeof (u32); size =round_up (size,PAGE_SIZE ); - pool =intel_gt_get_buffer_pool (ce->engine->gt, size); + pool =intel_gt_get_buffer_pool (ce->engine->gt, size,I915_MAP_WC );if (IS_ERR (pool)) { err =PTR_ERR (pool); goto out_pm;
@@ -277,7 +277,7 @@ struct i915_vma *intel_emit_vma_copy_blt(struct intel_context *ce,if (unlikely (err)) goto out_put; - cmd =i915_gem_object_pin_map (pool->obj,I915_MAP_WC ); + cmd =i915_gem_object_pin_map (pool->obj, pool->type);if (IS_ERR (cmd)) { err =PTR_ERR (cmd); goto out_unpin;
drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c +9 -3
@@ -145,7 +145,8 @@ static void pool_retire(struct i915_active *ref) }static struct intel_gt_buffer_pool_node * -node_create (struct intel_gt_buffer_pool *pool,size_t sz) +node_create (struct intel_gt_buffer_pool *pool,size_t sz, +enum i915_map_type type) {struct intel_gt *gt =to_gt (pool);struct intel_gt_buffer_pool_node *node;
@@ -169,12 +170,14 @@ node_create(struct intel_gt_buffer_pool *pool, size_t sz)i915_gem_object_set_readonly (obj); + node->type = type; node->obj = obj;return node; }struct intel_gt_buffer_pool_node * -intel_gt_get_buffer_pool (struct intel_gt *gt,size_t size) +intel_gt_get_buffer_pool (struct intel_gt *gt,size_t size, +enum i915_map_type type) {struct intel_gt_buffer_pool *pool = >->buffer_pool;struct intel_gt_buffer_pool_node *node;
@@ -191,6 +194,9 @@ intel_gt_get_buffer_pool(struct intel_gt *gt, size_t size)if (node->obj->base.size < size)continue ; +if (node->type != type) +continue ; + age =READ_ONCE (node->age);if (!age)continue ;
@@ -205,7 +211,7 @@ intel_gt_get_buffer_pool(struct intel_gt *gt, size_t size)rcu_read_unlock ();if (&node->link == list) { - node =node_create (pool, size); + node =node_create (pool, size, type);if (IS_ERR (node))return node; }
drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.h +2 -1
@@ -15,7 +15,8 @@ struct intel_gt;struct i915_request ;struct intel_gt_buffer_pool_node * -intel_gt_get_buffer_pool (struct intel_gt *gt,size_t size); +intel_gt_get_buffer_pool (struct intel_gt *gt,size_t size, +enum i915_map_type type); static inline int intel_gt_buffer_pool_mark_active(struct intel_gt_buffer_pool_node *node,
drivers/gpu/drm/i915/gt/intel_gt_buffer_pool_types.h +2 -2
@@ -11,10 +11,9 @@#include <linux/spinlock.h> #include <linux/workqueue.h> +#include "gem/i915_gem_object.h" #include "i915_active_types.h" -struct drm_i915_gem_object ; -struct intel_gt_buffer_pool {spinlock_t lock;struct list_head cache_list[4 ];
@@ -31,6 +30,7 @@ struct intel_gt_buffer_pool_node { struct rcu_head rcu; };unsigned long age; +enum i915_map_type type; };#endif /* INTEL_GT_BUFFER_POOL_TYPES_H */
drivers/gpu/drm/i915/i915_cmd_parser.c +1 -1
@@ -1143,7 +1143,7 @@ static u32 *copy_batch(struct drm_i915_gem_object *dst_obj,void *dst, *src;int ret; - dst =i915_gem_object_pin_map (dst_obj,I915_MAP_FORCE_WB ); + dst =i915_gem_object_pin_map (dst_obj,I915_MAP_WB );if (IS_ERR (dst))return dst;
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/3] drm/i915: Fix the sgt.pfn sanity check
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915: Fix the sgt.pfn sanity check
URL : https://patchwork.freedesktop.org/series/86003/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 957475c12689 drm/i915: Fix the sgt.pfn sanity check 871aa9992e36 drm/i915/error: Fix object page offset within a region 63fe6089d512 drm/i915/pool: constrain pool objects by mapping type -:23: CHECK:LINE_SPACING: Please don't use multiple blank lines #23: FILE: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:1278:
+
total: 0 errors, 0 warnings, 1 checks, 141 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915: Fix the sgt.pfn sanity check
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915: Fix the sgt.pfn sanity check
URL : https://patchwork.freedesktop.org/series/86003/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9636 -> Patchwork_19398
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_19398 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_19398, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19398/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_19398:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@gem_contexts:
- fi-icl-u2: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9636/fi-icl-u2/igt@i915_selftest@live@gem_contexts.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19398/fi-icl-u2/igt@i915_selftest@live@gem_contexts.html
Known issues
------------
Here are the changes found in Patchwork_19398 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@query-info:
- fi-tgl-y: NOTRUN -> [SKIP][3] ([fdo#109315] / [i915#2575])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19398/fi-tgl-y/igt@amdgpu/[email protected]
* igt@gem_render_tiled_blits@basic:
- fi-tgl-y: [PASS][4] -> [DMESG-WARN][5] ([i915#402]) +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9636/fi-tgl-y/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19398/fi-tgl-y/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-tgl-y: [PASS][6] -> [DMESG-WARN][7] ([i915#1982])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9636/fi-tgl-y/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19398/fi-tgl-y/igt@[email protected]
#### Possible fixes ####
* igt@debugfs_test@read_all_entries:
- fi-tgl-y: [DMESG-WARN][8] ([i915#402]) -> [PASS][9] +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9636/fi-tgl-y/igt@debugfs_test@read_all_entries.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19398/fi-tgl-y/igt@debugfs_test@read_all_entries.html
* igt@kms_chamelium@hdmi-crc-fast:
- fi-kbl-7500u: [DMESG-WARN][10] ([i915#2868]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9636/fi-kbl-7500u/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19398/fi-kbl-7500u/igt@[email protected]
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2868]: https://gitlab.freedesktop.org/drm/intel/issues/2868
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
Participating hosts (44 -> 38)
------------------------------
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-cml-drallion fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9636 -> Patchwork_19398
CI-20190529: 20190529
CI_DRM_9636: f560ac388c527f2f166897c9091f7b9ad652050f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5960: ace82fcd5f3623f8dde7c220a825873dc53dfae4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19398: 63fe6089d512d6d8ac579c1450fbd28842d8191c @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
63fe6089d512 drm/i915/pool: constrain pool objects by mapping type 871aa9992e36 drm/i915/error: Fix object page offset within a region 957475c12689 drm/i915: Fix the sgt.pfn sanity check
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19398/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx