drm/i915: introduce i915_gem_context_vm helper
Subsystems (2)
PATCH 1/1 drm/i915: introduce i915_gem_context_vm helper
Throughout the kernel it's a pretty common pattern to do:
vm = ctx->ppgtt ? &ctx->ppgtt->vm : &ctx->i915->ggtt.vm;
in order to determine the correct vm, so why not roll into a helper.
--- drivers/gpu/drm/i915/i915_gem_context.c | 5 +++++ drivers/gpu/drm/i915/i915_gem_context.h | 3 +++ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 7 ++----- drivers/gpu/drm/i915/i915_gpu_error.c | 3 +-- drivers/gpu/drm/i915/selftests/huge_pages.c | 13 ++++--------- drivers/gpu/drm/i915/selftests/i915_gem_context.c | 7 ++----- drivers/gpu/drm/i915/selftests/i915_request.c | 3 +-- drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 5 +---- 8 files changed, 19 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/i915_gem_context.c +5 -0
@@ -399,6 +399,11 @@ static void __destroy_hw_context(struct i915_gem_context *ctx,context_close (ctx); } +struct i915_address_space *i915_gem_context_vm (struct i915_gem_context *ctx) +{ +return ctx->ppgtt ? &ctx->ppgtt->vm : &ctx->i915->ggtt.vm; +} +static struct i915_gem_context *i915_gem_create_context (struct drm_i915_private *dev_priv,struct drm_i915_file_private *file_priv)
drivers/gpu/drm/i915/i915_gem_context.h +3 -0
@@ -39,6 +39,7 @@ struct drm_file;struct drm_i915_private ;struct drm_i915_file_private ; +struct i915_address_space ;struct i915_hw_ppgtt ;struct i915_request ;struct i915_vma ;
@@ -351,6 +352,8 @@ int i915_gem_context_reset_stats_ioctl(struct drm_device *dev, void *data,struct i915_gem_context *i915_gem_context_create_kernel (struct drm_i915_private *i915,int prio); +struct i915_address_space *i915_gem_context_vm (struct i915_gem_context *ctx); +static inline struct i915_gem_context *i915_gem_context_get (struct i915_gem_context *ctx) {
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 -5
@@ -740,12 +740,9 @@ static int eb_select_context(struct i915_execbuffer *eb)return -ENOENT ; eb->ctx = ctx; -if (ctx->ppgtt) { - eb->vm = &ctx->ppgtt->vm; + eb->vm =i915_gem_context_vm (ctx); +if (ctx->ppgtt) eb->invalid_flags |=EXEC_OBJECT_NEEDS_GTT ; - }else { - eb->vm = &eb->i915->ggtt.vm; - } eb->context_flags =0 ;if (test_bit (UCONTEXT_NO_ZEROMAP , &ctx->user_flags))
drivers/gpu/drm/i915/i915_gpu_error.c +1 -2
@@ -1416,7 +1416,6 @@ capture_object(struct drm_i915_private *dev_priv,static void gem_record_rings (struct i915_gpu_state *error) {struct drm_i915_private *i915 = error->i915; -struct i915_ggtt *ggtt = &i915->ggtt;int i;for (i =0 ; i <I915_NUM_ENGINES ; i++) {
@@ -1440,7 +1439,7 @@ static void gem_record_rings(struct i915_gpu_state *error)struct i915_gem_context *ctx = request->gem_context;struct intel_ring *ring; - ee->vm = ctx->ppgtt ? &ctx->ppgtt->vm : &ggtt->vm; + ee->vm =i915_gem_context_vm (ctx);record_context (&ee->context, ctx);
drivers/gpu/drm/i915/selftests/huge_pages.c +4 -9
@@ -1053,9 +1053,7 @@ static int __igt_write_huge(struct i915_gem_context *ctx, u64 size, u64 offset, u32 dword, u32 val) { - struct drm_i915_private *i915 = to_i915(obj->base.dev); -struct i915_address_space *vm = - ctx->ppgtt ? &ctx->ppgtt->vm : &i915->ggtt.vm; + struct i915_address_space *vm = i915_gem_context_vm(ctx);unsigned int flags =PIN_USER |PIN_OFFSET_FIXED ;struct i915_vma *vma;int err;
@@ -1108,8 +1106,7 @@ static int igt_write_huge(struct i915_gem_context *ctx, struct drm_i915_gem_object *obj) {struct drm_i915_private *i915 =to_i915 (obj->base.dev); -struct i915_address_space *vm = - ctx->ppgtt ? &ctx->ppgtt->vm : &i915->ggtt.vm; +struct i915_address_space *vm =i915_gem_context_vm (ctx);static struct intel_engine_cs *engines[I915_NUM_ENGINES ];struct intel_engine_cs *engine;I915_RND_STATE (prng);
@@ -1543,8 +1540,7 @@ static int igt_tmpfs_fallback(void *arg)struct i915_gem_context *ctx = arg;struct drm_i915_private *i915 = ctx->i915;struct vfsmount *gemfs = i915->mm.gemfs; -struct i915_address_space *vm = - ctx->ppgtt ? &ctx->ppgtt->vm : &i915->ggtt.vm; +struct i915_address_space *vm =i915_gem_context_vm (ctx);struct drm_i915_gem_object *obj;struct i915_vma *vma;u32 *vaddr;
@@ -1600,8 +1596,7 @@ static int igt_shrink_thp(void *arg) {struct i915_gem_context *ctx = arg;struct drm_i915_private *i915 = ctx->i915; -struct i915_address_space *vm = - ctx->ppgtt ? &ctx->ppgtt->vm : &i915->ggtt.vm; +struct i915_address_space *vm =i915_gem_context_vm (ctx);struct drm_i915_gem_object *obj;struct i915_vma *vma;unsigned int flags =PIN_USER ;
drivers/gpu/drm/i915/selftests/i915_gem_context.c +2 -5
@@ -310,9 +310,7 @@ static int gpu_fill(struct drm_i915_gem_object *obj, struct intel_engine_cs *engine, unsigned int dw) { -struct drm_i915_private *i915 =to_i915 (obj->base.dev); -struct i915_address_space *vm = - ctx->ppgtt ? &ctx->ppgtt->vm : &i915->ggtt.vm; +struct i915_address_space *vm =i915_gem_context_vm (ctx);struct i915_request *rq;struct i915_vma *vma;struct i915_vma *batch;
@@ -491,8 +489,7 @@ create_test_object(struct i915_gem_context *ctx, struct list_head *objects) {struct drm_i915_gem_object *obj; -struct i915_address_space *vm = - ctx->ppgtt ? &ctx->ppgtt->vm : &ctx->i915->ggtt.vm; +struct i915_address_space *vm =i915_gem_context_vm (ctx);u64 size;int err;
drivers/gpu/drm/i915/selftests/i915_request.c +1 -2
@@ -561,8 +561,7 @@ static int live_empty_request(void *arg)static struct i915_vma *recursive_batch (struct drm_i915_private *i915) {struct i915_gem_context *ctx = i915->kernel_context; -struct i915_address_space *vm = - ctx->ppgtt ? &ctx->ppgtt->vm : &i915->ggtt.vm; +struct i915_address_space *vm =i915_gem_context_vm (ctx);struct drm_i915_gem_object *obj;const int gen =INTEL_GEN (i915);struct i915_vma *vma;
drivers/gpu/drm/i915/selftests/intel_hangcheck.c +1 -4
@@ -106,10 +106,7 @@ static int emit_recurse_batch(struct hang *h, struct i915_request *rq) {struct drm_i915_private *i915 = h->i915; -struct i915_address_space *vm = - rq->gem_context->ppgtt ? - &rq->gem_context->ppgtt->vm : - &i915->ggtt.vm; +struct i915_address_space *vm =i915_gem_context_vm (rq->gem_context);struct i915_vma *hws, *vma;unsigned int flags;u32 *batch;
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Matthew Auld (2018-09-21 19:45:18)
Quoted 3 lines
Throughout the kernel it's a pretty common pattern to do:
vm = ctx->ppgtt ? &ctx->ppgtt->vm : &ctx->i915->ggtt.vm;
The plan has always been to work towards making ctx->ppgtt dtrt. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: introduce i915_gem_context_vm helper
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: drm/i915: introduce i915_gem_context_vm helper
URL : https://patchwork.freedesktop.org/series/50032/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4862 -> Patchwork_10255 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/50032/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10255 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_frontbuffer_tracking@basic:
fi-byt-clapper: PASS -> FAIL (fdo#103167)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
{fi-skl-caroline}: PASS -> INCOMPLETE (fdo#104108, fdo#107556)
==== Possible fixes ====
igt@kms_frontbuffer_tracking@basic:
fi-hsw-peppy: DMESG-WARN (fdo#102614) -> PASS
igt@kms_psr@primary_page_flip:
fi-cnl-u: FAIL (fdo#107336) -> PASS {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#107336 https://bugs.freedesktop.org/show_bug.cgi?id=107336
fdo#107556 https://bugs.freedesktop.org/show_bug.cgi?id=107556
== Participating hosts (51 -> 45) ==
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-icl-u
== Build changes ==
* Linux: CI_DRM_4862 -> Patchwork_10255
CI_DRM_4862: 51644a4ee1a2a3b98f290fbc95738953c611fcc4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4649: 19b0c74d20d9b53d4c82be14af0909a3b6846010 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10255: aad337f7cd06392dce1d3f61e0cf6333b228b691 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
aad337f7cd06 drm/i915: introduce i915_gem_context_vm helper
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10255/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: introduce i915_gem_context_vm helper
In reply to Matthew Auld== Series Details ==
== Series Details ==
Series: drm/i915: introduce i915_gem_context_vm helper
URL : https://patchwork.freedesktop.org/series/50032/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4862_full -> Patchwork_10255_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10255_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_10255_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_10255_full:
=== IGT changes ===
==== Warnings ====
igt@pm_rc6_residency@rc6-accuracy:
shard-kbl: SKIP -> PASS
shard-snb: PASS -> SKIP== Known issues ==
Here are the changes found in Patchwork_10255_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_await@wide-contexts:
shard-kbl: PASS -> FAIL (fdo#106680)
igt@gem_exec_big:
shard-hsw: PASS -> TIMEOUT (fdo#107937)
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
shard-glk: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_cursor_crc@cursor-256x256-suspend:
shard-kbl: PASS -> INCOMPLETE (fdo#103665)
igt@kms_setmode@basic:
shard-glk: NOTRUN -> FAIL (fdo#99912)
==== Possible fixes ====
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
shard-glk: FAIL (fdo#103167) -> PASS
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS
igt@perf@polling:
shard-hsw: FAIL (fdo#102252) -> PASS fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#106680 https://bugs.freedesktop.org/show_bug.cgi?id=106680
fdo#107937 https://bugs.freedesktop.org/show_bug.cgi?id=107937
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4862 -> Patchwork_10255
CI_DRM_4862: 51644a4ee1a2a3b98f290fbc95738953c611fcc4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4649: 19b0c74d20d9b53d4c82be14af0909a3b6846010 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10255: aad337f7cd06392dce1d3f61e0cf6333b228b691 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10255/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx