* [PATCH] drm/i915/icl: Store available engine masks in INTEL_INFO
@ 2018-10-18 10:41 Tvrtko Ursulin
2018-10-18 11:11 ` ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Tvrtko Ursulin @ 2018-10-18 10:41 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Upcoming GuC code will need to read the fused off engine masks as well,
and will also want to have them as enabled instead of disabled masks.
To consolidate the read-out place we can store them in this fashion inside
INTEL_INFO so they can be easily referenced in the future.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
drivers/gpu/drm/i915/intel_device_info.c | 33 +++++++++++-------------
drivers/gpu/drm/i915/intel_device_info.h | 4 +++
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 03df4e33763d..4ed86025e3c9 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -876,40 +876,37 @@ void intel_driver_caps_print(const struct intel_driver_caps *caps,
void intel_device_info_init_mmio(struct drm_i915_private *dev_priv)
{
struct intel_device_info *info = mkwrite_device_info(dev_priv);
- u8 vdbox_disable, vebox_disable;
u32 media_fuse;
- int i;
+ unsigned int i;
if (INTEL_GEN(dev_priv) < 11)
return;
- media_fuse = I915_READ(GEN11_GT_VEBOX_VDBOX_DISABLE);
+ media_fuse = ~I915_READ(GEN11_GT_VEBOX_VDBOX_DISABLE);
- vdbox_disable = media_fuse & GEN11_GT_VDBOX_DISABLE_MASK;
- vebox_disable = (media_fuse & GEN11_GT_VEBOX_DISABLE_MASK) >>
- GEN11_GT_VEBOX_DISABLE_SHIFT;
+ info->vdbox_enable = media_fuse & GEN11_GT_VDBOX_DISABLE_MASK;
+ info->vebox_enable = (media_fuse & GEN11_GT_VEBOX_DISABLE_MASK) >>
+ GEN11_GT_VEBOX_DISABLE_SHIFT;
- DRM_DEBUG_DRIVER("vdbox disable: %04x\n", vdbox_disable);
+ DRM_DEBUG_DRIVER("vdbox enable: %04x\n", info->vdbox_enable);
for (i = 0; i < I915_MAX_VCS; i++) {
if (!HAS_ENGINE(dev_priv, _VCS(i)))
continue;
- if (!(BIT(i) & vdbox_disable))
- continue;
-
- info->ring_mask &= ~ENGINE_MASK(_VCS(i));
- DRM_DEBUG_DRIVER("vcs%u fused off\n", i);
+ if (!(BIT(i) & info->vdbox_enable)) {
+ info->ring_mask &= ~ENGINE_MASK(_VCS(i));
+ DRM_DEBUG_DRIVER("vcs%u fused off\n", i);
+ }
}
- DRM_DEBUG_DRIVER("vebox disable: %04x\n", vebox_disable);
+ DRM_DEBUG_DRIVER("vebox enable: %04x\n", info->vebox_enable);
for (i = 0; i < I915_MAX_VECS; i++) {
if (!HAS_ENGINE(dev_priv, _VECS(i)))
continue;
- if (!(BIT(i) & vebox_disable))
- continue;
-
- info->ring_mask &= ~ENGINE_MASK(_VECS(i));
- DRM_DEBUG_DRIVER("vecs%u fused off\n", i);
+ if (!(BIT(i) & info->vebox_enable)) {
+ info->ring_mask &= ~ENGINE_MASK(_VECS(i));
+ DRM_DEBUG_DRIVER("vecs%u fused off\n", i);
+ }
}
}
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index af7002640cdf..b4c2c4eae78b 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -185,6 +185,10 @@ struct intel_device_info {
u32 cs_timestamp_frequency_khz;
+ /* Enabled (not fused off) media engine bitmasks. */
+ u8 vdbox_enable;
+ u8 vebox_enable;
+
struct color_luts {
u16 degamma_lut_size;
u16 gamma_lut_size;
--
2.17.1
_______________________________________________
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* ✓ Fi.CI.BAT: success for drm/i915/icl: Store available engine masks in INTEL_INFO
2018-10-18 10:41 [PATCH] drm/i915/icl: Store available engine masks in INTEL_INFO Tvrtko Ursulin
@ 2018-10-18 11:11 ` Patchwork
2018-10-26 9:20 ` Tvrtko Ursulin
2018-10-18 18:46 ` [PATCH] " Daniele Ceraolo Spurio
2018-10-22 10:48 ` ✓ Fi.CI.IGT: success for " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Patchwork @ 2018-10-18 11:11 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/icl: Store available engine masks in INTEL_INFO
URL : https://patchwork.freedesktop.org/series/51175/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5005 -> Patchwork_10502 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/51175/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10502 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_module_reload@basic-reload:
fi-blb-e6850: PASS -> INCOMPLETE (fdo#107718)
igt@gem_exec_suspend@basic-s3:
fi-bdw-samus: NOTRUN -> INCOMPLETE (fdo#107773)
fi-kbl-soraka: NOTRUN -> INCOMPLETE (fdo#107774, fdo#107859, fdo#107556)
igt@kms_chamelium@hdmi-edid-read:
fi-icl-u2: NOTRUN -> DMESG-WARN (fdo#107732, fdo#108070)
igt@kms_chamelium@hdmi-hpd-fast:
fi-icl-u2: NOTRUN -> DMESG-WARN (fdo#107732)
igt@kms_frontbuffer_tracking@basic:
fi-hsw-peppy: PASS -> DMESG-WARN (fdo#102614)
fi-byt-clapper: PASS -> FAIL (fdo#103167)
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#107556 https://bugs.freedesktop.org/show_bug.cgi?id=107556
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#107732 https://bugs.freedesktop.org/show_bug.cgi?id=107732
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
fdo#107774 https://bugs.freedesktop.org/show_bug.cgi?id=107774
fdo#107859 https://bugs.freedesktop.org/show_bug.cgi?id=107859
fdo#108070 https://bugs.freedesktop.org/show_bug.cgi?id=108070
== Participating hosts (42 -> 42) ==
Additional (3): fi-kbl-soraka fi-icl-u2 fi-bdw-samus
Missing (3): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan
== Build changes ==
* Linux: CI_DRM_5005 -> Patchwork_10502
CI_DRM_5005: 7a27ee6b5f714f6852abb0098990a05675bd9d55 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4683: 7766b1e2348b32cc8ed58a972c6fd53b20279549 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10502: 2316d11688a081d93c20a7065bb96f463b316a01 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
2316d11688a0 drm/i915/icl: Store available engine masks in INTEL_INFO
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10502/issues.html
_______________________________________________
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: [PATCH] drm/i915/icl: Store available engine masks in INTEL_INFO
2018-10-18 10:41 [PATCH] drm/i915/icl: Store available engine masks in INTEL_INFO Tvrtko Ursulin
2018-10-18 11:11 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-10-18 18:46 ` Daniele Ceraolo Spurio
2018-10-22 10:48 ` ✓ Fi.CI.IGT: success for " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Daniele Ceraolo Spurio @ 2018-10-18 18:46 UTC (permalink / raw)
To: Tvrtko Ursulin, Intel-gfx
On 18/10/18 03:41, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Upcoming GuC code will need to read the fused off engine masks as well,
> and will also want to have them as enabled instead of disabled masks.
>
> To consolidate the read-out place we can store them in this fashion inside
> INTEL_INFO so they can be easily referenced in the future.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
The GuC patch that re-reads the fuse register is here:
https://patchwork.freedesktop.org/patch/246427/
Consolidations wins:
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Daniele
> ---
> drivers/gpu/drm/i915/intel_device_info.c | 33 +++++++++++-------------
> drivers/gpu/drm/i915/intel_device_info.h | 4 +++
> 2 files changed, 19 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index 03df4e33763d..4ed86025e3c9 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -876,40 +876,37 @@ void intel_driver_caps_print(const struct intel_driver_caps *caps,
> void intel_device_info_init_mmio(struct drm_i915_private *dev_priv)
> {
> struct intel_device_info *info = mkwrite_device_info(dev_priv);
> - u8 vdbox_disable, vebox_disable;
> u32 media_fuse;
> - int i;
> + unsigned int i;
>
> if (INTEL_GEN(dev_priv) < 11)
> return;
>
> - media_fuse = I915_READ(GEN11_GT_VEBOX_VDBOX_DISABLE);
> + media_fuse = ~I915_READ(GEN11_GT_VEBOX_VDBOX_DISABLE);
>
> - vdbox_disable = media_fuse & GEN11_GT_VDBOX_DISABLE_MASK;
> - vebox_disable = (media_fuse & GEN11_GT_VEBOX_DISABLE_MASK) >>
> - GEN11_GT_VEBOX_DISABLE_SHIFT;
> + info->vdbox_enable = media_fuse & GEN11_GT_VDBOX_DISABLE_MASK;
> + info->vebox_enable = (media_fuse & GEN11_GT_VEBOX_DISABLE_MASK) >>
> + GEN11_GT_VEBOX_DISABLE_SHIFT;
>
> - DRM_DEBUG_DRIVER("vdbox disable: %04x\n", vdbox_disable);
> + DRM_DEBUG_DRIVER("vdbox enable: %04x\n", info->vdbox_enable);
> for (i = 0; i < I915_MAX_VCS; i++) {
> if (!HAS_ENGINE(dev_priv, _VCS(i)))
> continue;
>
> - if (!(BIT(i) & vdbox_disable))
> - continue;
> -
> - info->ring_mask &= ~ENGINE_MASK(_VCS(i));
> - DRM_DEBUG_DRIVER("vcs%u fused off\n", i);
> + if (!(BIT(i) & info->vdbox_enable)) {
> + info->ring_mask &= ~ENGINE_MASK(_VCS(i));
> + DRM_DEBUG_DRIVER("vcs%u fused off\n", i);
> + }
> }
>
> - DRM_DEBUG_DRIVER("vebox disable: %04x\n", vebox_disable);
> + DRM_DEBUG_DRIVER("vebox enable: %04x\n", info->vebox_enable);
> for (i = 0; i < I915_MAX_VECS; i++) {
> if (!HAS_ENGINE(dev_priv, _VECS(i)))
> continue;
>
> - if (!(BIT(i) & vebox_disable))
> - continue;
> -
> - info->ring_mask &= ~ENGINE_MASK(_VECS(i));
> - DRM_DEBUG_DRIVER("vecs%u fused off\n", i);
> + if (!(BIT(i) & info->vebox_enable)) {
> + info->ring_mask &= ~ENGINE_MASK(_VECS(i));
> + DRM_DEBUG_DRIVER("vecs%u fused off\n", i);
> + }
> }
> }
> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> index af7002640cdf..b4c2c4eae78b 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -185,6 +185,10 @@ struct intel_device_info {
>
> u32 cs_timestamp_frequency_khz;
>
> + /* Enabled (not fused off) media engine bitmasks. */
> + u8 vdbox_enable;
> + u8 vebox_enable;
> +
> struct color_luts {
> u16 degamma_lut_size;
> u16 gamma_lut_size;
>
_______________________________________________
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* ✓ Fi.CI.IGT: success for drm/i915/icl: Store available engine masks in INTEL_INFO
2018-10-18 10:41 [PATCH] drm/i915/icl: Store available engine masks in INTEL_INFO Tvrtko Ursulin
2018-10-18 11:11 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-10-18 18:46 ` [PATCH] " Daniele Ceraolo Spurio
@ 2018-10-22 10:48 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-10-22 10:48 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/icl: Store available engine masks in INTEL_INFO
URL : https://patchwork.freedesktop.org/series/51175/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5005_full -> Patchwork_10502_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10502_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_10502_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10502_full:
=== IGT changes ===
==== Warnings ====
igt@perf_pmu@rc6:
shard-kbl: SKIP -> PASS
== Known issues ==
Here are the changes found in Patchwork_10502_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@debugfs_test@read_all_entries_display_off:
shard-skl: PASS -> INCOMPLETE (fdo#104108)
igt@drv_suspend@fence-restore-untiled:
shard-kbl: PASS -> INCOMPLETE (fdo#103665)
igt@kms_atomic_transition@1x-modeset-transitions-fencing:
shard-skl: NOTRUN -> FAIL (fdo#108470)
igt@kms_atomic_transition@1x-modeset-transitions-nonblocking-fencing:
shard-apl: PASS -> DMESG-WARN (fdo#105602, fdo#103558) +3
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
shard-skl: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_color@pipe-a-ctm-blue-to-red:
shard-skl: NOTRUN -> FAIL (fdo#107201)
igt@kms_flip@2x-flip-vs-expired-vblank:
shard-glk: PASS -> FAIL (fdo#105363) +1
igt@kms_flip@dpms-vs-vblank-race:
shard-kbl: PASS -> FAIL (fdo#103060)
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt:
shard-glk: PASS -> FAIL (fdo#103167)
igt@kms_frontbuffer_tracking@fbc-1p-rte:
shard-apl: PASS -> DMESG-WARN (fdo#108131, fdo#103558)
igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-mmap-gtt:
shard-skl: NOTRUN -> FAIL (fdo#103167)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
shard-skl: PASS -> INCOMPLETE (fdo#104108, fdo#107773)
igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
shard-skl: NOTRUN -> FAIL (fdo#107815, fdo#108145)
igt@kms_plane_alpha_blend@pipe-c-alpha-transparant-fb:
shard-skl: NOTRUN -> FAIL (fdo#108145)
igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
shard-apl: PASS -> FAIL (fdo#103166) +1
igt@perf_pmu@idle-no-semaphores-rcs0:
shard-glk: PASS -> DMESG-WARN (fdo#106538, fdo#105763) +1
igt@pm_backlight@fade_with_suspend:
shard-skl: NOTRUN -> FAIL (fdo#107847)
igt@pm_rpm@system-suspend:
shard-skl: PASS -> INCOMPLETE (fdo#104108, fdo#107807, fdo#107773)
==== Possible fixes ====
igt@drv_suspend@shrink:
shard-hsw: INCOMPLETE (fdo#106886, fdo#103540) -> PASS
igt@kms_busy@extended-modeset-hang-newfb-render-b:
shard-kbl: DMESG-WARN (fdo#107956) -> PASS
igt@kms_ccs@pipe-b-crc-sprite-planes-basic:
shard-glk: FAIL (fdo#108145) -> PASS
igt@kms_color@pipe-a-legacy-gamma:
shard-apl: FAIL (fdo#104782, fdo#108145) -> PASS
igt@kms_cursor_crc@cursor-256x256-random:
shard-apl: FAIL (fdo#103232) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
shard-apl: FAIL (fdo#103167) -> PASS +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
shard-glk: FAIL (fdo#103167) -> PASS
igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-draw-blt:
shard-snb: INCOMPLETE (fdo#105411) -> SKIP
igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
shard-glk: FAIL (fdo#103166) -> PASS
igt@kms_setmode@basic:
shard-kbl: FAIL (fdo#99912) -> PASS
igt@pm_rpm@gem-execbuf:
shard-skl: INCOMPLETE (fdo#107803, fdo#107807) -> PASS
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#104782 https://bugs.freedesktop.org/show_bug.cgi?id=104782
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#107201 https://bugs.freedesktop.org/show_bug.cgi?id=107201
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
fdo#107803 https://bugs.freedesktop.org/show_bug.cgi?id=107803
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#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108131 https://bugs.freedesktop.org/show_bug.cgi?id=108131
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#108470 https://bugs.freedesktop.org/show_bug.cgi?id=108470
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (6 -> 6) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_5005 -> Patchwork_10502
CI_DRM_5005: 7a27ee6b5f714f6852abb0098990a05675bd9d55 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4683: 7766b1e2348b32cc8ed58a972c6fd53b20279549 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10502: 2316d11688a081d93c20a7065bb96f463b316a01 @ 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_10502/shards.html
_______________________________________________
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:[~2018-10-26 9:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-18 10:41 [PATCH] drm/i915/icl: Store available engine masks in INTEL_INFO Tvrtko Ursulin
2018-10-18 11:11 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-10-26 9:20 ` Tvrtko Ursulin
2018-10-18 18:46 ` [PATCH] " Daniele Ceraolo Spurio
2018-10-22 10:48 ` ✓ Fi.CI.IGT: 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.