* [PATCH] drm/i915/gt: Declare gen9 has 64 mocs entries!
@ 2020-11-27 10:25 ` Chris Wilson
0 siblings, 0 replies; 8+ messages in thread
From: Chris Wilson @ 2020-11-27 10:25 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson, stable
We checked the table size against a hardcoded number of entries, and
that number was excluding the special mocs registers at the end.
Fixes: 977933b5da7c ("drm/i915/gt: Program mocs:63 for cache eviction on gen9")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: <stable@vger.kernel.org> # v4.3+
---
drivers/gpu/drm/i915/gt/intel_mocs.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
index b8d0c32ae9dd..ab6870242e18 100644
--- a/drivers/gpu/drm/i915/gt/intel_mocs.c
+++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
@@ -59,8 +59,7 @@ struct drm_i915_mocs_table {
#define _L3_CACHEABILITY(value) ((value) << 4)
/* Helper defines */
-#define GEN9_NUM_MOCS_ENTRIES 62 /* 62 out of 64 - 63 & 64 are reserved. */
-#define GEN11_NUM_MOCS_ENTRIES 64 /* 63-64 are reserved, but configured. */
+#define GEN9_NUM_MOCS_ENTRIES 64 /* 63-64 are reserved, but configured. */
/* (e)LLC caching options */
/*
@@ -361,15 +360,15 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915,
if (IS_DG1(i915)) {
table->size = ARRAY_SIZE(dg1_mocs_table);
table->table = dg1_mocs_table;
- table->n_entries = GEN11_NUM_MOCS_ENTRIES;
+ table->n_entries = GEN9_NUM_MOCS_ENTRIES;
} else if (INTEL_GEN(i915) >= 12) {
table->size = ARRAY_SIZE(tgl_mocs_table);
table->table = tgl_mocs_table;
- table->n_entries = GEN11_NUM_MOCS_ENTRIES;
+ table->n_entries = GEN9_NUM_MOCS_ENTRIES;
} else if (IS_GEN(i915, 11)) {
table->size = ARRAY_SIZE(icl_mocs_table);
table->table = icl_mocs_table;
- table->n_entries = GEN11_NUM_MOCS_ENTRIES;
+ table->n_entries = GEN9_NUM_MOCS_ENTRIES;
} else if (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915)) {
table->size = ARRAY_SIZE(skl_mocs_table);
table->n_entries = GEN9_NUM_MOCS_ENTRIES;
--
2.20.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH] drm/i915/gt: Declare gen9 has 64 mocs entries!
@ 2020-11-27 10:25 ` Chris Wilson
0 siblings, 0 replies; 8+ messages in thread
From: Chris Wilson @ 2020-11-27 10:25 UTC (permalink / raw)
To: intel-gfx; +Cc: stable, Chris Wilson
We checked the table size against a hardcoded number of entries, and
that number was excluding the special mocs registers at the end.
Fixes: 977933b5da7c ("drm/i915/gt: Program mocs:63 for cache eviction on gen9")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: <stable@vger.kernel.org> # v4.3+
---
drivers/gpu/drm/i915/gt/intel_mocs.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
index b8d0c32ae9dd..ab6870242e18 100644
--- a/drivers/gpu/drm/i915/gt/intel_mocs.c
+++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
@@ -59,8 +59,7 @@ struct drm_i915_mocs_table {
#define _L3_CACHEABILITY(value) ((value) << 4)
/* Helper defines */
-#define GEN9_NUM_MOCS_ENTRIES 62 /* 62 out of 64 - 63 & 64 are reserved. */
-#define GEN11_NUM_MOCS_ENTRIES 64 /* 63-64 are reserved, but configured. */
+#define GEN9_NUM_MOCS_ENTRIES 64 /* 63-64 are reserved, but configured. */
/* (e)LLC caching options */
/*
@@ -361,15 +360,15 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915,
if (IS_DG1(i915)) {
table->size = ARRAY_SIZE(dg1_mocs_table);
table->table = dg1_mocs_table;
- table->n_entries = GEN11_NUM_MOCS_ENTRIES;
+ table->n_entries = GEN9_NUM_MOCS_ENTRIES;
} else if (INTEL_GEN(i915) >= 12) {
table->size = ARRAY_SIZE(tgl_mocs_table);
table->table = tgl_mocs_table;
- table->n_entries = GEN11_NUM_MOCS_ENTRIES;
+ table->n_entries = GEN9_NUM_MOCS_ENTRIES;
} else if (IS_GEN(i915, 11)) {
table->size = ARRAY_SIZE(icl_mocs_table);
table->table = icl_mocs_table;
- table->n_entries = GEN11_NUM_MOCS_ENTRIES;
+ table->n_entries = GEN9_NUM_MOCS_ENTRIES;
} else if (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915)) {
table->size = ARRAY_SIZE(skl_mocs_table);
table->n_entries = GEN9_NUM_MOCS_ENTRIES;
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Declare gen9 has 64 mocs entries!
2020-11-27 10:25 ` [Intel-gfx] " Chris Wilson
@ 2020-11-27 10:31 ` Tvrtko Ursulin
-1 siblings, 0 replies; 8+ messages in thread
From: Tvrtko Ursulin @ 2020-11-27 10:31 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: stable
On 27/11/2020 10:25, Chris Wilson wrote:
> We checked the table size against a hardcoded number of entries, and
> that number was excluding the special mocs registers at the end.
>
> Fixes: 977933b5da7c ("drm/i915/gt: Program mocs:63 for cache eviction on gen9")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: <stable@vger.kernel.org> # v4.3+
> ---
> drivers/gpu/drm/i915/gt/intel_mocs.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
> index b8d0c32ae9dd..ab6870242e18 100644
> --- a/drivers/gpu/drm/i915/gt/intel_mocs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
> @@ -59,8 +59,7 @@ struct drm_i915_mocs_table {
> #define _L3_CACHEABILITY(value) ((value) << 4)
>
> /* Helper defines */
> -#define GEN9_NUM_MOCS_ENTRIES 62 /* 62 out of 64 - 63 & 64 are reserved. */
> -#define GEN11_NUM_MOCS_ENTRIES 64 /* 63-64 are reserved, but configured. */
> +#define GEN9_NUM_MOCS_ENTRIES 64 /* 63-64 are reserved, but configured. */
>
> /* (e)LLC caching options */
> /*
> @@ -361,15 +360,15 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915,
> if (IS_DG1(i915)) {
> table->size = ARRAY_SIZE(dg1_mocs_table);
> table->table = dg1_mocs_table;
> - table->n_entries = GEN11_NUM_MOCS_ENTRIES;
> + table->n_entries = GEN9_NUM_MOCS_ENTRIES;
> } else if (INTEL_GEN(i915) >= 12) {
> table->size = ARRAY_SIZE(tgl_mocs_table);
> table->table = tgl_mocs_table;
> - table->n_entries = GEN11_NUM_MOCS_ENTRIES;
> + table->n_entries = GEN9_NUM_MOCS_ENTRIES;
> } else if (IS_GEN(i915, 11)) {
> table->size = ARRAY_SIZE(icl_mocs_table);
> table->table = icl_mocs_table;
> - table->n_entries = GEN11_NUM_MOCS_ENTRIES;
> + table->n_entries = GEN9_NUM_MOCS_ENTRIES;
> } else if (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915)) {
> table->size = ARRAY_SIZE(skl_mocs_table);
> table->n_entries = GEN9_NUM_MOCS_ENTRIES;
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Declare gen9 has 64 mocs entries!
@ 2020-11-27 10:31 ` Tvrtko Ursulin
0 siblings, 0 replies; 8+ messages in thread
From: Tvrtko Ursulin @ 2020-11-27 10:31 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: stable
On 27/11/2020 10:25, Chris Wilson wrote:
> We checked the table size against a hardcoded number of entries, and
> that number was excluding the special mocs registers at the end.
>
> Fixes: 977933b5da7c ("drm/i915/gt: Program mocs:63 for cache eviction on gen9")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: <stable@vger.kernel.org> # v4.3+
> ---
> drivers/gpu/drm/i915/gt/intel_mocs.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
> index b8d0c32ae9dd..ab6870242e18 100644
> --- a/drivers/gpu/drm/i915/gt/intel_mocs.c
> +++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
> @@ -59,8 +59,7 @@ struct drm_i915_mocs_table {
> #define _L3_CACHEABILITY(value) ((value) << 4)
>
> /* Helper defines */
> -#define GEN9_NUM_MOCS_ENTRIES 62 /* 62 out of 64 - 63 & 64 are reserved. */
> -#define GEN11_NUM_MOCS_ENTRIES 64 /* 63-64 are reserved, but configured. */
> +#define GEN9_NUM_MOCS_ENTRIES 64 /* 63-64 are reserved, but configured. */
>
> /* (e)LLC caching options */
> /*
> @@ -361,15 +360,15 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915,
> if (IS_DG1(i915)) {
> table->size = ARRAY_SIZE(dg1_mocs_table);
> table->table = dg1_mocs_table;
> - table->n_entries = GEN11_NUM_MOCS_ENTRIES;
> + table->n_entries = GEN9_NUM_MOCS_ENTRIES;
> } else if (INTEL_GEN(i915) >= 12) {
> table->size = ARRAY_SIZE(tgl_mocs_table);
> table->table = tgl_mocs_table;
> - table->n_entries = GEN11_NUM_MOCS_ENTRIES;
> + table->n_entries = GEN9_NUM_MOCS_ENTRIES;
> } else if (IS_GEN(i915, 11)) {
> table->size = ARRAY_SIZE(icl_mocs_table);
> table->table = icl_mocs_table;
> - table->n_entries = GEN11_NUM_MOCS_ENTRIES;
> + table->n_entries = GEN9_NUM_MOCS_ENTRIES;
> } else if (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915)) {
> table->size = ARRAY_SIZE(skl_mocs_table);
> table->n_entries = GEN9_NUM_MOCS_ENTRIES;
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gt: Declare gen9 has 64 mocs entries!
2020-11-27 10:25 ` [Intel-gfx] " Chris Wilson
(?)
(?)
@ 2020-11-27 12:03 ` Patchwork
-1 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2020-11-27 12:03 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gt: Declare gen9 has 64 mocs entries!
URL : https://patchwork.freedesktop.org/series/84339/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
2e1d56e73742 drm/i915/gt: Declare gen9 has 64 mocs entries!
-:11: WARNING:BAD_SIGN_OFF: email address '<stable@vger.kernel.org> # v4.3+' might be better as 'stable@vger.kernel.org# v4.3+'
#11:
Cc: <stable@vger.kernel.org> # v4.3+
total: 0 errors, 1 warnings, 0 checks, 27 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Declare gen9 has 64 mocs entries!
2020-11-27 10:25 ` [Intel-gfx] " Chris Wilson
` (2 preceding siblings ...)
(?)
@ 2020-11-27 12:32 ` Patchwork
-1 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2020-11-27 12:32 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 6109 bytes --]
== Series Details ==
Series: drm/i915/gt: Declare gen9 has 64 mocs entries!
URL : https://patchwork.freedesktop.org/series/84339/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9397 -> Patchwork_18996
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/index.html
New tests
---------
New tests have been introduced between CI_DRM_9397 and Patchwork_18996:
### New CI tests (1) ###
* boot:
- Statuses : 40 pass(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in Patchwork_18996 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s0:
- fi-apl-guc: [PASS][1] -> [DMESG-WARN][2] ([i915#62]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/fi-apl-guc/igt@gem_exec_suspend@basic-s0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/fi-apl-guc/igt@gem_exec_suspend@basic-s0.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-icl-u2: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/fi-icl-u2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/fi-icl-u2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
* igt@kms_psr@cursor_plane_move:
- fi-tgl-y: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/fi-tgl-y/igt@kms_psr@cursor_plane_move.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/fi-tgl-y/igt@kms_psr@cursor_plane_move.html
* igt@vgem_basic@debugfs:
- fi-tgl-y: [PASS][7] -> [DMESG-WARN][8] ([i915#402])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/fi-tgl-y/igt@vgem_basic@debugfs.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/fi-tgl-y/igt@vgem_basic@debugfs.html
#### Possible fixes ####
* igt@i915_module_load@reload:
- fi-icl-u2: [DMESG-WARN][9] ([i915#1982]) -> [PASS][10] +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/fi-icl-u2/igt@i915_module_load@reload.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/fi-icl-u2/igt@i915_module_load@reload.html
- fi-tgl-u2: [DMESG-WARN][11] ([i915#1982] / [k.org#205379]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/fi-tgl-u2/igt@i915_module_load@reload.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/fi-tgl-u2/igt@i915_module_load@reload.html
* igt@i915_selftest@live@active:
- fi-icl-u2: [DMESG-FAIL][13] -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/fi-icl-u2/igt@i915_selftest@live@active.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/fi-icl-u2/igt@i915_selftest@live@active.html
* igt@prime_vgem@basic-gtt:
- fi-tgl-y: [DMESG-WARN][15] ([i915#402]) -> [PASS][16] +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/fi-tgl-y/igt@prime_vgem@basic-gtt.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/fi-tgl-y/igt@prime_vgem@basic-gtt.html
#### Warnings ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-tgl-y: [DMESG-WARN][17] ([i915#2411]) -> [DMESG-WARN][18] ([i915#1982] / [i915#2411])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/fi-tgl-y/igt@i915_pm_rpm@basic-pci-d3-state.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/fi-tgl-y/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@runner@aborted:
- fi-kbl-8809g: [FAIL][19] ([i915#1569] / [i915#192] / [i915#193] / [i915#194] / [i915#2295] / [i915#2722]) -> [FAIL][20] ([i915#1186] / [i915#2426] / [i915#2722])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/fi-kbl-8809g/igt@runner@aborted.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/fi-kbl-8809g/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1186]: https://gitlab.freedesktop.org/drm/intel/issues/1186
[i915#1569]: https://gitlab.freedesktop.org/drm/intel/issues/1569
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#192]: https://gitlab.freedesktop.org/drm/intel/issues/192
[i915#193]: https://gitlab.freedesktop.org/drm/intel/issues/193
[i915#194]: https://gitlab.freedesktop.org/drm/intel/issues/194
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#483]: https://gitlab.freedesktop.org/drm/intel/issues/483
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[k.org#205379]: https://bugzilla.kernel.org/show_bug.cgi?id=205379
Participating hosts (44 -> 40)
------------------------------
Missing (4): fi-ilk-m540 fi-bsw-cyan fi-bdw-samus fi-hsw-4200u
Build changes
-------------
* Linux: CI_DRM_9397 -> Patchwork_18996
CI-20190529: 20190529
CI_DRM_9397: 17a8f6e3b3c8daf242a4bd422147eaf03e9dcea7 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5872: d8ebb937c76184d5e526c59a2c18abca1c7a03c1 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18996: 2e1d56e73742fc15368dda5728660fbd8c856f6c @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
2e1d56e73742 drm/i915/gt: Declare gen9 has 64 mocs entries!
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/index.html
[-- Attachment #1.2: Type: text/html, Size: 7309 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/gt: Declare gen9 has 64 mocs entries!
2020-11-27 10:25 ` [Intel-gfx] " Chris Wilson
` (3 preceding siblings ...)
(?)
@ 2020-11-27 14:14 ` Patchwork
-1 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2020-11-27 14:14 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 14955 bytes --]
== Series Details ==
Series: drm/i915/gt: Declare gen9 has 64 mocs entries!
URL : https://patchwork.freedesktop.org/series/84339/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9397_full -> Patchwork_18996_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18996_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_18996_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_18996_full:
### IGT changes ###
#### Possible regressions ####
* igt@i915_pm_dc@dc5-dpms:
- shard-glk: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-glk8/igt@i915_pm_dc@dc5-dpms.html
- shard-kbl: NOTRUN -> [FAIL][2]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-kbl7/igt@i915_pm_dc@dc5-dpms.html
New tests
---------
New tests have been introduced between CI_DRM_9397_full and Patchwork_18996_full:
### New CI tests (1) ###
* boot:
- Statuses : 200 pass(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in Patchwork_18996_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [PASS][3] -> [SKIP][4] ([i915#2190])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-tglb2/igt@gem_huc_copy@huc-copy.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-tglb6/igt@gem_huc_copy@huc-copy.html
* igt@kms_flip@flip-vs-blocking-wf-vblank@b-edp1:
- shard-tglb: [PASS][5] -> [DMESG-WARN][6] ([i915#1982])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-tglb1/igt@kms_flip@flip-vs-blocking-wf-vblank@b-edp1.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-tglb7/igt@kms_flip@flip-vs-blocking-wf-vblank@b-edp1.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1:
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#79]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-glk3/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-glk5/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1.html
* igt@kms_flip@flip-vs-wf_vblank-interruptible@a-dp1:
- shard-apl: [PASS][9] -> [DMESG-WARN][10] ([i915#1982]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-apl2/igt@kms_flip@flip-vs-wf_vblank-interruptible@a-dp1.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-apl6/igt@kms_flip@flip-vs-wf_vblank-interruptible@a-dp1.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-mmap-gtt:
- shard-iclb: [PASS][11] -> [DMESG-WARN][12] ([i915#1982])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-mmap-gtt.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-iclb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-mmap-gtt.html
* igt@kms_psr@psr2_primary_render:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#109441])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-iclb2/igt@kms_psr@psr2_primary_render.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-iclb1/igt@kms_psr@psr2_primary_render.html
* igt@perf_pmu@module-unload:
- shard-tglb: [PASS][15] -> [DMESG-WARN][16] ([i915#1982] / [i915#262])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-tglb1/igt@perf_pmu@module-unload.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-tglb7/igt@perf_pmu@module-unload.html
#### Possible fixes ####
* igt@gem_ctx_persistence@engines-hostile@vcs0:
- shard-iclb: [FAIL][17] -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-iclb1/igt@gem_ctx_persistence@engines-hostile@vcs0.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-iclb8/igt@gem_ctx_persistence@engines-hostile@vcs0.html
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-hsw: [WARN][19] ([i915#1519]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-hsw1/igt@i915_pm_rc6_residency@rc6-fence.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-hsw5/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@kms_cursor_edge_walk@pipe-c-256x256-left-edge:
- shard-apl: [DMESG-WARN][21] ([i915#1982]) -> [PASS][22] +2 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-apl7/igt@kms_cursor_edge_walk@pipe-c-256x256-left-edge.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-apl2/igt@kms_cursor_edge_walk@pipe-c-256x256-left-edge.html
* igt@kms_cursor_legacy@flip-vs-cursor-crc-atomic:
- shard-tglb: [FAIL][23] ([i915#2346]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-tglb3/igt@kms_cursor_legacy@flip-vs-cursor-crc-atomic.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-tglb5/igt@kms_cursor_legacy@flip-vs-cursor-crc-atomic.html
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ab-vga1-hdmi-a1:
- shard-hsw: [FAIL][25] ([i915#2122]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-hsw2/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ab-vga1-hdmi-a1.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-hsw1/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ab-vga1-hdmi-a1.html
* igt@kms_flip@basic-flip-vs-wf_vblank@a-edp1:
- shard-tglb: [DMESG-WARN][27] ([i915#1982]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-tglb6/igt@kms_flip@basic-flip-vs-wf_vblank@a-edp1.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-tglb1/igt@kms_flip@basic-flip-vs-wf_vblank@a-edp1.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant:
- shard-glk: [DMESG-WARN][29] ([i915#1982]) -> [PASS][30] +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-glk4/igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-glk7/igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant.html
* igt@kms_psr@psr2_cursor_plane_onoff:
- shard-iclb: [SKIP][31] ([fdo#109441]) -> [PASS][32] +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-iclb4/igt@kms_psr@psr2_cursor_plane_onoff.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-iclb2/igt@kms_psr@psr2_cursor_plane_onoff.html
#### Warnings ####
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][33] ([i915#2681] / [i915#2684]) -> [WARN][34] ([i915#2684])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-iclb8/igt@i915_pm_rc6_residency@rc6-fence.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-iclb5/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][35] ([i915#1804] / [i915#2684]) -> [WARN][36] ([i915#2681] / [i915#2684])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-iclb3/igt@i915_pm_rc6_residency@rc6-idle.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-iclb8/igt@i915_pm_rc6_residency@rc6-idle.html
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][37] ([fdo#109349]) -> [DMESG-WARN][38] ([i915#1226])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-iclb4/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
* igt@kms_flip@flip-vs-suspend-interruptible@c-hdmi-a1:
- shard-hsw: [INCOMPLETE][39] ([i915#2295]) -> [INCOMPLETE][40] ([i915#2055] / [i915#2295])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-hsw4/igt@kms_flip@flip-vs-suspend-interruptible@c-hdmi-a1.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-hsw6/igt@kms_flip@flip-vs-suspend-interruptible@c-hdmi-a1.html
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-glk: [DMESG-WARN][41] ([i915#2635]) -> [INCOMPLETE][42] ([i915#2635])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-glk2/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-glk2/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
* igt@runner@aborted:
- shard-kbl: ([FAIL][43], [FAIL][44], [FAIL][45], [FAIL][46], [FAIL][47], [FAIL][48], [FAIL][49], [FAIL][50], [FAIL][51], [FAIL][52], [FAIL][53], [FAIL][54], [FAIL][55], [FAIL][56], [FAIL][57], [FAIL][58], [FAIL][59], [FAIL][60], [FAIL][61], [FAIL][62], [FAIL][63], [FAIL][64], [FAIL][65], [FAIL][66], [FAIL][67]) ([i915#1569] / [i915#192] / [i915#193] / [i915#194] / [i915#2295] / [i915#2722] / [i915#483]) -> ([FAIL][68], [FAIL][69]) ([i915#1814] / [i915#2295] / [i915#2722] / [i915#483] / [i915#602])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl3/igt@runner@aborted.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl7/igt@runner@aborted.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl1/igt@runner@aborted.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl6/igt@runner@aborted.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl4/igt@runner@aborted.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl1/igt@runner@aborted.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl6/igt@runner@aborted.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl4/igt@runner@aborted.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl4/igt@runner@aborted.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl2/igt@runner@aborted.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl3/igt@runner@aborted.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl6/igt@runner@aborted.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl1/igt@runner@aborted.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl7/igt@runner@aborted.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl2/igt@runner@aborted.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl3/igt@runner@aborted.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl7/igt@runner@aborted.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl1/igt@runner@aborted.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl4/igt@runner@aborted.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl7/igt@runner@aborted.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl7/igt@runner@aborted.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl2/igt@runner@aborted.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl6/igt@runner@aborted.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl3/igt@runner@aborted.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9397/shard-kbl2/igt@runner@aborted.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-kbl2/igt@runner@aborted.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18996/shard-kbl7/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#1226]: https://gitlab.freedesktop.org/drm/intel/issues/1226
[i915#1519]: https://gitlab.freedesktop.org/drm/intel/issues/1519
[i915#1569]: https://gitlab.freedesktop.org/drm/intel/issues/1569
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#192]: https://gitlab.freedesktop.org/drm/intel/issues/192
[i915#193]: https://gitlab.freedesktop.org/drm/intel/issues/193
[i915#194]: https://gitlab.freedesktop.org/drm/intel/issues/194
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2055]: https://gitlab.freedesktop.org/drm/intel/issues/2055
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2597]: https://gitlab.freedesktop.org/drm/intel/issues/2597
[i915#262]: https://gitlab.freedesktop.org/drm/intel/issues/262
[i915#2635]: https://gitlab.freedesktop.org/drm/intel/issues/2635
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#483]: https://gitlab.freedesktop.org/drm/intel/issues/483
[i915#602]: https://gitlab.freedesktop.org/drm/intel/issues/602
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9397 -> Patchwork_18996
CI-20190529: 20190529
CI_DRM_9397: 17a8f6e3b3c8daf242a4bd422147eaf03e9dcea7 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5872: d8ebb937c76184d5e526c59a2c18abca1c7a03c1 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18996: 2e1d56e73742fc15368dda5728660fbd8c856f6c @ 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_18996/index.html
[-- Attachment #1.2: Type: text/html, Size: 17399 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] drm/i915/gt: Declare gen9 has 64 mocs entries!
@ 2021-01-21 21:04 Chris Wilson
0 siblings, 0 replies; 8+ messages in thread
From: Chris Wilson @ 2021-01-21 21:04 UTC (permalink / raw)
To: stable
commit e57344d7e4ec upstream, backported to v5.4
We checked the table size against a hardcoded number of entries, and
that number was excluding the special mocs registers at the end.
Fixes: 977933b5da7c ("drm/i915/gt: Program mocs:63 for cache eviction on gen9")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: <stable@vger.kernel.org> # v4.3+
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201127102540.13117-1-chris@chris-wilson.co.uk
(cherry picked from commit 444fbf5d7058099447c5366ba8bb60d610aeb44b)
---
drivers/gpu/drm/i915/gt/intel_mocs.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_mocs.c b/drivers/gpu/drm/i915/gt/intel_mocs.c
index e97a2aa31485..7de6528e8df4 100644
--- a/drivers/gpu/drm/i915/gt/intel_mocs.c
+++ b/drivers/gpu/drm/i915/gt/intel_mocs.c
@@ -58,8 +58,7 @@ struct drm_i915_mocs_table {
#define _L3_CACHEABILITY(value) ((value) << 4)
/* Helper defines */
-#define GEN9_NUM_MOCS_ENTRIES 62 /* 62 out of 64 - 63 & 64 are reserved. */
-#define GEN11_NUM_MOCS_ENTRIES 64 /* 63-64 are reserved, but configured. */
+#define GEN9_NUM_MOCS_ENTRIES 64 /* 63-64 are reserved, but configured. */
/* (e)LLC caching options */
/*
@@ -300,12 +299,12 @@ static bool get_mocs_settings(struct intel_gt *gt,
if (INTEL_GEN(i915) >= 12) {
table->size = ARRAY_SIZE(tigerlake_mocs_table);
table->table = tigerlake_mocs_table;
- table->n_entries = GEN11_NUM_MOCS_ENTRIES;
+ table->n_entries = GEN9_NUM_MOCS_ENTRIES;
result = true;
} else if (IS_GEN(i915, 11)) {
table->size = ARRAY_SIZE(icelake_mocs_table);
table->table = icelake_mocs_table;
- table->n_entries = GEN11_NUM_MOCS_ENTRIES;
+ table->n_entries = GEN9_NUM_MOCS_ENTRIES;
result = true;
} else if (IS_GEN9_BC(i915) || IS_CANNONLAKE(i915)) {
table->size = ARRAY_SIZE(skylake_mocs_table);
--
2.30.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-01-21 21:08 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-27 10:25 [PATCH] drm/i915/gt: Declare gen9 has 64 mocs entries! Chris Wilson
2020-11-27 10:25 ` [Intel-gfx] " Chris Wilson
2020-11-27 10:31 ` Tvrtko Ursulin
2020-11-27 10:31 ` Tvrtko Ursulin
2020-11-27 12:03 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2020-11-27 12:32 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-11-27 14:14 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-01-21 21:04 [PATCH] " Chris Wilson
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.