* [PATCH] drm/i915: use unsigned long for platform_mask
@ 2019-04-02 22:21 Lucas De Marchi
2019-04-02 23:15 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (6 more replies)
0 siblings, 7 replies; 13+ messages in thread
From: Lucas De Marchi @ 2019-04-02 22:21 UTC (permalink / raw)
To: intel-gfx
No reason to stick to u32 for platform mask if we can just use more bits
on 64 bit platforms.
$ size drivers/gpu/drm/i915/i915.ko*
text data bss dec hex filename
1884779 41334 5408 1931521 1d7901 drivers/gpu/drm/i915/i915.ko
1886693 41358 5408 1933459 1d8093 drivers/gpu/drm/i915/i915.ko.old
Now on 64 bits we have only one long as opposed to 2 u32:
$ pahole -C intel_runtime_info drivers/gpu/drm/i915/i915.ko
struct intel_runtime_info {
long unsigned int platform_mask[1]; /* 0 8 */
...
}
On 32 bits we still have the same thing as before:
$ size drivers/gpu/drm/i915/i915.ko*
text data bss dec hex filename
1489839 32485 2816 1525140 174594 drivers/gpu/drm/i915/i915.ko
1489839 32485 2816 1525140 174594 drivers/gpu/drm/i915/i915.ko.old
Besides reducing the code on x86-64 now the array size is automatically
calculated and we don't have to worry about extending it anymore.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 4 ----
drivers/gpu/drm/i915/intel_device_info.h | 8 ++++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 0ab4826921f7..7845a825e810 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2309,10 +2309,6 @@ __platform_mask_index(const struct intel_runtime_info *info,
const unsigned int pbits =
BITS_PER_TYPE(info->platform_mask[0]) - INTEL_SUBPLATFORM_BITS;
- /* Expand the platform_mask array if this fails. */
- BUILD_BUG_ON(INTEL_MAX_PLATFORMS >
- pbits * ARRAY_SIZE(info->platform_mask));
-
return p / pbits;
}
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 0e579f158016..637d97e8314e 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -214,11 +214,11 @@ struct intel_runtime_info {
* Platform mask is used for optimizing or-ed IS_PLATFORM calls into
* into single runtime conditionals, and also to provide groundwork
* for future per platform, or per SKU build optimizations.
- *
- * Array can be extended when necessary if the corresponding
- * BUILD_BUG_ON is hit.
*/
- u32 platform_mask[2];
+ unsigned long platform_mask[
+ DIV_ROUND_UP(INTEL_MAX_PLATFORMS,
+ BITS_PER_TYPE(unsigned long)
+ - INTEL_SUBPLATFORM_BITS)];
u16 device_id;
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: use unsigned long for platform_mask
2019-04-02 22:21 [PATCH] drm/i915: use unsigned long for platform_mask Lucas De Marchi
@ 2019-04-02 23:15 ` Patchwork
2019-04-02 23:16 ` ✗ Fi.CI.SPARSE: " Patchwork
` (5 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-04-02 23:15 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: use unsigned long for platform_mask
URL : https://patchwork.freedesktop.org/series/58895/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
c2596d9afed6 drm/i915: use unsigned long for platform_mask
-:61: CHECK:OPEN_ENDED_LINE: Lines should not end with a '['
#61: FILE: drivers/gpu/drm/i915/intel_device_info.h:218:
+ unsigned long platform_mask[
total: 0 errors, 0 warnings, 1 checks, 25 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* ✗ Fi.CI.SPARSE: warning for drm/i915: use unsigned long for platform_mask
2019-04-02 22:21 [PATCH] drm/i915: use unsigned long for platform_mask Lucas De Marchi
2019-04-02 23:15 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2019-04-02 23:16 ` Patchwork
2019-04-02 23:31 ` Lucas De Marchi
2019-04-02 23:48 ` ✗ Fi.CI.BAT: failure " Patchwork
` (4 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Patchwork @ 2019-04-02 23:16 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: use unsigned long for platform_mask
URL : https://patchwork.freedesktop.org/series/58895/
State : warning
== Summary ==
$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915: use unsigned long for platform_mask
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (61) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (61) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (61) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (61) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (61) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (61) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3619:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3615:16: warning: expression using sizeof(void)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: ✗ Fi.CI.SPARSE: warning for drm/i915: use unsigned long for platform_mask
2019-04-02 23:16 ` ✗ Fi.CI.SPARSE: " Patchwork
@ 2019-04-02 23:31 ` Lucas De Marchi
0 siblings, 0 replies; 13+ messages in thread
From: Lucas De Marchi @ 2019-04-02 23:31 UTC (permalink / raw)
To: intel-gfx
On Tue, Apr 02, 2019 at 11:16:23PM +0000, Patchwork wrote:
>== Series Details ==
>
>Series: drm/i915: use unsigned long for platform_mask
>URL : https://patchwork.freedesktop.org/series/58895/
>State : warning
>
>== Summary ==
>
>$ dim sparse origin/drm-tip
>Sparse version: v0.5.2
>Commit: drm/i915: use unsigned long for platform_mask
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (61) for type unsigned int
ops, I forgot to update mask to unsigned long in IS_SUBPLATFORM(). I
will fix in the next version.
Lucas De Marchi
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (61) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (61) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (61) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (61) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (61) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (62) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>+drivers/gpu/drm/i915/i915_drv.h:2360:46: warning: shift too big (63) for type unsigned int
>-drivers/gpu/drm/i915/selftests/../i915_drv.h:3619:16: warning: expression using sizeof(void)
>+drivers/gpu/drm/i915/selftests/../i915_drv.h:3615:16: warning: expression using sizeof(void)
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: use unsigned long for platform_mask
2019-04-02 22:21 [PATCH] drm/i915: use unsigned long for platform_mask Lucas De Marchi
2019-04-02 23:15 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-04-02 23:16 ` ✗ Fi.CI.SPARSE: " Patchwork
@ 2019-04-02 23:48 ` Patchwork
2019-04-03 1:46 ` [PATCH v2] " Lucas De Marchi
` (3 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-04-02 23:48 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: use unsigned long for platform_mask
URL : https://patchwork.freedesktop.org/series/58895/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_5858 -> Patchwork_12662
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_12662 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_12662, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/58895/revisions/1/mbox/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_12662:
### IGT changes ###
#### Possible regressions ####
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
- fi-bdw-gvtdvm: PASS -> DMESG-WARN +6
* igt@runner@aborted:
- fi-hsw-peppy: NOTRUN -> FAIL
- fi-bdw-5557u: NOTRUN -> FAIL
Known issues
------------
Here are the changes found in Patchwork_12662 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_contexts:
- fi-bdw-gvtdvm: PASS -> DMESG-FAIL [fdo#110235 ]
* igt@kms_chamelium@dp-hpd-fast:
- fi-skl-6700k2: NOTRUN -> SKIP [fdo#109271] +31
* igt@kms_pipe_crc_basic@read-crc-pipe-a:
- fi-byt-clapper: PASS -> FAIL [fdo#107362]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362] +3
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- fi-skl-6700k2: INCOMPLETE [fdo#104108] / [fdo#107773] -> PASS
#### Warnings ####
* igt@i915_selftest@live_contexts:
- fi-icl-u3: INCOMPLETE [fdo#108569] -> DMESG-FAIL [fdo#108569]
- fi-icl-u2: INCOMPLETE [fdo#108569] -> DMESG-FAIL [fdo#108569]
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#110235 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110235
Participating hosts (47 -> 41)
------------------------------
Missing (6): fi-ilk-m540 fi-byt-squawks fi-apl-guc fi-ctg-p8600 fi-icl-y fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5858 -> Patchwork_12662
CI_DRM_5858: 79fda73b53d7233c94922601d42aa0b7625544de @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4922: e941e4a29438c7130554492e4daf52afbc99ffdf @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12662: c2596d9afed6531be69ecb951d9dd1ba6c12723d @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
c2596d9afed6 drm/i915: use unsigned long for platform_mask
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12662/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2] drm/i915: use unsigned long for platform_mask
2019-04-02 22:21 [PATCH] drm/i915: use unsigned long for platform_mask Lucas De Marchi
` (2 preceding siblings ...)
2019-04-02 23:48 ` ✗ Fi.CI.BAT: failure " Patchwork
@ 2019-04-03 1:46 ` Lucas De Marchi
2019-04-03 6:57 ` Tvrtko Ursulin
2019-04-03 1:54 ` ✗ Fi.CI.SPARSE: warning for drm/i915: use unsigned long for platform_mask (rev2) Patchwork
` (2 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Lucas De Marchi @ 2019-04-03 1:46 UTC (permalink / raw)
To: intel-gfx; +Cc: Lucas De Marchi
No reason to stick to u32 for platform mask if we can just use more bits
on 64 bit platforms.
$ size drivers/gpu/drm/i915/i915.ko*
text data bss dec hex filename
1884779 41334 5408 1931521 1d7901 drivers/gpu/drm/i915/i915.ko
1886693 41358 5408 1933459 1d8093 drivers/gpu/drm/i915/i915.ko.old
Now on 64 bits we have only one long as opposed to 2 u32:
$ pahole -C intel_runtime_info drivers/gpu/drm/i915/i915.ko
struct intel_runtime_info {
long unsigned int platform_mask[1]; /* 0 8 */
...
}
On 32 bits we still have the same thing as before:
$ size drivers/gpu/drm/i915/i915.ko*
text data bss dec hex filename
1489839 32485 2816 1525140 174594 drivers/gpu/drm/i915/i915.ko
1489839 32485 2816 1525140 174594 drivers/gpu/drm/i915/i915.ko.old
Besides reducing the code on x86-64 now the array size is automatically
calculated and we don't have to worry about extending it anymore.
v2: fix sparse and checkpatch warnings
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 6 +-----
drivers/gpu/drm/i915/intel_device_info.h | 7 +++----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 0ab4826921f7..9fe765ffe878 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2309,10 +2309,6 @@ __platform_mask_index(const struct intel_runtime_info *info,
const unsigned int pbits =
BITS_PER_TYPE(info->platform_mask[0]) - INTEL_SUBPLATFORM_BITS;
- /* Expand the platform_mask array if this fails. */
- BUILD_BUG_ON(INTEL_MAX_PLATFORMS >
- pbits * ARRAY_SIZE(info->platform_mask));
-
return p / pbits;
}
@@ -2354,7 +2350,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
const unsigned int pi = __platform_mask_index(info, p);
const unsigned int pb = __platform_mask_bit(info, p);
const unsigned int msb = BITS_PER_TYPE(info->platform_mask[0]) - 1;
- const u32 mask = info->platform_mask[pi];
+ const unsigned long mask = info->platform_mask[pi];
BUILD_BUG_ON(!__builtin_constant_p(p));
BUILD_BUG_ON(!__builtin_constant_p(s));
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 0e579f158016..2f5ca2b6f094 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -214,11 +214,10 @@ struct intel_runtime_info {
* Platform mask is used for optimizing or-ed IS_PLATFORM calls into
* into single runtime conditionals, and also to provide groundwork
* for future per platform, or per SKU build optimizations.
- *
- * Array can be extended when necessary if the corresponding
- * BUILD_BUG_ON is hit.
*/
- u32 platform_mask[2];
+ unsigned long platform_mask[DIV_ROUND_UP(INTEL_MAX_PLATFORMS,
+ BITS_PER_TYPE(unsigned long)
+ - INTEL_SUBPLATFORM_BITS)];
u16 device_id;
--
2.21.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread
* ✗ Fi.CI.SPARSE: warning for drm/i915: use unsigned long for platform_mask (rev2)
2019-04-02 22:21 [PATCH] drm/i915: use unsigned long for platform_mask Lucas De Marchi
` (3 preceding siblings ...)
2019-04-03 1:46 ` [PATCH v2] " Lucas De Marchi
@ 2019-04-03 1:54 ` Patchwork
2019-04-03 2:13 ` ✓ Fi.CI.BAT: success " Patchwork
2019-04-03 17:32 ` ✓ Fi.CI.IGT: " Patchwork
6 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-04-03 1:54 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: use unsigned long for platform_mask (rev2)
URL : https://patchwork.freedesktop.org/series/58895/
State : warning
== Summary ==
$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915: use unsigned long for platform_mask
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3619:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3615:16: warning: expression using sizeof(void)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: use unsigned long for platform_mask (rev2)
2019-04-02 22:21 [PATCH] drm/i915: use unsigned long for platform_mask Lucas De Marchi
` (4 preceding siblings ...)
2019-04-03 1:54 ` ✗ Fi.CI.SPARSE: warning for drm/i915: use unsigned long for platform_mask (rev2) Patchwork
@ 2019-04-03 2:13 ` Patchwork
2019-04-03 17:32 ` ✓ Fi.CI.IGT: " Patchwork
6 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-04-03 2:13 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: use unsigned long for platform_mask (rev2)
URL : https://patchwork.freedesktop.org/series/58895/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5858 -> Patchwork_12663
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/58895/revisions/2/mbox/
Known issues
------------
Here are the changes found in Patchwork_12663 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-icl-u3: PASS -> DMESG-WARN [fdo#109638]
* igt@i915_selftest@live_hangcheck:
- fi-skl-iommu: PASS -> INCOMPLETE [fdo#108602] / [fdo#108744]
* igt@kms_chamelium@dp-hpd-fast:
- fi-skl-6700k2: NOTRUN -> SKIP [fdo#109271] +31
* igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362]
* igt@runner@aborted:
- fi-skl-iommu: NOTRUN -> FAIL [fdo#104108] / [fdo#108602]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- fi-skl-6700k2: INCOMPLETE [fdo#104108] / [fdo#107773] -> PASS
* igt@i915_selftest@live_execlists:
- fi-apl-guc: INCOMPLETE [fdo#103927] / [fdo#109720] -> PASS
#### Warnings ####
* igt@i915_selftest@live_contexts:
- fi-icl-u3: INCOMPLETE [fdo#108569] -> DMESG-FAIL [fdo#108569]
- fi-icl-u2: INCOMPLETE [fdo#108569] -> DMESG-FAIL [fdo#108569]
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
[fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109638]: https://bugs.freedesktop.org/show_bug.cgi?id=109638
[fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720
Participating hosts (47 -> 41)
------------------------------
Missing (6): fi-ilk-m540 fi-bsw-n3050 fi-byt-squawks fi-ctg-p8600 fi-pnv-d510 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5858 -> Patchwork_12663
CI_DRM_5858: 79fda73b53d7233c94922601d42aa0b7625544de @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4922: e941e4a29438c7130554492e4daf52afbc99ffdf @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12663: f3ce255eba79c31c7e1114541e34ba49b60f5111 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f3ce255eba79 drm/i915: use unsigned long for platform_mask
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12663/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] drm/i915: use unsigned long for platform_mask
2019-04-03 1:46 ` [PATCH v2] " Lucas De Marchi
@ 2019-04-03 6:57 ` Tvrtko Ursulin
2019-04-03 8:15 ` Lucas De Marchi
0 siblings, 1 reply; 13+ messages in thread
From: Tvrtko Ursulin @ 2019-04-03 6:57 UTC (permalink / raw)
To: Lucas De Marchi, intel-gfx
On 03/04/2019 02:46, Lucas De Marchi wrote:
> No reason to stick to u32 for platform mask if we can just use more bits
> on 64 bit platforms.
>
> $ size drivers/gpu/drm/i915/i915.ko*
> text data bss dec hex filename
> 1884779 41334 5408 1931521 1d7901 drivers/gpu/drm/i915/i915.ko
> 1886693 41358 5408 1933459 1d8093 drivers/gpu/drm/i915/i915.ko.old
How did you get such a large difference, and decrease even? Could you
check in the code what is happening? Because I get an increase with this
patch:
text data bss dec hex filename
1905314 43903 7424 1956641 1ddb21 i915.ko.orig
1905796 43903 7424 1957123 1ddd03 i915.ko.patch
Regards,
Tvrtko
>
> Now on 64 bits we have only one long as opposed to 2 u32:
>
> $ pahole -C intel_runtime_info drivers/gpu/drm/i915/i915.ko
> struct intel_runtime_info {
> long unsigned int platform_mask[1]; /* 0 8 */
> ...
> }
>
> On 32 bits we still have the same thing as before:
> $ size drivers/gpu/drm/i915/i915.ko*
> text data bss dec hex filename
> 1489839 32485 2816 1525140 174594 drivers/gpu/drm/i915/i915.ko
> 1489839 32485 2816 1525140 174594 drivers/gpu/drm/i915/i915.ko.old
>
> Besides reducing the code on x86-64 now the array size is automatically
> calculated and we don't have to worry about extending it anymore.
>
> v2: fix sparse and checkpatch warnings
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 6 +-----
> drivers/gpu/drm/i915/intel_device_info.h | 7 +++----
> 2 files changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 0ab4826921f7..9fe765ffe878 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2309,10 +2309,6 @@ __platform_mask_index(const struct intel_runtime_info *info,
> const unsigned int pbits =
> BITS_PER_TYPE(info->platform_mask[0]) - INTEL_SUBPLATFORM_BITS;
>
> - /* Expand the platform_mask array if this fails. */
> - BUILD_BUG_ON(INTEL_MAX_PLATFORMS >
> - pbits * ARRAY_SIZE(info->platform_mask));
> -
> return p / pbits;
> }
>
> @@ -2354,7 +2350,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
> const unsigned int pi = __platform_mask_index(info, p);
> const unsigned int pb = __platform_mask_bit(info, p);
> const unsigned int msb = BITS_PER_TYPE(info->platform_mask[0]) - 1;
> - const u32 mask = info->platform_mask[pi];
> + const unsigned long mask = info->platform_mask[pi];
>
> BUILD_BUG_ON(!__builtin_constant_p(p));
> BUILD_BUG_ON(!__builtin_constant_p(s));
> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> index 0e579f158016..2f5ca2b6f094 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -214,11 +214,10 @@ struct intel_runtime_info {
> * Platform mask is used for optimizing or-ed IS_PLATFORM calls into
> * into single runtime conditionals, and also to provide groundwork
> * for future per platform, or per SKU build optimizations.
> - *
> - * Array can be extended when necessary if the corresponding
> - * BUILD_BUG_ON is hit.
> */
> - u32 platform_mask[2];
> + unsigned long platform_mask[DIV_ROUND_UP(INTEL_MAX_PLATFORMS,
> + BITS_PER_TYPE(unsigned long)
> + - INTEL_SUBPLATFORM_BITS)];
>
> u16 device_id;
>
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] drm/i915: use unsigned long for platform_mask
2019-04-03 6:57 ` Tvrtko Ursulin
@ 2019-04-03 8:15 ` Lucas De Marchi
2019-04-03 9:25 ` Tvrtko Ursulin
0 siblings, 1 reply; 13+ messages in thread
From: Lucas De Marchi @ 2019-04-03 8:15 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: Intel Graphics, Lucas De Marchi
On Tue, Apr 2, 2019 at 11:58 PM Tvrtko Ursulin
<tvrtko.ursulin@linux.intel.com> wrote:
>
>
> On 03/04/2019 02:46, Lucas De Marchi wrote:
> > No reason to stick to u32 for platform mask if we can just use more bits
> > on 64 bit platforms.
> >
> > $ size drivers/gpu/drm/i915/i915.ko*
> > text data bss dec hex filename
> > 1884779 41334 5408 1931521 1d7901 drivers/gpu/drm/i915/i915.ko
> > 1886693 41358 5408 1933459 1d8093 drivers/gpu/drm/i915/i915.ko.old
>
> How did you get such a large difference, and decrease even? Could you
> check in the code what is happening? Because I get an increase with this
> patch:
>
> text data bss dec hex filename
> 1905314 43903 7424 1956641 1ddb21 i915.ko.orig
> 1905796 43903 7424 1957123 1ddd03 i915.ko.patch
the only explanation I really have is that my measurement was bogus.
Some possible explanations...
1) I compared a i386 to a x86-64 build; 2) somehow a config changed
between the builds;
3) when preparing the patch I rebased on upstream between the builds.
Checking (1), no... that's in the ~400k range. So no idea, sorry.
So I think the only useful thing in this patch is to make the array to
grow automatically. Or maybe not even that?
Lucas De Marchi
>
> Regards,
>
> Tvrtko
>
> >
> > Now on 64 bits we have only one long as opposed to 2 u32:
> >
> > $ pahole -C intel_runtime_info drivers/gpu/drm/i915/i915.ko
> > struct intel_runtime_info {
> > long unsigned int platform_mask[1]; /* 0 8 */
> > ...
> > }
> >
> > On 32 bits we still have the same thing as before:
> > $ size drivers/gpu/drm/i915/i915.ko*
> > text data bss dec hex filename
> > 1489839 32485 2816 1525140 174594 drivers/gpu/drm/i915/i915.ko
> > 1489839 32485 2816 1525140 174594 drivers/gpu/drm/i915/i915.ko.old
> >
> > Besides reducing the code on x86-64 now the array size is automatically
> > calculated and we don't have to worry about extending it anymore.
> >
> > v2: fix sparse and checkpatch warnings
> >
> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> > ---
> > drivers/gpu/drm/i915/i915_drv.h | 6 +-----
> > drivers/gpu/drm/i915/intel_device_info.h | 7 +++----
> > 2 files changed, 4 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index 0ab4826921f7..9fe765ffe878 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -2309,10 +2309,6 @@ __platform_mask_index(const struct intel_runtime_info *info,
> > const unsigned int pbits =
> > BITS_PER_TYPE(info->platform_mask[0]) - INTEL_SUBPLATFORM_BITS;
> >
> > - /* Expand the platform_mask array if this fails. */
> > - BUILD_BUG_ON(INTEL_MAX_PLATFORMS >
> > - pbits * ARRAY_SIZE(info->platform_mask));
> > -
> > return p / pbits;
> > }
> >
> > @@ -2354,7 +2350,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
> > const unsigned int pi = __platform_mask_index(info, p);
> > const unsigned int pb = __platform_mask_bit(info, p);
> > const unsigned int msb = BITS_PER_TYPE(info->platform_mask[0]) - 1;
> > - const u32 mask = info->platform_mask[pi];
> > + const unsigned long mask = info->platform_mask[pi];
> >
> > BUILD_BUG_ON(!__builtin_constant_p(p));
> > BUILD_BUG_ON(!__builtin_constant_p(s));
> > diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> > index 0e579f158016..2f5ca2b6f094 100644
> > --- a/drivers/gpu/drm/i915/intel_device_info.h
> > +++ b/drivers/gpu/drm/i915/intel_device_info.h
> > @@ -214,11 +214,10 @@ struct intel_runtime_info {
> > * Platform mask is used for optimizing or-ed IS_PLATFORM calls into
> > * into single runtime conditionals, and also to provide groundwork
> > * for future per platform, or per SKU build optimizations.
> > - *
> > - * Array can be extended when necessary if the corresponding
> > - * BUILD_BUG_ON is hit.
> > */
> > - u32 platform_mask[2];
> > + unsigned long platform_mask[DIV_ROUND_UP(INTEL_MAX_PLATFORMS,
> > + BITS_PER_TYPE(unsigned long)
> > + - INTEL_SUBPLATFORM_BITS)];
> >
> > u16 device_id;
> >
> >
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Lucas De Marchi
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] drm/i915: use unsigned long for platform_mask
2019-04-03 8:15 ` Lucas De Marchi
@ 2019-04-03 9:25 ` Tvrtko Ursulin
2019-04-03 19:45 ` Lucas De Marchi
0 siblings, 1 reply; 13+ messages in thread
From: Tvrtko Ursulin @ 2019-04-03 9:25 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: Intel Graphics, Lucas De Marchi
On 03/04/2019 09:15, Lucas De Marchi wrote:
> On Tue, Apr 2, 2019 at 11:58 PM Tvrtko Ursulin
> <tvrtko.ursulin@linux.intel.com> wrote:
>>
>>
>> On 03/04/2019 02:46, Lucas De Marchi wrote:
>>> No reason to stick to u32 for platform mask if we can just use more bits
>>> on 64 bit platforms.
>>>
>>> $ size drivers/gpu/drm/i915/i915.ko*
>>> text data bss dec hex filename
>>> 1884779 41334 5408 1931521 1d7901 drivers/gpu/drm/i915/i915.ko
>>> 1886693 41358 5408 1933459 1d8093 drivers/gpu/drm/i915/i915.ko.old
>>
>> How did you get such a large difference, and decrease even? Could you
>> check in the code what is happening? Because I get an increase with this
>> patch:
>>
>> text data bss dec hex filename
>> 1905314 43903 7424 1956641 1ddb21 i915.ko.orig
>> 1905796 43903 7424 1957123 1ddd03 i915.ko.patch
>
> the only explanation I really have is that my measurement was bogus.
> Some possible explanations...
> 1) I compared a i386 to a x86-64 build; 2) somehow a config changed
> between the builds;
> 3) when preparing the patch I rebased on upstream between the builds.
>
> Checking (1), no... that's in the ~400k range. So no idea, sorry.
I was worried you'd say you compiler just behaves differently. To
eliminate this option it would still be good to double check if you can
find the time.
> So I think the only useful thing in this patch is to make the array to
> grow automatically. Or maybe not even that?
I really liked that and then started thinking that it can still sneak up
a mistake if one changes the type of the member and forgets to change
the type in size calculation BITS_PER_TYPE. So I ended up a little less
sure. Could the calculation self-reference the struct member?
Regards,
Tvrtko
>
> Lucas De Marchi
>
>>
>> Regards,
>>
>> Tvrtko
>>
>>>
>>> Now on 64 bits we have only one long as opposed to 2 u32:
>>>
>>> $ pahole -C intel_runtime_info drivers/gpu/drm/i915/i915.ko
>>> struct intel_runtime_info {
>>> long unsigned int platform_mask[1]; /* 0 8 */
>>> ...
>>> }
>>>
>>> On 32 bits we still have the same thing as before:
>>> $ size drivers/gpu/drm/i915/i915.ko*
>>> text data bss dec hex filename
>>> 1489839 32485 2816 1525140 174594 drivers/gpu/drm/i915/i915.ko
>>> 1489839 32485 2816 1525140 174594 drivers/gpu/drm/i915/i915.ko.old
>>>
>>> Besides reducing the code on x86-64 now the array size is automatically
>>> calculated and we don't have to worry about extending it anymore.
>>>
>>> v2: fix sparse and checkpatch warnings
>>>
>>> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>>> ---
>>> drivers/gpu/drm/i915/i915_drv.h | 6 +-----
>>> drivers/gpu/drm/i915/intel_device_info.h | 7 +++----
>>> 2 files changed, 4 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>>> index 0ab4826921f7..9fe765ffe878 100644
>>> --- a/drivers/gpu/drm/i915/i915_drv.h
>>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>>> @@ -2309,10 +2309,6 @@ __platform_mask_index(const struct intel_runtime_info *info,
>>> const unsigned int pbits =
>>> BITS_PER_TYPE(info->platform_mask[0]) - INTEL_SUBPLATFORM_BITS;
>>>
>>> - /* Expand the platform_mask array if this fails. */
>>> - BUILD_BUG_ON(INTEL_MAX_PLATFORMS >
>>> - pbits * ARRAY_SIZE(info->platform_mask));
>>> -
>>> return p / pbits;
>>> }
>>>
>>> @@ -2354,7 +2350,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
>>> const unsigned int pi = __platform_mask_index(info, p);
>>> const unsigned int pb = __platform_mask_bit(info, p);
>>> const unsigned int msb = BITS_PER_TYPE(info->platform_mask[0]) - 1;
>>> - const u32 mask = info->platform_mask[pi];
>>> + const unsigned long mask = info->platform_mask[pi];
>>>
>>> BUILD_BUG_ON(!__builtin_constant_p(p));
>>> BUILD_BUG_ON(!__builtin_constant_p(s));
>>> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
>>> index 0e579f158016..2f5ca2b6f094 100644
>>> --- a/drivers/gpu/drm/i915/intel_device_info.h
>>> +++ b/drivers/gpu/drm/i915/intel_device_info.h
>>> @@ -214,11 +214,10 @@ struct intel_runtime_info {
>>> * Platform mask is used for optimizing or-ed IS_PLATFORM calls into
>>> * into single runtime conditionals, and also to provide groundwork
>>> * for future per platform, or per SKU build optimizations.
>>> - *
>>> - * Array can be extended when necessary if the corresponding
>>> - * BUILD_BUG_ON is hit.
>>> */
>>> - u32 platform_mask[2];
>>> + unsigned long platform_mask[DIV_ROUND_UP(INTEL_MAX_PLATFORMS,
>>> + BITS_PER_TYPE(unsigned long)
>>> + - INTEL_SUBPLATFORM_BITS)];
>>>
>>> u16 device_id;
>>>
>>>
>>
>> _______________________________________________
>> 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] 13+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: use unsigned long for platform_mask (rev2)
2019-04-02 22:21 [PATCH] drm/i915: use unsigned long for platform_mask Lucas De Marchi
` (5 preceding siblings ...)
2019-04-03 2:13 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-04-03 17:32 ` Patchwork
6 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-04-03 17:32 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: use unsigned long for platform_mask (rev2)
URL : https://patchwork.freedesktop.org/series/58895/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5858_full -> Patchwork_12663_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12663_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_basic@readonly-bsd1:
- shard-iclb: NOTRUN -> SKIP [fdo#109276] +7
* igt@gem_exec_params@no-blt:
- shard-iclb: NOTRUN -> SKIP [fdo#109283]
* igt@gem_exec_params@no-bsd:
- shard-apl: NOTRUN -> SKIP [fdo#109271] +11
* igt@gem_exec_parse@basic-allowed:
- shard-iclb: NOTRUN -> SKIP [fdo#109289] +1
* igt@gem_stolen@stolen-clear:
- shard-glk: NOTRUN -> SKIP [fdo#109271] +22
* igt@gem_stolen@stolen-no-mmap:
- shard-iclb: NOTRUN -> SKIP [fdo#109277] +2
* igt@i915_pm_sseu@full-enable:
- shard-iclb: NOTRUN -> SKIP [fdo#109288]
* igt@kms_atomic_transition@6x-modeset-transitions:
- shard-iclb: NOTRUN -> SKIP [fdo#109278] +4
* igt@kms_busy@extended-modeset-hang-newfb-render-d:
- shard-apl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1
* igt@kms_busy@extended-pageflip-hang-newfb-render-d:
- shard-glk: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_chamelium@hdmi-crc-planes-random:
- shard-iclb: NOTRUN -> SKIP [fdo#109284] +1
* igt@kms_cursor_crc@cursor-64x64-onscreen:
- shard-snb: PASS -> SKIP [fdo#109271] +3
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-skl: PASS -> INCOMPLETE [fdo#104108] +1
* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-iclb: NOTRUN -> SKIP [fdo#109274] +3
* igt@kms_flip@2x-flip-vs-wf_vblank-interruptible:
- shard-skl: NOTRUN -> SKIP [fdo#109271] +95
* igt@kms_force_connector_basic@force-connector-state:
- shard-iclb: NOTRUN -> SKIP [fdo#109285]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
- shard-iclb: PASS -> FAIL [fdo#103167] +10
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-blt:
- shard-iclb: NOTRUN -> SKIP [fdo#109280] +12
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-pwrite:
- shard-iclb: PASS -> FAIL [fdo#109247] +23
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-render:
- shard-iclb: NOTRUN -> FAIL [fdo#109247]
* igt@kms_frontbuffer_tracking@psr-2p-scndscrn-spr-indfb-draw-mmap-wc:
- shard-snb: NOTRUN -> SKIP [fdo#109271] +46
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d:
- shard-skl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +9
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: NOTRUN -> FAIL [fdo#107815] / [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-skl: NOTRUN -> FAIL [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
- shard-snb: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +2
* igt@kms_plane_scaling@pipe-a-scaler-with-clipping-clamping:
- shard-glk: PASS -> SKIP [fdo#109271] / [fdo#109278] +1
* igt@kms_plane_scaling@pipe-a-scaler-with-rotation:
- shard-iclb: NOTRUN -> FAIL [fdo#109052]
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: PASS -> SKIP [fdo#109642]
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: PASS -> SKIP [fdo#109441]
* igt@kms_psr@psr2_sprite_plane_onoff:
- shard-iclb: NOTRUN -> SKIP [fdo#109441]
* igt@kms_psr@sprite_mmap_cpu:
- shard-iclb: PASS -> FAIL [fdo#107383] / [fdo#110215] +2
* igt@kms_rotation_crc@multiplane-rotation:
- shard-kbl: PASS -> FAIL [fdo#109016]
* igt@kms_setmode@basic:
- shard-iclb: NOTRUN -> FAIL [fdo#99912]
* igt@kms_sysfs_edid_timing:
- shard-skl: NOTRUN -> FAIL [fdo#100047]
* igt@kms_vblank@pipe-b-ts-continuation-suspend:
- shard-skl: PASS -> FAIL [fdo#104894]
* igt@prime_nv_pcopy@test_semaphore:
- shard-iclb: NOTRUN -> SKIP [fdo#109291]
* igt@prime_vgem@fence-flip-hang:
- shard-iclb: NOTRUN -> SKIP [fdo#109295]
* igt@tools_test@sysfs_l3_parity:
- shard-iclb: NOTRUN -> SKIP [fdo#109307]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- shard-iclb: FAIL [fdo#109779] -> PASS
* igt@gem_ppgtt@blt-vs-render-ctxn:
- shard-iclb: INCOMPLETE [fdo#109801] -> PASS
* igt@gem_tiled_pread_pwrite:
- shard-iclb: INCOMPLETE [fdo#109100] -> PASS
* igt@gem_tiled_swapping@non-threaded:
- shard-iclb: FAIL [fdo#108686] -> PASS
* igt@i915_pm_rpm@cursor-dpms:
- shard-skl: INCOMPLETE [fdo#107807] -> PASS +1
* igt@kms_cursor_crc@cursor-128x128-suspend:
- shard-skl: INCOMPLETE [fdo#104108] -> PASS
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-iclb: FAIL [fdo#105363] -> PASS
- shard-skl: FAIL [fdo#105363] -> PASS
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: FAIL [fdo#103167] -> PASS +5
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-pwrite:
- shard-iclb: FAIL [fdo#109247] -> PASS +8
* igt@kms_frontbuffer_tracking@psr-suspend:
- shard-iclb: FAIL [fdo#103375] -> PASS
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: FAIL [fdo#107815] -> PASS
* igt@kms_plane_scaling@pipe-c-scaler-with-clipping-clamping:
- shard-iclb: INCOMPLETE [fdo#110041] -> PASS
* igt@kms_psr@primary_blt:
- shard-iclb: FAIL [fdo#107383] / [fdo#110215] -> PASS
* igt@kms_psr@psr2_primary_mmap_gtt:
- shard-iclb: SKIP [fdo#109441] -> PASS +1
* igt@kms_rotation_crc@multiplane-rotation-cropping-top:
- shard-kbl: FAIL [fdo#109016] -> PASS
* igt@kms_setmode@basic:
- shard-skl: FAIL [fdo#99912] -> PASS
* igt@kms_vblank@pipe-c-ts-continuation-modeset-hang:
- shard-apl: FAIL [fdo#104894] -> PASS
* igt@perf@blocking:
- shard-iclb: FAIL [fdo#108587] -> PASS
#### Warnings ####
* igt@i915_pm_backlight@fade_with_suspend:
- shard-iclb: FAIL [fdo#107847] -> DMESG-FAIL [fdo#107847]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: DMESG-FAIL [fdo#103167] / [fdo#106107] -> FAIL [fdo#103167]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#107383]: https://bugs.freedesktop.org/show_bug.cgi?id=107383
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#107815]: https://bugs.freedesktop.org/show_bug.cgi?id=107815
[fdo#107847]: https://bugs.freedesktop.org/show_bug.cgi?id=107847
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108587]: https://bugs.freedesktop.org/show_bug.cgi?id=108587
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016
[fdo#109052]: https://bugs.freedesktop.org/show_bug.cgi?id=109052
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109247]: https://bugs.freedesktop.org/show_bug.cgi?id=109247
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109277]: https://bugs.freedesktop.org/show_bug.cgi?id=109277
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109288]: https://bugs.freedesktop.org/show_bug.cgi?id=109288
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#109779]: https://bugs.freedesktop.org/show_bug.cgi?id=109779
[fdo#109801]: https://bugs.freedesktop.org/show_bug.cgi?id=109801
[fdo#110041]: https://bugs.freedesktop.org/show_bug.cgi?id=110041
[fdo#110215]: https://bugs.freedesktop.org/show_bug.cgi?id=110215
[fdo#110254]: https://bugs.freedesktop.org/show_bug.cgi?id=110254
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 9)
------------------------------
Missing (1): shard-hsw
Build changes
-------------
* Linux: CI_DRM_5858 -> Patchwork_12663
CI_DRM_5858: 79fda73b53d7233c94922601d42aa0b7625544de @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4922: e941e4a29438c7130554492e4daf52afbc99ffdf @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12663: f3ce255eba79c31c7e1114541e34ba49b60f5111 @ 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_12663/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] drm/i915: use unsigned long for platform_mask
2019-04-03 9:25 ` Tvrtko Ursulin
@ 2019-04-03 19:45 ` Lucas De Marchi
0 siblings, 0 replies; 13+ messages in thread
From: Lucas De Marchi @ 2019-04-03 19:45 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: Intel Graphics
On Wed, Apr 03, 2019 at 10:25:33AM +0100, Tvrtko Ursulin wrote:
>
>On 03/04/2019 09:15, Lucas De Marchi wrote:
>>On Tue, Apr 2, 2019 at 11:58 PM Tvrtko Ursulin
>><tvrtko.ursulin@linux.intel.com> wrote:
>>>
>>>
>>>On 03/04/2019 02:46, Lucas De Marchi wrote:
>>>>No reason to stick to u32 for platform mask if we can just use more bits
>>>>on 64 bit platforms.
>>>>
>>>>$ size drivers/gpu/drm/i915/i915.ko*
>>>> text data bss dec hex filename
>>>>1884779 41334 5408 1931521 1d7901 drivers/gpu/drm/i915/i915.ko
>>>>1886693 41358 5408 1933459 1d8093 drivers/gpu/drm/i915/i915.ko.old
>>>
>>>How did you get such a large difference, and decrease even? Could you
>>>check in the code what is happening? Because I get an increase with this
>>>patch:
>>>
>>> text data bss dec hex filename
>>>1905314 43903 7424 1956641 1ddb21 i915.ko.orig
>>>1905796 43903 7424 1957123 1ddd03 i915.ko.patch
>>
>>the only explanation I really have is that my measurement was bogus.
>>Some possible explanations...
>>1) I compared a i386 to a x86-64 build; 2) somehow a config changed
>>between the builds;
>>3) when preparing the patch I rebased on upstream between the builds.
>>
>>Checking (1), no... that's in the ~400k range. So no idea, sorry.
>
>I was worried you'd say you compiler just behaves differently. To
>eliminate this option it would still be good to double check if you
>can find the time.
I tried some options, to reproduce it again, but I couldn't. Interesting
that I remember running pahole on the result .ko and getting the result
I was expecting.
I thought about looking into my .bash_history, but it already rotated.
>
>>So I think the only useful thing in this patch is to make the array to
>>grow automatically. Or maybe not even that?
>
>I really liked that and then started thinking that it can still sneak
>up a mistake if one changes the type of the member and forgets to
>change the type in size calculation BITS_PER_TYPE. So I ended up a
>little less sure. Could the calculation self-reference the struct
>member?
afaik, no. Because the struct is already not defined at this point. So
the usual trick of getting the size without an insntance doesn't work.
I.e. sizeof(((struct bla *)0)->member[0]) works outside of bla, but not
while we are defining it.
Well.. it can also happen of someone changing the type here and
forgetting to change "mask" in other function (see v1). I think since
they are in the same line it's easy to spot the mistake. But no strong
opinion. We already have 64 - 6 bits of platform bits that's probably
sufficient for a long time.
Lucas De Marchi
>
>Regards,
>
>Tvrtko
>
>>
>>Lucas De Marchi
>>
>>>
>>>Regards,
>>>
>>>Tvrtko
>>>
>>>>
>>>>Now on 64 bits we have only one long as opposed to 2 u32:
>>>>
>>>>$ pahole -C intel_runtime_info drivers/gpu/drm/i915/i915.ko
>>>>struct intel_runtime_info {
>>>> long unsigned int platform_mask[1]; /* 0 8 */
>>>>...
>>>>}
>>>>
>>>>On 32 bits we still have the same thing as before:
>>>>$ size drivers/gpu/drm/i915/i915.ko*
>>>> text data bss dec hex filename
>>>>1489839 32485 2816 1525140 174594 drivers/gpu/drm/i915/i915.ko
>>>>1489839 32485 2816 1525140 174594 drivers/gpu/drm/i915/i915.ko.old
>>>>
>>>>Besides reducing the code on x86-64 now the array size is automatically
>>>>calculated and we don't have to worry about extending it anymore.
>>>>
>>>>v2: fix sparse and checkpatch warnings
>>>>
>>>>Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>>>>---
>>>> drivers/gpu/drm/i915/i915_drv.h | 6 +-----
>>>> drivers/gpu/drm/i915/intel_device_info.h | 7 +++----
>>>> 2 files changed, 4 insertions(+), 9 deletions(-)
>>>>
>>>>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>>>>index 0ab4826921f7..9fe765ffe878 100644
>>>>--- a/drivers/gpu/drm/i915/i915_drv.h
>>>>+++ b/drivers/gpu/drm/i915/i915_drv.h
>>>>@@ -2309,10 +2309,6 @@ __platform_mask_index(const struct intel_runtime_info *info,
>>>> const unsigned int pbits =
>>>> BITS_PER_TYPE(info->platform_mask[0]) - INTEL_SUBPLATFORM_BITS;
>>>>
>>>>- /* Expand the platform_mask array if this fails. */
>>>>- BUILD_BUG_ON(INTEL_MAX_PLATFORMS >
>>>>- pbits * ARRAY_SIZE(info->platform_mask));
>>>>-
>>>> return p / pbits;
>>>> }
>>>>
>>>>@@ -2354,7 +2350,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
>>>> const unsigned int pi = __platform_mask_index(info, p);
>>>> const unsigned int pb = __platform_mask_bit(info, p);
>>>> const unsigned int msb = BITS_PER_TYPE(info->platform_mask[0]) - 1;
>>>>- const u32 mask = info->platform_mask[pi];
>>>>+ const unsigned long mask = info->platform_mask[pi];
>>>>
>>>> BUILD_BUG_ON(!__builtin_constant_p(p));
>>>> BUILD_BUG_ON(!__builtin_constant_p(s));
>>>>diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
>>>>index 0e579f158016..2f5ca2b6f094 100644
>>>>--- a/drivers/gpu/drm/i915/intel_device_info.h
>>>>+++ b/drivers/gpu/drm/i915/intel_device_info.h
>>>>@@ -214,11 +214,10 @@ struct intel_runtime_info {
>>>> * Platform mask is used for optimizing or-ed IS_PLATFORM calls into
>>>> * into single runtime conditionals, and also to provide groundwork
>>>> * for future per platform, or per SKU build optimizations.
>>>>- *
>>>>- * Array can be extended when necessary if the corresponding
>>>>- * BUILD_BUG_ON is hit.
>>>> */
>>>>- u32 platform_mask[2];
>>>>+ unsigned long platform_mask[DIV_ROUND_UP(INTEL_MAX_PLATFORMS,
>>>>+ BITS_PER_TYPE(unsigned long)
>>>>+ - INTEL_SUBPLATFORM_BITS)];
>>>>
>>>> u16 device_id;
>>>>
>>>>
>>>
>>>_______________________________________________
>>>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] 13+ messages in thread
end of thread, other threads:[~2019-04-03 19:45 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-02 22:21 [PATCH] drm/i915: use unsigned long for platform_mask Lucas De Marchi
2019-04-02 23:15 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2019-04-02 23:16 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-04-02 23:31 ` Lucas De Marchi
2019-04-02 23:48 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-04-03 1:46 ` [PATCH v2] " Lucas De Marchi
2019-04-03 6:57 ` Tvrtko Ursulin
2019-04-03 8:15 ` Lucas De Marchi
2019-04-03 9:25 ` Tvrtko Ursulin
2019-04-03 19:45 ` Lucas De Marchi
2019-04-03 1:54 ` ✗ Fi.CI.SPARSE: warning for drm/i915: use unsigned long for platform_mask (rev2) Patchwork
2019-04-03 2:13 ` ✓ Fi.CI.BAT: success " Patchwork
2019-04-03 17:32 ` ✓ Fi.CI.IGT: " 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.