Skip to contentSkip to conversation

drm/i915/selftests: fixup min_alignment usage

PATCH In review Matthew Auld 3 participants 6 messages Apr 6, 2022 – Apr 21, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/i915/selftests: fixup min_alignment usage

Trying to cast the region id into the region type doesn't work too well, since the i915_vm_min_alignment() won't give us the correct value for the stolen-lmem case.

Cc Thomas Hellström <[email protected]>
Cc Nirmoy Das <[email protected]>
---
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1 -1
index 5c9bfa409ff5..bccc49a8ab5e 100644
@@ -1150,7 +1150,7 @@ static int misaligned_pin(struct i915_address_space *vm,
 		flags |= PIN_GLOBAL;
 
 	for_each_memory_region(mr, vm->i915, id) {
-		u64 min_alignment = i915_vm_min_alignment(vm, (enum intel_memory_type)id);
+		u64 min_alignment = i915_vm_min_alignment(vm, mr->type);
 		u64 size = min_alignment;
 		u64 addr = round_down(hole_start + (hole_size / 2), min_alignment);
 
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 drm/i915/selftests: tweak the misaligned_case

The compact-pt layout restrictions should only apply to the ppGTT. Also make this play nice on platforms that only have the 64K GTT restriction, and not the compact-pt thing.

Cc Thomas Hellström <[email protected]>
Cc Nirmoy Das <[email protected]>
---
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +9 -3
index bccc49a8ab5e..8633bec18fa7 100644
@@ -1112,10 +1112,16 @@ static int misaligned_case(struct i915_address_space *vm, struct intel_memory_re
 	expected_vma_size = round_up(size, 1 << (ffs(vma->resource->page_sizes_gtt) - 1));
 	expected_node_size = expected_vma_size;
 
-	if (NEEDS_COMPACT_PT(vm->i915) && i915_gem_object_is_lmem(obj)) {
-		/* compact-pt should expand lmem node to 2MB */
+	if (HAS_64K_PAGES(vm->i915) && i915_gem_object_is_lmem(obj)) {
+		/*
+		 * The compact-pt should expand lmem node to 2MB for the ppGTT,
+		 * for all other cases we should only expect 64K.
+		 */
 		expected_vma_size = round_up(size, I915_GTT_PAGE_SIZE_64K);
-		expected_node_size = round_up(size, I915_GTT_PAGE_SIZE_2M);
+		if (NEEDS_COMPACT_PT(vm->i915) && !i915_is_ggtt(vm))
+			expected_node_size = round_up(size, I915_GTT_PAGE_SIZE_2M);
+		else
+			expected_node_size = round_up(size, I915_GTT_PAGE_SIZE_64K);
 	}
 
 	if (vma->size != expected_vma_size || vma->node.size != expected_node_size) {
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH 2/2] drm/i915/selftests: tweak the misaligned_case

LGTM Reviewed-by: Nirmoy Das <[email protected]>

Quoted 35 lines · Matthew Auld

The compact-pt layout restrictions should only apply to the ppGTT. Also make this play nice on platforms that only have the 64K GTT restriction, and not the compact-pt thing.

Cc Thomas Hellström <[email protected]>
Cc Nirmoy Das <[email protected]>
---
  drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +9 -3
index bccc49a8ab5e..8633bec18fa7 100644
@@ -1112,10 +1112,16 @@ static int misaligned_case(struct i915_address_space *vm, struct intel_memory_re
  	expected_vma_size = round_up(size, 1 << (ffs(vma->resource->page_sizes_gtt) - 1));
  	expected_node_size = expected_vma_size;
 
-	if (NEEDS_COMPACT_PT(vm->i915) && i915_gem_object_is_lmem(obj)) {
-		/* compact-pt should expand lmem node to 2MB */
+	if (HAS_64K_PAGES(vm->i915) && i915_gem_object_is_lmem(obj)) {
+		/*
+		 * The compact-pt should expand lmem node to 2MB for the ppGTT,
+		 * for all other cases we should only expect 64K.
+		 */
  		expected_vma_size = round_up(size, I915_GTT_PAGE_SIZE_64K);
-		expected_node_size = round_up(size, I915_GTT_PAGE_SIZE_2M);
+		if (NEEDS_COMPACT_PT(vm->i915) && !i915_is_ggtt(vm))
+			expected_node_size = round_up(size, I915_GTT_PAGE_SIZE_2M);
+		else
+			expected_node_size = round_up(size, I915_GTT_PAGE_SIZE_64K);
  	}
 
  	if (vma->size != expected_vma_size || vma->node.size != expected_node_size) {
#3 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/selftests: fixup min_alignment usage

In reply to Matthew Auld
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/selftests: fixup min_alignment usage
URL : https://patchwork.freedesktop.org/series/102295/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_11467 -> Patchwork_22803
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_22803 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_22803, 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_22803/index.html

Participating hosts (52 -> 47)
------------------------------

Additional (1): bat-adlm-1
Missing (6): shard-tglu fi-bsw-cyan fi-ctg-p8600 shard-rkl shard-dg1 fi-bdw-samus

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_22803:

### IGT changes ###

#### Possible regressions ####

* igt@runner@aborted:
- fi-hsw-4770: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-hsw-4770/igt@[email protected]

#### Warnings ####

* igt@core_hotunplug@unbind-rebind:
- fi-kbl-7567u: [DMESG-WARN][2] ([i915#5437]) -> [DMESG-WARN][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11467/fi-kbl-7567u/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-kbl-7567u/igt@[email protected]
- fi-tgl-1115g4: [DMESG-WARN][4] ([i915#1982]) -> [DMESG-WARN][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11467/fi-tgl-1115g4/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-tgl-1115g4/igt@[email protected]

Known issues
------------

Here are the changes found in Patchwork_22803 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [PASS][6] -> [INCOMPLETE][7] ([i915#4785])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11467/fi-hsw-4770/igt@i915_selftest@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-hsw-4770/igt@i915_selftest@[email protected]
- fi-bdw-5557u: NOTRUN -> [INCOMPLETE][8] ([i915#3921])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-bdw-5557u/igt@i915_selftest@[email protected]
- fi-snb-2600: [PASS][9] -> [INCOMPLETE][10] ([i915#3921])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11467/fi-snb-2600/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-snb-2600/igt@i915_selftest@[email protected]

* igt@kms_chamelium@vga-edid-read:
- fi-bdw-5557u: NOTRUN -> [SKIP][11] ([fdo#109271] / [fdo#111827]) +8 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-bdw-5557u/igt@[email protected]

* igt@kms_flip@basic-flip-vs-wf_vblank@a-vga1:
- fi-pnv-d510: [PASS][12] -> [FAIL][13] ([i915#2122])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11467/fi-pnv-d510/igt@kms_flip@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-pnv-d510/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@basic:
- fi-cfl-8109u: [PASS][14] -> [DMESG-FAIL][15] ([i915#295])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11467/fi-cfl-8109u/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-cfl-8109u/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
- fi-cfl-8109u: [PASS][16] -> [DMESG-WARN][17] ([i915#295] / [i915#5341])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11467/fi-cfl-8109u/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-cfl-8109u/igt@[email protected]

* igt@kms_pipe_crc_basic@read-crc-pipe-b:
- fi-cfl-8109u: [PASS][18] -> [DMESG-WARN][19] ([i915#295]) +9 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11467/fi-cfl-8109u/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-cfl-8109u/igt@[email protected]

* igt@kms_setmode@basic-clone-single-crtc:
- fi-bdw-5557u: NOTRUN -> [SKIP][20] ([fdo#109271]) +14 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-bdw-5557u/igt@[email protected]

#### Possible fixes ####

* igt@kms_busy@basic@flip:
- fi-tgl-u2: [DMESG-WARN][21] ([i915#402]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11467/fi-tgl-u2/igt@kms_busy@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/fi-tgl-u2/igt@kms_busy@[email protected]

{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#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#295]: https://gitlab.freedesktop.org/drm/intel/issues/295
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3576]: https://gitlab.freedesktop.org/drm/intel/issues/3576
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#5341]: https://gitlab.freedesktop.org/drm/intel/issues/5341
[i915#5437]: https://gitlab.freedesktop.org/drm/intel/issues/5437

Build changes
-------------

* Linux: CI_DRM_11467 -> Patchwork_22803

CI-20190529: 20190529
CI_DRM_11467: 9620d9a4dee7a4c418de2683f3a7f544042c1a4a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6414: b4d8d30a4ec8dae5c1c403f41348c073a9591d9f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22803: 49f3f956425d6b130ad2c310c21cc0183e0bc8be @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

49f3f956425d drm/i915/selftests: tweak the misaligned_case 8fe2c434b4a3 drm/i915/selftests: fixup min_alignment usage

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22803/index.html

#4 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/selftests: fixup min_alignment usage (rev2)

In reply to Matthew Auld
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/selftests: fixup min_alignment usage (rev2)
URL : https://patchwork.freedesktop.org/series/102295/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_11472 -> Patchwork_22814
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_22814 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_22814, 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_22814/index.html

Participating hosts (47 -> 36)
------------------------------

Additional (1): fi-bwr-2160
Missing (12): shard-tglu bat-adls-5 bat-dg1-6 bat-dg1-5 bat-dg2-8 bat-dg2-9 fi-bsw-cyan bat-adlp-6 bat-rpls-1 fi-bdw-samus bat-jsl-2 bat-jsl-1

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_22814:

### CI changes ###

#### Possible regressions ####

* boot:
- fi-bwr-2160: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-bwr-2160/boot.html

### IGT changes ###

#### Possible regressions ####

* igt@gem_lmem_swapping@basic:
- fi-cfl-8109u: NOTRUN -> [FAIL][2]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-cfl-8109u/igt@[email protected]

* igt@gem_lmem_swapping@parallel-random-engines:
- fi-hsw-4770: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-hsw-4770/igt@[email protected]

#### Warnings ####

* igt@runner@aborted:
- fi-kbl-x1275: [FAIL][4] ([i915#4312]) -> [FAIL][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-x1275/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-kbl-x1275/igt@[email protected]
- fi-kbl-7567u: [FAIL][6] ([i915#4312]) -> [FAIL][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-7567u/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-kbl-7567u/igt@[email protected]

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* igt@runner@aborted:
- {fi-jsl-1}: [FAIL][8] ([i915#4312]) -> [FAIL][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-jsl-1/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-jsl-1/igt@[email protected]
- {fi-ehl-2}: [FAIL][10] ([i915#4312]) -> [FAIL][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-ehl-2/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-ehl-2/igt@[email protected]

Known issues
------------

Here are the changes found in Patchwork_22814 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@core_auth@basic-auth:
- fi-kbl-8809g: NOTRUN -> [SKIP][12] ([fdo#109271]) +1 similar issue
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-kbl-8809g/igt@[email protected]

* igt@fbdev@eof:
- fi-kbl-8809g: NOTRUN -> [INCOMPLETE][13] ([i915#5557])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-kbl-8809g/igt@[email protected]

* igt@gem_close_race@basic-process:
- fi-ivb-3770: NOTRUN -> [SKIP][14] ([fdo#109271]) +146 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-ivb-3770/igt@[email protected]

* igt@kms_addfb_basic@basic-y-tiled-legacy:
- fi-snb-2520m: NOTRUN -> [SKIP][15] ([fdo#109271]) +151 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-snb-2520m/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-b:
- fi-cfl-8109u: NOTRUN -> [SKIP][16] ([fdo#109271]) +145 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-cfl-8109u/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-c:
- fi-snb-2520m: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#5341])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-snb-2520m/igt@[email protected]
- fi-cfl-8109u: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#5341])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-cfl-8109u/igt@[email protected]
- fi-ivb-3770: NOTRUN -> [SKIP][19] ([fdo#109271] / [i915#5341])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-ivb-3770/igt@[email protected]

#### Warnings ####

* igt@gem_lmem_swapping@basic:
- fi-hsw-4770: [FAIL][20] -> [SKIP][21] ([fdo#109271])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-hsw-4770/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-hsw-4770/igt@[email protected]

* igt@runner@aborted:
- fi-cfl-8109u: [FAIL][22] -> [FAIL][23] ([i915#4312])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-cfl-8109u/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-cfl-8109u/igt@[email protected]
- fi-kbl-8809g: [FAIL][24] -> [FAIL][25] ([i915#2722])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-8809g/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-kbl-8809g/igt@[email protected]
- fi-snb-2520m: [FAIL][26] -> [FAIL][27] ([i915#4312])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-snb-2520m/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-snb-2520m/igt@[email protected]
- fi-hsw-4770: [FAIL][28] ([i915#4312]) -> [FAIL][29] ([i915#4312] / [i915#5594])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-hsw-4770/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-hsw-4770/igt@[email protected]
- fi-kbl-7500u: [FAIL][30] ([i915#4312]) -> [FAIL][31] ([i915#4312] / [i915#5257])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-kbl-7500u/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-kbl-7500u/igt@[email protected]
- fi-ivb-3770: [FAIL][32] -> [FAIL][33] ([i915#4312])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-ivb-3770/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-ivb-3770/igt@[email protected]
- fi-tgl-1115g4: [FAIL][34] ([i915#4312] / [i915#5257]) -> [FAIL][35] ([i915#3690] / [i915#4312])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-tgl-1115g4/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-tgl-1115g4/igt@[email protected]
- fi-bsw-n3050: [FAIL][36] ([i915#4312]) -> [FAIL][37] ([i915#3690] / [i915#4312])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11472/fi-bsw-n3050/igt@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/fi-bsw-n3050/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#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#3690]: https://gitlab.freedesktop.org/drm/intel/issues/3690
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257
[i915#5341]: https://gitlab.freedesktop.org/drm/intel/issues/5341
[i915#5557]: https://gitlab.freedesktop.org/drm/intel/issues/5557
[i915#5594]: https://gitlab.freedesktop.org/drm/intel/issues/5594

Build changes
-------------

* Linux: CI_DRM_11472 -> Patchwork_22814

CI-20190529: 20190529
CI_DRM_11472: 85882df13168c5f46b41401b96975de857e3ccac @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6415: c3b690bd5f7fb1fb7ed786ab0f3b815930a6a55f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22814: 072192650e7425c2b42ee92fe17a160e6710f2db @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

072192650e74 drm/i915/selftests: tweak the misaligned_case 7405579923ae drm/i915/selftests: fixup min_alignment usage

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22814/index.html

Reviewed-by Nirmoy Das on v1 1/2
#5 lore raw
In reply to Matthew Auld
Quoted 24 lines · Matthew Auld

Trying to cast the region id into the region type doesn't work too well, since the i915_vm_min_alignment() won't give us the correct value for the stolen-lmem case.

Cc Thomas Hellström <[email protected]>
Cc Nirmoy Das <[email protected]>
---
  drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +1 -1
index 5c9bfa409ff5..bccc49a8ab5e 100644
@@ -1150,7 +1150,7 @@ static int misaligned_pin(struct i915_address_space *vm,
  		flags |= PIN_GLOBAL;
 
  	for_each_memory_region(mr, vm->i915, id) {
-		u64 min_alignment = i915_vm_min_alignment(vm, (enum intel_memory_type)id);
+		u64 min_alignment = i915_vm_min_alignment(vm, mr->type);
  		u64 size = min_alignment;
  		u64 addr = round_down(hole_start + (hole_size / 2), min_alignment);