* [Intel-gfx] [PATCH] drm/i915: Remove vestigal i915_gem_context locals from cmdparser
@ 2019-12-04 23:26 Chris Wilson
2019-12-05 4:42 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Chris Wilson @ 2019-12-04 23:26 UTC (permalink / raw)
To: intel-gfx
The use GEM context itself was removed in commit cd30a5031704
("drm/i915/gem: Excise the per-batch whitelist from the context"), but
the locals were left in place as an oversight. Remove the parameters and
clean up.
References: cd30a5031704 ("drm/i915/gem: Excise the per-batch whitelist from the context")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +--
drivers/gpu/drm/i915/i915_cmd_parser.c | 11 ++++-------
drivers/gpu/drm/i915/i915_drv.h | 3 +--
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 459f4d40b69b..34044c6203a5 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -2022,8 +2022,7 @@ static struct i915_vma *eb_parse(struct i915_execbuffer *eb)
shadow_batch_start = gen8_canonical_addr(vma->node.start);
- err = intel_engine_cmd_parser(eb->gem_context,
- eb->engine,
+ err = intel_engine_cmd_parser(eb->engine,
eb->batch->obj,
batch_start,
eb->batch_start_offset,
diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
index 9125e89a9e7f..2ed497e7c9fd 100644
--- a/drivers/gpu/drm/i915/i915_cmd_parser.c
+++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
@@ -1306,8 +1306,7 @@ static bool check_cmd(const struct intel_engine_cs *engine,
return true;
}
-static int check_bbstart(const struct i915_gem_context *ctx,
- u32 *cmd, u32 offset, u32 length,
+static int check_bbstart(u32 *cmd, u32 offset, u32 length,
u32 batch_len,
u64 batch_start,
u64 shadow_batch_start,
@@ -1392,7 +1391,6 @@ alloc_whitelist(struct drm_i915_private *i915, u32 batch_len)
/**
* i915_parse_cmds() - parse a submitted batch buffer for privilege violations
- * @ctx: the context in which the batch is to execute
* @engine: the engine on which the batch is to execute
* @batch_obj: the batch buffer in question
* @batch_start: Canonical base address of batch
@@ -1408,8 +1406,7 @@ alloc_whitelist(struct drm_i915_private *i915, u32 batch_len)
* if the batch appears legal but should use hardware parsing
*/
-int intel_engine_cmd_parser(struct i915_gem_context *ctx,
- struct intel_engine_cs *engine,
+int intel_engine_cmd_parser(struct intel_engine_cs *engine,
struct drm_i915_gem_object *batch_obj,
u64 batch_start,
u32 batch_start_offset,
@@ -1433,7 +1430,7 @@ int intel_engine_cmd_parser(struct i915_gem_context *ctx,
}
/* Defer failure until attempted use */
- jump_whitelist = alloc_whitelist(ctx->i915, batch_len);
+ jump_whitelist = alloc_whitelist(engine->i915, batch_len);
/*
* We use the batch length as size because the shadow object is as
@@ -1475,7 +1472,7 @@ int intel_engine_cmd_parser(struct i915_gem_context *ctx,
}
if (desc->cmd.value == MI_BATCH_BUFFER_START) {
- ret = check_bbstart(ctx, cmd, offset, length,
+ ret = check_bbstart(cmd, offset, length,
batch_len, batch_start,
shadow_batch_start,
jump_whitelist);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 0d4ad18e10dd..c3d8af28bfc1 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1947,8 +1947,7 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type);
int i915_cmd_parser_get_version(struct drm_i915_private *dev_priv);
void intel_engine_init_cmd_parser(struct intel_engine_cs *engine);
void intel_engine_cleanup_cmd_parser(struct intel_engine_cs *engine);
-int intel_engine_cmd_parser(struct i915_gem_context *cxt,
- struct intel_engine_cs *engine,
+int intel_engine_cmd_parser(struct intel_engine_cs *engine,
struct drm_i915_gem_object *batch_obj,
u64 user_batch_start,
u32 batch_start_offset,
--
2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Remove vestigal i915_gem_context locals from cmdparser
2019-12-04 23:26 [Intel-gfx] [PATCH] drm/i915: Remove vestigal i915_gem_context locals from cmdparser Chris Wilson
@ 2019-12-05 4:42 ` Patchwork
2019-12-05 5:03 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2019-12-05 10:12 ` [Intel-gfx] [PATCH] " Mika Kuoppala
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2019-12-05 4:42 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Remove vestigal i915_gem_context locals from cmdparser
URL : https://patchwork.freedesktop.org/series/70467/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
ffb501993b60 drm/i915: Remove vestigal i915_gem_context locals from cmdparser
-:12: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#12:
References: cd30a5031704 ("drm/i915/gem: Excise the per-batch whitelist from the context")
-:12: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit cd30a5031704 ("drm/i915/gem: Excise the per-batch whitelist from the context")'
#12:
References: cd30a5031704 ("drm/i915/gem: Excise the per-batch whitelist from the context")
total: 1 errors, 1 warnings, 0 checks, 59 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Remove vestigal i915_gem_context locals from cmdparser
2019-12-04 23:26 [Intel-gfx] [PATCH] drm/i915: Remove vestigal i915_gem_context locals from cmdparser Chris Wilson
2019-12-05 4:42 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2019-12-05 5:03 ` Patchwork
2019-12-05 10:12 ` [Intel-gfx] [PATCH] " Mika Kuoppala
2 siblings, 0 replies; 4+ messages in thread
From: Patchwork @ 2019-12-05 5:03 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Remove vestigal i915_gem_context locals from cmdparser
URL : https://patchwork.freedesktop.org/series/70467/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7486 -> Patchwork_15594
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15594/index.html
Known issues
------------
Here are the changes found in Patchwork_15594 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-hsw-4770: [PASS][1] -> [SKIP][2] ([fdo#109271]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7486/fi-hsw-4770/igt@i915_pm_rpm@basic-pci-d3-state.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15594/fi-hsw-4770/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@i915_selftest@live_gem_contexts:
- fi-hsw-peppy: [PASS][3] -> [INCOMPLETE][4] ([i915#694])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7486/fi-hsw-peppy/igt@i915_selftest@live_gem_contexts.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15594/fi-hsw-peppy/igt@i915_selftest@live_gem_contexts.html
#### Possible fixes ####
* igt@i915_selftest@live_blt:
- fi-bsw-nick: [DMESG-FAIL][5] ([i915#563]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7486/fi-bsw-nick/igt@i915_selftest@live_blt.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15594/fi-bsw-nick/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_gem_contexts:
- fi-byt-n2820: [INCOMPLETE][7] ([i915#45]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7486/fi-byt-n2820/igt@i915_selftest@live_gem_contexts.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15594/fi-byt-n2820/igt@i915_selftest@live_gem_contexts.html
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [DMESG-WARN][9] ([i915#44]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7486/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15594/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
#### Warnings ####
* igt@i915_selftest@live_blt:
- fi-hsw-4770: [DMESG-FAIL][11] ([i915#683]) -> [DMESG-FAIL][12] ([i915#563])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7486/fi-hsw-4770/igt@i915_selftest@live_blt.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15594/fi-hsw-4770/igt@i915_selftest@live_blt.html
- fi-hsw-4770r: [DMESG-FAIL][13] ([i915#683]) -> [DMESG-FAIL][14] ([i915#563])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7486/fi-hsw-4770r/igt@i915_selftest@live_blt.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15594/fi-hsw-4770r/igt@i915_selftest@live_blt.html
* igt@kms_busy@basic-flip-pipe-b:
- fi-kbl-x1275: [DMESG-WARN][15] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][16] ([i915#62] / [i915#92]) +3 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7486/fi-kbl-x1275/igt@kms_busy@basic-flip-pipe-b.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15594/fi-kbl-x1275/igt@kms_busy@basic-flip-pipe-b.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-kbl-x1275: [DMESG-WARN][17] ([i915#62] / [i915#92]) -> [DMESG-WARN][18] ([i915#62] / [i915#92] / [i915#95]) +6 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7486/fi-kbl-x1275/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15594/fi-kbl-x1275/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111736]: https://bugs.freedesktop.org/show_bug.cgi?id=111736
[i915#44]: https://gitlab.freedesktop.org/drm/intel/issues/44
[i915#45]: https://gitlab.freedesktop.org/drm/intel/issues/45
[i915#472]: https://gitlab.freedesktop.org/drm/intel/issues/472
[i915#563]: https://gitlab.freedesktop.org/drm/intel/issues/563
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#683]: https://gitlab.freedesktop.org/drm/intel/issues/683
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#707]: https://gitlab.freedesktop.org/drm/intel/issues/707
[i915#710]: https://gitlab.freedesktop.org/drm/intel/issues/710
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (53 -> 46)
------------------------------
Additional (1): fi-cfl-8109u
Missing (8): fi-ilk-m540 fi-hsw-4200u fi-bsw-n3050 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7486 -> Patchwork_15594
CI-20190529: 20190529
CI_DRM_7486: 8bd05bdd30fdd1b56307b780ab0f0e8de878c75a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5331: dad473697b2e6bb5c45d7fec533b20d5dbe4fa17 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15594: ffb501993b60735953a99ea37f86219692ce9c2d @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
ffb501993b60 drm/i915: Remove vestigal i915_gem_context locals from cmdparser
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15594/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Remove vestigal i915_gem_context locals from cmdparser
2019-12-04 23:26 [Intel-gfx] [PATCH] drm/i915: Remove vestigal i915_gem_context locals from cmdparser Chris Wilson
2019-12-05 4:42 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-12-05 5:03 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2019-12-05 10:12 ` Mika Kuoppala
2 siblings, 0 replies; 4+ messages in thread
From: Mika Kuoppala @ 2019-12-05 10:12 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
Chris Wilson <chris@chris-wilson.co.uk> writes:
> The use GEM context itself was removed in commit cd30a5031704
> ("drm/i915/gem: Excise the per-batch whitelist from the context"), but
> the locals were left in place as an oversight. Remove the parameters and
> clean up.
>
> References: cd30a5031704 ("drm/i915/gem: Excise the per-batch whitelist from the context")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +--
> drivers/gpu/drm/i915/i915_cmd_parser.c | 11 ++++-------
> drivers/gpu/drm/i915/i915_drv.h | 3 +--
> 3 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> index 459f4d40b69b..34044c6203a5 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> @@ -2022,8 +2022,7 @@ static struct i915_vma *eb_parse(struct i915_execbuffer *eb)
>
> shadow_batch_start = gen8_canonical_addr(vma->node.start);
>
> - err = intel_engine_cmd_parser(eb->gem_context,
> - eb->engine,
> + err = intel_engine_cmd_parser(eb->engine,
> eb->batch->obj,
> batch_start,
> eb->batch_start_offset,
> diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
> index 9125e89a9e7f..2ed497e7c9fd 100644
> --- a/drivers/gpu/drm/i915/i915_cmd_parser.c
> +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
> @@ -1306,8 +1306,7 @@ static bool check_cmd(const struct intel_engine_cs *engine,
> return true;
> }
>
> -static int check_bbstart(const struct i915_gem_context *ctx,
> - u32 *cmd, u32 offset, u32 length,
> +static int check_bbstart(u32 *cmd, u32 offset, u32 length,
> u32 batch_len,
> u64 batch_start,
> u64 shadow_batch_start,
> @@ -1392,7 +1391,6 @@ alloc_whitelist(struct drm_i915_private *i915, u32 batch_len)
>
> /**
> * i915_parse_cmds() - parse a submitted batch buffer for privilege violations
> - * @ctx: the context in which the batch is to execute
> * @engine: the engine on which the batch is to execute
> * @batch_obj: the batch buffer in question
> * @batch_start: Canonical base address of batch
> @@ -1408,8 +1406,7 @@ alloc_whitelist(struct drm_i915_private *i915, u32 batch_len)
> * if the batch appears legal but should use hardware parsing
> */
>
> -int intel_engine_cmd_parser(struct i915_gem_context *ctx,
> - struct intel_engine_cs *engine,
> +int intel_engine_cmd_parser(struct intel_engine_cs *engine,
> struct drm_i915_gem_object *batch_obj,
> u64 batch_start,
> u32 batch_start_offset,
> @@ -1433,7 +1430,7 @@ int intel_engine_cmd_parser(struct i915_gem_context *ctx,
> }
>
> /* Defer failure until attempted use */
> - jump_whitelist = alloc_whitelist(ctx->i915, batch_len);
> + jump_whitelist = alloc_whitelist(engine->i915, batch_len);
>
> /*
> * We use the batch length as size because the shadow object is as
> @@ -1475,7 +1472,7 @@ int intel_engine_cmd_parser(struct i915_gem_context *ctx,
> }
>
> if (desc->cmd.value == MI_BATCH_BUFFER_START) {
> - ret = check_bbstart(ctx, cmd, offset, length,
> + ret = check_bbstart(cmd, offset, length,
> batch_len, batch_start,
> shadow_batch_start,
> jump_whitelist);
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 0d4ad18e10dd..c3d8af28bfc1 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1947,8 +1947,7 @@ const char *i915_cache_level_str(struct drm_i915_private *i915, int type);
> int i915_cmd_parser_get_version(struct drm_i915_private *dev_priv);
> void intel_engine_init_cmd_parser(struct intel_engine_cs *engine);
> void intel_engine_cleanup_cmd_parser(struct intel_engine_cs *engine);
> -int intel_engine_cmd_parser(struct i915_gem_context *cxt,
> - struct intel_engine_cs *engine,
> +int intel_engine_cmd_parser(struct intel_engine_cs *engine,
> struct drm_i915_gem_object *batch_obj,
> u64 user_batch_start,
> u32 batch_start_offset,
> --
> 2.24.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-12-05 10:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-04 23:26 [Intel-gfx] [PATCH] drm/i915: Remove vestigal i915_gem_context locals from cmdparser Chris Wilson
2019-12-05 4:42 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-12-05 5:03 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2019-12-05 10:12 ` [Intel-gfx] [PATCH] " Mika Kuoppala
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.