* [PATCH] drm/i915: bump platform_mask to u64
@ 2019-03-15 0:13 Lucas De Marchi
2019-03-15 0:19 ` Chris Wilson
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Lucas De Marchi @ 2019-03-15 0:13 UTC (permalink / raw)
To: intel-gfx
With Elkhart Lake being added to the platforms we are almost on the edge
of platforms that fits on this 32 bits mask. So bump it to 64 bits to
have room for new ones.
Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 3 ++-
drivers/gpu/drm/i915/intel_device_info.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index dccb6006aabf..3105c1d1a5ab 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2281,7 +2281,8 @@ static inline unsigned int i915_sg_segment_size(void)
#define IS_REVID(p, since, until) \
(INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until))
-#define IS_PLATFORM(dev_priv, p) (INTEL_INFO(dev_priv)->platform_mask & BIT(p))
+#define IS_PLATFORM(dev_priv, p) \
+ (INTEL_INFO(dev_priv)->platform_mask & BIT_ULL(p))
#define IS_I830(dev_priv) IS_PLATFORM(dev_priv, INTEL_I830)
#define IS_I845G(dev_priv) IS_PLATFORM(dev_priv, INTEL_I845G)
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 047d10bdd455..2e6f2de6c2fa 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -160,7 +160,7 @@ struct intel_device_info {
intel_engine_mask_t engine_mask; /* Engines supported by the HW */
enum intel_platform platform;
- u32 platform_mask;
+ u64 platform_mask;
enum intel_ppgtt ppgtt;
unsigned int page_sizes; /* page sizes supported by the HW */
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: bump platform_mask to u64
2019-03-15 0:13 [PATCH] drm/i915: bump platform_mask to u64 Lucas De Marchi
@ 2019-03-15 0:19 ` Chris Wilson
2019-03-15 7:18 ` Lucas De Marchi
2019-03-15 0:31 ` ✗ Fi.CI.SPARSE: warning for " Patchwork
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2019-03-15 0:19 UTC (permalink / raw)
To: Lucas De Marchi, intel-gfx
Quoting Lucas De Marchi (2019-03-15 00:13:31)
> With Elkhart Lake being added to the platforms we are almost on the edge
> of platforms that fits on this 32 bits mask. So bump it to 64 bits to
> have room for new ones.
>
> Cc: José Roberto de Souza <jose.souza@intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Since platform_mask exists as an optimisation for code size, it'll be
useful to track the impact of changes.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✗ Fi.CI.SPARSE: warning for drm/i915: bump platform_mask to u64
2019-03-15 0:13 [PATCH] drm/i915: bump platform_mask to u64 Lucas De Marchi
2019-03-15 0:19 ` Chris Wilson
@ 2019-03-15 0:31 ` Patchwork
2019-03-15 0:44 ` [PATCH] " Souza, Jose
2019-03-15 1:12 ` ✓ Fi.CI.BAT: success for " Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2019-03-15 0:31 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: bump platform_mask to u64
URL : https://patchwork.freedesktop.org/series/58029/
State : warning
== Summary ==
$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915: bump platform_mask to u64
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3560:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3561: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] 6+ messages in thread
* Re: [PATCH] drm/i915: bump platform_mask to u64
2019-03-15 0:13 [PATCH] drm/i915: bump platform_mask to u64 Lucas De Marchi
2019-03-15 0:19 ` Chris Wilson
2019-03-15 0:31 ` ✗ Fi.CI.SPARSE: warning for " Patchwork
@ 2019-03-15 0:44 ` Souza, Jose
2019-03-15 1:12 ` ✓ Fi.CI.BAT: success for " Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Souza, Jose @ 2019-03-15 0:44 UTC (permalink / raw)
To: intel-gfx, De Marchi, Lucas
[-- Attachment #1.1: Type: text/plain, Size: 1950 bytes --]
On Thu, 2019-03-14 at 17:13 -0700, Lucas De Marchi wrote:
> With Elkhart Lake being added to the platforms we are almost on the
> edge
> of platforms that fits on this 32 bits mask. So bump it to 64 bits to
> have room for new ones.
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
But https://patchwork.freedesktop.org/series/58030/ is more long term
solution :P
>
> Cc: José Roberto de Souza <jose.souza@intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 3 ++-
> drivers/gpu/drm/i915/intel_device_info.h | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h
> b/drivers/gpu/drm/i915/i915_drv.h
> index dccb6006aabf..3105c1d1a5ab 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2281,7 +2281,8 @@ static inline unsigned int
> i915_sg_segment_size(void)
> #define IS_REVID(p, since, until) \
> (INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until))
>
> -#define IS_PLATFORM(dev_priv, p) (INTEL_INFO(dev_priv)-
> >platform_mask & BIT(p))
> +#define IS_PLATFORM(dev_priv, p) \
> + (INTEL_INFO(dev_priv)->platform_mask & BIT_ULL(p))
>
> #define IS_I830(dev_priv) IS_PLATFORM(dev_priv, INTEL_I830)
> #define IS_I845G(dev_priv) IS_PLATFORM(dev_priv, INTEL_I845G)
> diff --git a/drivers/gpu/drm/i915/intel_device_info.h
> b/drivers/gpu/drm/i915/intel_device_info.h
> index 047d10bdd455..2e6f2de6c2fa 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -160,7 +160,7 @@ struct intel_device_info {
> intel_engine_mask_t engine_mask; /* Engines supported by the HW
> */
>
> enum intel_platform platform;
> - u32 platform_mask;
> + u64 platform_mask;
>
> enum intel_ppgtt ppgtt;
> unsigned int page_sizes; /* page sizes supported by the HW */
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: bump platform_mask to u64
2019-03-15 0:13 [PATCH] drm/i915: bump platform_mask to u64 Lucas De Marchi
` (2 preceding siblings ...)
2019-03-15 0:44 ` [PATCH] " Souza, Jose
@ 2019-03-15 1:12 ` Patchwork
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2019-03-15 1:12 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: bump platform_mask to u64
URL : https://patchwork.freedesktop.org/series/58029/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5750 -> Patchwork_12471
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/58029/revisions/1/mbox/
Known issues
------------
Here are the changes found in Patchwork_12471 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@cs-gfx:
- fi-skl-6700k2: NOTRUN -> SKIP [fdo#109271] +41
* igt@gem_exec_basic@gtt-bsd1:
- fi-bxt-j4205: NOTRUN -> SKIP [fdo#109271] +47
* igt@gem_exec_basic@readonly-bsd:
- fi-pnv-d510: NOTRUN -> SKIP [fdo#109271] +76
* igt@gem_exec_basic@readonly-bsd1:
- fi-snb-2520m: NOTRUN -> SKIP [fdo#109271] +57
* igt@gem_exec_store@basic-bsd1:
- fi-kbl-r: NOTRUN -> SKIP [fdo#109271] +41
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]
* igt@gem_workarounds@basic-read:
- fi-snb-2600: NOTRUN -> SKIP [fdo#109271] +57
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-bsw-kefka: PASS -> SKIP [fdo#109271]
* igt@i915_pm_rpm@basic-rte:
- fi-bsw-kefka: PASS -> FAIL [fdo#108800]
* igt@i915_selftest@live_execlists:
- fi-apl-guc: PASS -> INCOMPLETE [fdo#103927] / [fdo#109720]
* igt@kms_busy@basic-flip-c:
- fi-pnv-d510: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
- fi-snb-2520m: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
- fi-snb-2600: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@runner@aborted:
- fi-apl-guc: NOTRUN -> FAIL [fdo#108622] / [fdo#109720]
- fi-bxt-dsi: NOTRUN -> FAIL [fdo#109516]
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108622]: https://bugs.freedesktop.org/show_bug.cgi?id=108622
[fdo#108800]: https://bugs.freedesktop.org/show_bug.cgi?id=108800
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109516]: https://bugs.freedesktop.org/show_bug.cgi?id=109516
[fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720
Participating hosts (35 -> 35)
------------------------------
Additional (7): fi-bxt-dsi fi-snb-2520m fi-bxt-j4205 fi-pnv-d510 fi-kbl-r fi-skl-6700k2 fi-snb-2600
Missing (7): fi-kbl-soraka fi-hsw-4770r fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-icl-u2 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5750 -> Patchwork_12471
CI_DRM_5750: 2b6425f8c26cb2578d408f7c21e7ac92f83c0b4a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4886: de53202ae4b5747b86ccda22986dbeb47f65d732 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12471: e8d16870fadf0d097f0f7e54c98351fb3d287578 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
e8d16870fadf drm/i915: bump platform_mask to u64
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12471/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drm/i915: bump platform_mask to u64
2019-03-15 0:19 ` Chris Wilson
@ 2019-03-15 7:18 ` Lucas De Marchi
0 siblings, 0 replies; 6+ messages in thread
From: Lucas De Marchi @ 2019-03-15 7:18 UTC (permalink / raw)
To: Chris Wilson; +Cc: Intel Graphics, Lucas De Marchi
On Thu, Mar 14, 2019 at 5:19 PM Chris Wilson <chris@chris-wilson.co.uk> wrote:
>
> Quoting Lucas De Marchi (2019-03-15 00:13:31)
> > With Elkhart Lake being added to the platforms we are almost on the edge
> > of platforms that fits on this 32 bits mask. So bump it to 64 bits to
> > have room for new ones.
> >
> > Cc: José Roberto de Souza <jose.souza@intel.com>
> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>
> Since platform_mask exists as an optimisation for code size, it'll be
> useful to track the impact of changes.
code size? Moving to u64 for this mask would make almost no
difference. Just checking here:
$ size drivers/gpu/drm/i915/i915.o*
text data bss dec hex filename
1836757 40454 4176 1881387 1cb52b
drivers/gpu/drm/i915/i915.o
1836533 40454 4176 1881163 1cb44b
drivers/gpu/drm/i915/i915.o.old
So... around 200 bytes.
Lucas De Marchi
> -Chris
> _______________________________________________
> 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] 6+ messages in thread
end of thread, other threads:[~2019-03-15 7:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-15 0:13 [PATCH] drm/i915: bump platform_mask to u64 Lucas De Marchi
2019-03-15 0:19 ` Chris Wilson
2019-03-15 7:18 ` Lucas De Marchi
2019-03-15 0:31 ` ✗ Fi.CI.SPARSE: warning for " Patchwork
2019-03-15 0:44 ` [PATCH] " Souza, Jose
2019-03-15 1:12 ` ✓ Fi.CI.BAT: success for " 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.