* [Intel-gfx] [PATCH 1/2] drm/i915: Check for all subplatform bits
@ 2021-01-21 16:19 Tvrtko Ursulin
2021-01-21 16:19 ` [Intel-gfx] [PATCH 2/2] drm/i915: Decrease number of " Tvrtko Ursulin
2021-01-22 0:26 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Check for all " Patchwork
0 siblings, 2 replies; 5+ messages in thread
From: Tvrtko Ursulin @ 2021-01-21 16:19 UTC (permalink / raw)
To: Intel-gfx
From: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Current code is checking only 2 bits in the subplatform, but actually 3
bits are allocated for the field. Check all 3 bits.
Fixes: 805446c8347c9 (drm/i915: Introduce concept of a sub-platform)
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f0222de2d216..c31d2776134a 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1343,7 +1343,7 @@ intel_subplatform(const struct intel_runtime_info *info, enum intel_platform p)
{
const unsigned int pi = __platform_mask_index(info, p);
- return info->platform_mask[pi] & INTEL_SUBPLATFORM_BITS;
+ return info->platform_mask[pi] & ((1 << INTEL_SUBPLATFORM_BITS) - 1);
}
static __always_inline bool
--
2.27.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Intel-gfx] [PATCH 2/2] drm/i915: Decrease number of subplatform bits
2021-01-21 16:19 [Intel-gfx] [PATCH 1/2] drm/i915: Check for all subplatform bits Tvrtko Ursulin
@ 2021-01-21 16:19 ` Tvrtko Ursulin
2021-01-21 16:21 ` Chris Wilson
2021-01-22 20:19 ` Lucas De Marchi
2021-01-22 0:26 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Check for all " Patchwork
1 sibling, 2 replies; 5+ messages in thread
From: Tvrtko Ursulin @ 2021-01-21 16:19 UTC (permalink / raw)
To: Intel-gfx; +Cc: Chris Wilson
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Commit 6ce1c33d6c36 ("drm/i915: Kill INTEL_SUBPLATFORM_AML") removed the
only platform which used bit 2 so could also decrease the
INTEL_SUBPLATFORM_BITS definition.
This is not a fixes material but still lets make it precise.
v2:
* Fix assert in intel_device_info_subplatform_init by introducing
INTEL_SUBPLATFORM_MASK. (Chris)
* Update intel_subplatform().
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
References: 6ce1c33d6c36 ("drm/i915: Kill INTEL_SUBPLATFORM_AML")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_drv.h | 2 +-
drivers/gpu/drm/i915/intel_device_info.c | 2 +-
drivers/gpu/drm/i915/intel_device_info.h | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c31d2776134a..7efb501e22d2 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1343,7 +1343,7 @@ intel_subplatform(const struct intel_runtime_info *info, enum intel_platform p)
{
const unsigned int pi = __platform_mask_index(info, p);
- return info->platform_mask[pi] & ((1 << INTEL_SUBPLATFORM_BITS) - 1);
+ return info->platform_mask[pi] & INTEL_SUBPLATFORM_MASK;
}
static __always_inline bool
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 699412c14c1d..7d98a718a051 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -223,7 +223,7 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915)
}
}
- GEM_BUG_ON(mask & ~INTEL_SUBPLATFORM_BITS);
+ GEM_BUG_ON(mask & ~INTEL_SUBPLATFORM_MASK);
RUNTIME_INFO(i915)->platform_mask[pi] |= mask;
}
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 79dab5a6f272..e6ca1023ffcf 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -93,7 +93,8 @@ enum intel_platform {
* it is fine for the same bit to be used on multiple parent platforms.
*/
-#define INTEL_SUBPLATFORM_BITS (3)
+#define INTEL_SUBPLATFORM_BITS (2)
+#define INTEL_SUBPLATFORM_MASK (BIT(INTEL_SUBPLATFORM_BITS) - 1)
/* HSW/BDW/SKL/KBL/CFL */
#define INTEL_SUBPLATFORM_ULT (0)
--
2.27.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Intel-gfx] [PATCH 2/2] drm/i915: Decrease number of subplatform bits
2021-01-21 16:19 ` [Intel-gfx] [PATCH 2/2] drm/i915: Decrease number of " Tvrtko Ursulin
@ 2021-01-21 16:21 ` Chris Wilson
2021-01-22 20:19 ` Lucas De Marchi
1 sibling, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2021-01-21 16:21 UTC (permalink / raw)
To: Intel-gfx, Tvrtko Ursulin
Quoting Tvrtko Ursulin (2021-01-21 16:19:36)
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Commit 6ce1c33d6c36 ("drm/i915: Kill INTEL_SUBPLATFORM_AML") removed the
> only platform which used bit 2 so could also decrease the
> INTEL_SUBPLATFORM_BITS definition.
>
> This is not a fixes material but still lets make it precise.
>
> v2:
> * Fix assert in intel_device_info_subplatform_init by introducing
> INTEL_SUBPLATFORM_MASK. (Chris)
> * Update intel_subplatform().
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> References: 6ce1c33d6c36 ("drm/i915: Kill INTEL_SUBPLATFORM_AML")
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Intel-gfx] [PATCH 2/2] drm/i915: Decrease number of subplatform bits
2021-01-21 16:19 ` [Intel-gfx] [PATCH 2/2] drm/i915: Decrease number of " Tvrtko Ursulin
2021-01-21 16:21 ` Chris Wilson
@ 2021-01-22 20:19 ` Lucas De Marchi
1 sibling, 0 replies; 5+ messages in thread
From: Lucas De Marchi @ 2021-01-22 20:19 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: Intel-gfx, Chris Wilson
On Thu, Jan 21, 2021 at 04:19:36PM +0000, Tvrtko Ursulin wrote:
>From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
>Commit 6ce1c33d6c36 ("drm/i915: Kill INTEL_SUBPLATFORM_AML") removed the
>only platform which used bit 2 so could also decrease the
>INTEL_SUBPLATFORM_BITS definition.
>
>This is not a fixes material but still lets make it precise.
>
>v2:
> * Fix assert in intel_device_info_subplatform_init by introducing
> INTEL_SUBPLATFORM_MASK. (Chris)
> * Update intel_subplatform().
>
>Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>References: 6ce1c33d6c36 ("drm/i915: Kill INTEL_SUBPLATFORM_AML")
>Cc: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_drv.h | 2 +-
> drivers/gpu/drm/i915/intel_device_info.c | 2 +-
> drivers/gpu/drm/i915/intel_device_info.h | 3 ++-
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index c31d2776134a..7efb501e22d2 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -1343,7 +1343,7 @@ intel_subplatform(const struct intel_runtime_info *info, enum intel_platform p)
> {
> const unsigned int pi = __platform_mask_index(info, p);
>
>- return info->platform_mask[pi] & ((1 << INTEL_SUBPLATFORM_BITS) - 1);
>+ return info->platform_mask[pi] & INTEL_SUBPLATFORM_MASK;
> }
>
> static __always_inline bool
>diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
>index 699412c14c1d..7d98a718a051 100644
>--- a/drivers/gpu/drm/i915/intel_device_info.c
>+++ b/drivers/gpu/drm/i915/intel_device_info.c
>@@ -223,7 +223,7 @@ void intel_device_info_subplatform_init(struct drm_i915_private *i915)
> }
> }
>
>- GEM_BUG_ON(mask & ~INTEL_SUBPLATFORM_BITS);
>+ GEM_BUG_ON(mask & ~INTEL_SUBPLATFORM_MASK);
>
> RUNTIME_INFO(i915)->platform_mask[pi] |= mask;
> }
>diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
>index 79dab5a6f272..e6ca1023ffcf 100644
>--- a/drivers/gpu/drm/i915/intel_device_info.h
>+++ b/drivers/gpu/drm/i915/intel_device_info.h
>@@ -93,7 +93,8 @@ enum intel_platform {
> * it is fine for the same bit to be used on multiple parent platforms.
> */
>
>-#define INTEL_SUBPLATFORM_BITS (3)
>+#define INTEL_SUBPLATFORM_BITS (2)
>+#define INTEL_SUBPLATFORM_MASK (BIT(INTEL_SUBPLATFORM_BITS) - 1)
not sure if it's better, but: GENMASK(INTEL_SUBPLATFORM_BITS - 1, 0)
in either case:
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Lucas De Marchi
>
> /* HSW/BDW/SKL/KBL/CFL */
> #define INTEL_SUBPLATFORM_ULT (0)
>--
>2.27.0
>
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Check for all subplatform bits
2021-01-21 16:19 [Intel-gfx] [PATCH 1/2] drm/i915: Check for all subplatform bits Tvrtko Ursulin
2021-01-21 16:19 ` [Intel-gfx] [PATCH 2/2] drm/i915: Decrease number of " Tvrtko Ursulin
@ 2021-01-22 0:26 ` Patchwork
1 sibling, 0 replies; 5+ messages in thread
From: Patchwork @ 2021-01-22 0:26 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 5817 bytes --]
== Series Details ==
Series: series starting with [1/2] drm/i915: Check for all subplatform bits
URL : https://patchwork.freedesktop.org/series/86145/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9664 -> Patchwork_19446
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_19446 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_19446, 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_19446/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_19446:
### IGT changes ###
#### Possible regressions ####
* igt@gem_sync@basic-all:
- fi-tgl-u2: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9664/fi-tgl-u2/igt@gem_sync@basic-all.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19446/fi-tgl-u2/igt@gem_sync@basic-all.html
Known issues
------------
Here are the changes found in Patchwork_19446 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@semaphore:
- fi-bdw-5557u: NOTRUN -> [SKIP][3] ([fdo#109271]) +22 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19446/fi-bdw-5557u/igt@amdgpu/amd_basic@semaphore.html
* igt@core_hotunplug@unbind-rebind:
- fi-bdw-5557u: NOTRUN -> [WARN][4] ([i915#2283])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19446/fi-bdw-5557u/igt@core_hotunplug@unbind-rebind.html
* igt@i915_selftest@live@execlists:
- fi-bsw-nick: [PASS][5] -> [INCOMPLETE][6] ([i915#2940])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9664/fi-bsw-nick/igt@i915_selftest@live@execlists.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19446/fi-bsw-nick/igt@i915_selftest@live@execlists.html
* igt@kms_flip@basic-flip-vs-wf_vblank@a-vga1:
- fi-pnv-d510: [PASS][7] -> [FAIL][8] ([i915#2122])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9664/fi-pnv-d510/igt@kms_flip@basic-flip-vs-wf_vblank@a-vga1.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19446/fi-pnv-d510/igt@kms_flip@basic-flip-vs-wf_vblank@a-vga1.html
* igt@prime_self_import@basic-with_two_bos:
- fi-tgl-y: [PASS][9] -> [DMESG-WARN][10] ([i915#402]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9664/fi-tgl-y/igt@prime_self_import@basic-with_two_bos.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19446/fi-tgl-y/igt@prime_self_import@basic-with_two_bos.html
* igt@runner@aborted:
- fi-bsw-nick: NOTRUN -> [FAIL][11] ([i915#1436])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19446/fi-bsw-nick/igt@runner@aborted.html
- fi-tgl-u2: NOTRUN -> [FAIL][12] ([i915#2722])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19446/fi-tgl-u2/igt@runner@aborted.html
#### Possible fixes ####
* igt@fbdev@read:
- fi-tgl-y: [DMESG-WARN][13] ([i915#402]) -> [PASS][14] +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9664/fi-tgl-y/igt@fbdev@read.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19446/fi-tgl-y/igt@fbdev@read.html
* igt@i915_module_load@reload:
- fi-byt-j1900: [DMESG-WARN][15] ([i915#1982]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9664/fi-byt-j1900/igt@i915_module_load@reload.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19446/fi-byt-j1900/igt@i915_module_load@reload.html
* igt@kms_chamelium@hdmi-crc-fast:
- fi-kbl-7500u: [DMESG-WARN][17] ([i915#2868]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9664/fi-kbl-7500u/igt@kms_chamelium@hdmi-crc-fast.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19446/fi-kbl-7500u/igt@kms_chamelium@hdmi-crc-fast.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
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2283]: https://gitlab.freedesktop.org/drm/intel/issues/2283
[i915#2601]: https://gitlab.freedesktop.org/drm/intel/issues/2601
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#2868]: https://gitlab.freedesktop.org/drm/intel/issues/2868
[i915#2940]: https://gitlab.freedesktop.org/drm/intel/issues/2940
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
Participating hosts (41 -> 37)
------------------------------
Missing (4): fi-ilk-m540 fi-bsw-cyan fi-bdw-samus fi-hsw-4200u
Build changes
-------------
* Linux: CI_DRM_9664 -> Patchwork_19446
CI-20190529: 20190529
CI_DRM_9664: dd119a66c9fc3706c93efa10a7631a4c499d94f3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5962: 22e3daaed82ab7890018a2f2aabf5082cd536023 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19446: 3b351fe6c7e1f335f7442e7aa9f63b43aa81e1d9 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
3b351fe6c7e1 drm/i915: Decrease number of subplatform bits
bb4964146d3c drm/i915: Check for all subplatform bits
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19446/index.html
[-- Attachment #1.2: Type: text/html, Size: 6713 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] 5+ messages in thread
end of thread, other threads:[~2021-01-22 20:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-21 16:19 [Intel-gfx] [PATCH 1/2] drm/i915: Check for all subplatform bits Tvrtko Ursulin
2021-01-21 16:19 ` [Intel-gfx] [PATCH 2/2] drm/i915: Decrease number of " Tvrtko Ursulin
2021-01-21 16:21 ` Chris Wilson
2021-01-22 20:19 ` Lucas De Marchi
2021-01-22 0:26 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: Check for all " Patchwork
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.