drm/i915/skl: Ensure HW is powered during DDB HW state readout
Subsystems (2)
PATCH 1/1 drm/i915/skl: Ensure HW is powered during DDB HW state readout
The assumption when adding the intel_display_power_is_enabled() checks was that if it returns success the power can't be turned off afterwards during the HW access, which is guaranteed by modeset locks. This isn't always true, so make sure we hold a dedicated reference for the time of the access.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93441
--- drivers/gpu/drm/i915/intel_pm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +6 -1
@@ -2851,7 +2851,10 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv,memset (ddb,0 ,sizeof (*ddb));for_each_pipe (dev_priv, pipe) { -if (!intel_display_power_is_enabled (dev_priv,POWER_DOMAIN_PIPE (pipe))) +enum intel_display_power_domain power_domain; + + power_domain =POWER_DOMAIN_PIPE (pipe); +if (!intel_display_power_get_if_enabled (dev_priv, power_domain))continue ;for_each_plane (dev_priv, pipe, plane) {
@@ -2863,6 +2866,8 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, val =I915_READ (CUR_BUF_CFG (pipe));skl_ddb_entry_init_from_hw (&ddb->plane[pipe][PLANE_CURSOR ], val); + +intel_display_power_put (dev_priv, power_domain); } }
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 10 lines · Imre Deak
The assumption when adding the
intel_display_power_is_enabled()checks was that if it returns success the power can't be turned off afterwards during the HW access, which is guaranteed by modeset locks. This isn't always true, so make sure we hold a dedicated reference for the time of the access.Spotted-by Mika Kuoppala <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93441
CC Chris Wilson <[email protected]>Signed-off-by Imre Deak <[email protected]>
BR,
Jani.
Quoted 28 lines
--- drivers/gpu/drm/i915/intel_pm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_pm.c +6
-1@@ -2851,7 +2851,10 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv,memset (ddb,0 ,sizeof (*ddb));for_each_pipe (dev_priv, pipe) { -if (!intel_display_power_is_enabled (dev_priv,POWER_DOMAIN_PIPE (pipe))) +enum intel_display_power_domain power_domain; + + power_domain =POWER_DOMAIN_PIPE (pipe); +if (!intel_display_power_get_if_enabled (dev_priv, power_domain))continue ;for_each_plane (dev_priv, pipe, plane) {@@ -2863,6 +2866,8 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, val =I915_READ (CUR_BUF_CFG (pipe));skl_ddb_entry_init_from_hw (&ddb->plane[pipe][PLANE_CURSOR ], val); + +intel_display_power_put (dev_priv, power_domain); } }
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Jani Nikula
Quoted 10 lines · Imre Deak
The assumption when adding the
intel_display_power_is_enabled()checks
was that if it returns success the power can't be turned off afterwards
during the HW access, which is guaranteed by modeset locks. This isn't
always true, so make sure we hold a dedicated reference for the time of
the access.
Quoted 6 lines
Quoted 4 lines
Spotted-by Mika Kuoppala <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93441
CC Chris Wilson <[email protected]>Signed-off-by Imre Deak <[email protected]>Cc fixes or stable? Fixes which commit?
Hm, yes forgot about this. We need it in -fixes since it may fix DMC functionality according to Mika. Imo no need for it in stable, since on other platforms it wouldn't fix anything besides HW state checking.
I pushed the "drm/i915: add missing display power refs" patchset and this patch rebased on -fixes to
https://github.com/ideak/linux/commits/display_power_get_if_enabled-for-fixes
--Imre
Quoted 31 lines
BR,
Jani.Quoted 28 lines
---
drivers/gpu/drm/i915/intel_pm.c | 7 ++++++-1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -2851,7 +2851,10 @@ void skl_ddb_get_hw_state(structdrm_i915_private *dev_priv, memset(ddb, 0, sizeof(*ddb));
for_each_pipe(dev_priv, pipe){drivers/gpu/drm/i915/intel_pm.c +0
-1- if (!intel_display_power_is_enabled(dev_priv,
POWER_DOMAIN_PIPE(pipe)))drivers/gpu/drm/i915/intel_pm.c +4
-0+enum intel_display_power_domain power_domain; + + power_domain =POWER_DOMAIN_PIPE (pipe); + if (!intel_display_power_get_if_enabled(dev_priv,
power_domain))
continue;
for_each_plane(dev_priv, pipe, plane){drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -2863,6 +2866,8 @@ void skl_ddb_get_hw_state(structdrm_i915_private *dev_priv, val = I915_READ(CUR_BUF_CFG(pipe));skl_ddb_entry_init_from_hw(&ddb-
Quoted 7 lines
Quoted 6 lines
Quoted 1 line
plane[pipe][PLANE_CURSOR],
val);
drivers/gpu/drm/i915/intel_pm.c +2
-0+ +intel_display_power_put (dev_priv, power_domain);}
}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Imre Deak
The assumption when adding the
intel_display_power_is_enabled()checks was that if it returns success the power can't be turned off afterwards during the HW access, which is guaranteed by modeset locks. This isn't always true, so make sure we hold a dedicated reference for the time of the access.Spotted-by Mika Kuoppala <[email protected]>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93441
CC Chris Wilson <[email protected]>Signed-off-by Imre Deak <[email protected]>
Quoted 31 lines
--- drivers/gpu/drm/i915/intel_pm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_pm.c +6
-1@@ -2851,7 +2851,10 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv,memset (ddb,0 ,sizeof (*ddb));for_each_pipe (dev_priv, pipe) { -if (!intel_display_power_is_enabled (dev_priv,POWER_DOMAIN_PIPE (pipe))) +enum intel_display_power_domain power_domain; + + power_domain =POWER_DOMAIN_PIPE (pipe); +if (!intel_display_power_get_if_enabled (dev_priv, power_domain))continue ;for_each_plane (dev_priv, pipe, plane) {@@ -2863,6 +2866,8 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, val =I915_READ (CUR_BUF_CFG (pipe));skl_ddb_entry_init_from_hw (&ddb->plane[pipe][PLANE_CURSOR ], val); + +intel_display_power_put (dev_priv, power_domain); } }Signature · 1 line
2.5.0
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915/skl: Ensure HW is powered during DDB HW state readout
In reply to Imre Deak== Summary ==
== Summary ==
Series 3532v1 drm/i915/skl: Ensure HW is powered during DDB HW state readout
http://patchwork.freedesktop.org/api/1.0/series/3532/revisions/1/mbox/
Test drv_hangman:
Subgroup error-state-basic:
incomplete -> PASS (snb-dellxps)
Test kms_flip:
Subgroup basic-flip-vs-dpms:
dmesg-warn -> PASS (ilk-hp8440p) UNSTABLE
Subgroup basic-flip-vs-modeset:
pass -> DMESG-WARN (ilk-hp8440p) UNSTABLE
Test kms_force_connector_basic:
Subgroup force-load-detect:
skip -> FAIL (ilk-hp8440p)
Test pm_rpm:
Subgroup basic-rte:
pass -> DMESG-WARN (bsw-nuc-2)bdw-nuci7 total:162 pass:152 dwarn:0 dfail:0 fail:0 skip:10 bdw-ultra total:165 pass:152 dwarn:0 dfail:0 fail:0 skip:13 bsw-nuc-2 total:165 pass:134 dwarn:1 dfail:0 fail:1 skip:29 byt-nuc total:165 pass:141 dwarn:0 dfail:0 fail:0 skip:24 hsw-gt2 total:165 pass:154 dwarn:0 dfail:0 fail:1 skip:10 ilk-hp8440p total:165 pass:115 dwarn:1 dfail:0 fail:1 skip:48 ivb-t430s total:165 pass:150 dwarn:0 dfail:0 fail:1 skip:14 skl-i5k-2 total:165 pass:149 dwarn:1 dfail:0 fail:0 skip:15 snb-dellxps total:165 pass:142 dwarn:0 dfail:0 fail:1 skip:22 snb-x220t total:165 pass:142 dwarn:0 dfail:0 fail:2 skip:21
Results at /archive/results/CI_IGT_test/Patchwork_1426/
a868b844abfbce5f574665319f51d397416ae49b drm-intel-nightly: 2016y-02m-17d-14h-18m-14s UTC integration manifest c13931c633bfe7f522ffdd1c3b63378847863d49 drm/i915/skl: Ensure HW is powered during DDB HW state readout
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for drm/i915/skl: Ensure HW is powered during DDB HW state readout
Quoted 7 lines · Patchwork
== Summary ==
Series 3532v1 drm/i915/skl: Ensure HW is powered during DDB HW state readout
http://patchwork.freedesktop.org/api/1.0/series/3532/revisions/1/mbox
/
Quoted 8 lines
Test
drv_hangman:
Subgroup error-state-basic:
incomplete -> PASS (snb-dellxps) Testkms_flip:
Subgroup basic-flip-vs-dpms:
dmesg-warn -> PASS (ilk-hp8440p) UNSTABLE Subgroup basic-flip-vs-modeset:
pass -> DMESG-WARN (ilk-hp8440p) UNSTABLE
Clearly unrelated, since the patch is SKL specific.
Quoted 3 lines
Test
kms_force_connector_basic:
Subgroup force-load-detect:
skip -> FAIL (ilk-hp8440p)
The same as above.
Quoted 3 lines
Test
pm_rpm:
Subgroup basic-rte:
pass -> DMESG-WARN (bsw-nuc-2)
Ditto.
Quoted 30 lines
bdw-
nuci7 total:162 pass:152 dwarn:0 dfail:0 fail:0 skip:1 0
bdw-
ultra total:165 pass:152 dwarn:0 dfail:0 fail:0 skip:1 3
bsw-nuc-
2 total:165 pass:134 dwarn:1 dfail:0 fail:1 skip:29 byt-
nuc total:165 pass:141 dwarn:0 dfail:0 fail:0 skip:2 4
hsw-
gt2 total:165 pass:154 dwarn:0 dfail:0 fail:1 skip:1 0
ilk-
hp8440p total:165 pass:115 dwarn:1 dfail:0 fail:1 skip:4 8
ivb-
t430s total:165 pass:150 dwarn:0 dfail:0 fail:1 skip:1 4
skl-i5k-
2 total:165 pass:149 dwarn:1 dfail:0 fail:0 skip:15 snb-
dellxps total:165 pass:142 dwarn:0 dfail:0 fail:1 skip:2 2
snb-
x220t total:165 pass:142 dwarn:0 dfail:0 fail:2 skip:2 1
Quoted 7 lines
Results at /archive/results/CI_IGT_test/Patchwork_1426/
a868b844abfbce5f574665319f51d397416ae49bdrm-intel-nightly: 2016y- 02m-17d-14h-18m-14s UTC integration manifestc13931c633bfe7f522ffdd1c3b63378847863d49drm/i915/skl: Ensure HW is powered during DDB HW state readout
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Imre Deak
AppliedRe: ✗ Fi.CI.BAT: failure for drm/i915/skl: Ensure HW is powered during DDB HW state readout
Quoted 25 lines · Imre Deak
Quoted 9 lines · Patchwork
== Summary ==
Series 3532v1 drm/i915/skl: Ensure HW is powered during DDB HW state
readout
http://patchwork.freedesktop.org/api/1.0/series/3532/revisions/1/mb
ox
/Quoted 8 lines
Test
drv_hangman:
Subgroup error-state-basic:
incomplete -> PASS (snb-dellxps) Testkms_flip:
Subgroup basic-flip-vs-dpms:
dmesg-warn -> PASS (ilk-hp8440p) UNSTABLE Subgroup basic-flip-vs-modeset:
pass -> DMESG-WARN (ilk-hp8440p) UNSTABLEClearly unrelated, since the patch is SKL specific.
Quoted 3 lines
Test
kms_force_connector_basic:
Subgroup force-load-detect:
skip -> FAIL (ilk-hp8440p)
Quoted 7 lines
The same as above.
Quoted 3 lines
Test
pm_rpm:
Subgroup basic-rte:
pass -> DMESG-WARN (bsw-nuc-2)Ditto.
Pushed to -dinq, thanks for the review.
Quoted 46 lines
Quoted 39 lines
bdw-
nuci7 total:162 pass:152 dwarn:0 dfail:0 fail:0 skip :1
0
bdw-
ultra total:165 pass:152 dwarn:0 dfail:0 fail:0 skip :1
3
bsw-nuc-
2 total:165 pass:134 dwarn:1 dfail:0 fail:1 skip:29 byt-
nuc total:165 pass:141 dwarn:0 dfail:0 fail:0 skip :2
4
hsw-
gt2 total:165 pass:154 dwarn:0 dfail:0 fail:1 skip :1
0
ilk-
hp8440p total:165 pass:115 dwarn:1 dfail:0 fail:1 skip :4
8
ivb-
t430s total:165 pass:150 dwarn:0 dfail:0 fail:1 skip :1
4
skl-i5k-
2 total:165 pass:149 dwarn:1 dfail:0 fail:0 skip:15 snb-
dellxps total:165 pass:142 dwarn:0 dfail:0 fail:1 skip :2
2
snb-
x220t total:165 pass:142 dwarn:0 dfail:0 fail:2 skip :2
1Quoted 7 lines
Results at /archive/results/CI_IGT_test/Patchwork_1426/
a868b844abfbce5f574665319f51d397416ae49bdrm-intel-nightly: 2016y- 02m-17d-14h-18m-14s UTC integration manifestc13931c633bfe7f522ffdd1c3b63378847863d49drm/i915/skl: Ensure HW is powered during DDB HW state readout
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx