drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
Subsystems (2)
PATCH 1/1 drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
Moving the check upwards will mean we we no longer have to add planes and connectors manually, because everything is handled correctly by drm_atomic_helper_check_modeset() as intended.
--- drivers/gpu/drm/i915/intel_display.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_display.c +5 -15
@@ -11927,6 +11927,11 @@ static int intel_atomic_check(struct drm_device *dev,int ret, i;bool any_ms = false; +/* Catch I915_MODE_FLAG_INHERITED */ +for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, crtc_state, i) +if (crtc_state->mode.private_flags != old_crtc_state->mode.private_flags) + crtc_state->mode_changed = true; + ret =drm_atomic_helper_check_modeset (dev, state);if (ret)return ret;
@@ -11935,10 +11940,6 @@ static int intel_atomic_check(struct drm_device *dev,struct intel_crtc_state *pipe_config =to_intel_crtc_state (crtc_state); -/* Catch I915_MODE_FLAG_INHERITED */ -if (crtc_state->mode.private_flags != old_crtc_state->mode.private_flags) - crtc_state->mode_changed = true; -if (!needs_modeset (crtc_state))continue ;
@@ -11947,13 +11948,6 @@ static int intel_atomic_check(struct drm_device *dev,continue ; } -/* FIXME: For only active_changed we shouldn't need to do any -* state recomputation at all. */ - - ret =drm_atomic_add_affected_connectors (state, crtc); -if (ret) -return ret; - ret =intel_modeset_pipe_config (crtc, pipe_config);if (ret) { intel_dump_pipe_config(to_intel_crtc(crtc),
@@ -11972,10 +11966,6 @@ static int intel_atomic_check(struct drm_device *dev,if (needs_modeset (crtc_state)) any_ms = true; - ret =drm_atomic_add_affected_planes (state, crtc); -if (ret) -return ret; -intel_dump_pipe_config (to_intel_crtc (crtc), pipe_config,needs_modeset (crtc_state) ?"[modeset]" :"[fastset]" );
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
== Series Details ==
== Series Details ==
Series: drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
URL : https://patchwork.freedesktop.org/series/38678/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip a339d719bb21 drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset -:25: WARNING: line over 80 characters #25: FILE: drivers/gpu/drm/i915/intel_display.c:12036: + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, crtc_state, i)
-:26: WARNING: line over 80 characters
#26: FILE: drivers/gpu/drm/i915/intel_display.c:12037:
+ if (crtc_state->mode.private_flags != old_crtc_state->mode.private_flags)
total: 0 errors, 2 warnings, 0 checks, 44 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
URL : https://patchwork.freedesktop.org/series/38678/
State : failure
== Summary ==
Series 38678v1 drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
https://patchwork.freedesktop.org/api/1.0/series/38678/revisions/1/mbox/
Test kms_chamelium:
Subgroup dp-crc-fast:
pass -> DMESG-WARN (fi-kbl-7500u) fdo#103841
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-a:
pass -> FAIL (fi-skl-6700k2)
Test prime_vgem:
Subgroup basic-fence-flip:
pass -> FAIL (fi-ilk-650) fdo#104008fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:418s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:424s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:375s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:491s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:286s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:475s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:485s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:468s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:458s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:565s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:415s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:284s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:508s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:385s fi-ilk-650 total:288 pass:227 dwarn:0 dfail:0 fail:1 skip:60 time:412s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:454s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:413s fi-kbl-7500u total:288 pass:262 dwarn:2 dfail:0 fail:0 skip:24 time:454s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:491s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:447s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:499s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:591s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:425s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:503s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:524s fi-skl-6700k2 total:288 pass:263 dwarn:0 dfail:0 fail:1 skip:24 time:490s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:487s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:410s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:430s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:515s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:392s
75f20d94e9a1fdc486867a8f5bebe433b119f531 drm-tip: 2018y-02m-21d-07h-35m-14s UTC integration manifest a339d719bb21 drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8098/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
URL : https://patchwork.freedesktop.org/series/38678/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 2914152024df drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset -:25: WARNING: line over 80 characters #25: FILE: drivers/gpu/drm/i915/intel_display.c:12036: + for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, crtc_state, i)
-:26: WARNING: line over 80 characters
#26: FILE: drivers/gpu/drm/i915/intel_display.c:12037:
+ if (crtc_state->mode.private_flags != old_crtc_state->mode.private_flags)
total: 0 errors, 2 warnings, 0 checks, 44 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
URL : https://patchwork.freedesktop.org/series/38678/
State : warning
== Summary ==
Series 38678v1 drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
https://patchwork.freedesktop.org/api/1.0/series/38678/revisions/1/mbox/
Test kms_chamelium:
Subgroup common-hpd-after-suspend:
pass -> DMESG-WARN (fi-skl-6700k2)fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:412s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:427s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:372s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:482s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:283s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:480s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:464s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:453s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:562s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:410s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:283s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:504s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:389s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:416s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:448s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:408s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:451s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:492s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:452s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:491s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:584s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:425s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:498s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:520s fi-skl-6700k2 total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:487s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:473s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:405s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:425s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:521s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:389s
75f20d94e9a1fdc486867a8f5bebe433b119f531 drm-tip: 2018y-02m-21d-07h-35m-14s UTC integration manifest 2914152024df drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8102/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Nice, this is a no-brainer
Quoted 73 lines · Maarten Lankhorst
Moving the check upwards will mean we we no longer have to add planes and connectors manually, because everything is handled correctly by
drm_atomic_helper_check_modeset()as intended.Signed-off-by Maarten Lankhorst <[email protected]>Cc Lyude Paul <[email protected]>Cc Daniel Vetter <[email protected]>Reviewed-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/intel_display.c +5
-0@@ -11927,6 +11927,11 @@ static int intel_atomic_check(struct drm_device *dev, int ret, i;bool any_ms = false; +/* Catch I915_MODE_FLAG_INHERITED */ +for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, crtc_state, i) +if (crtc_state->mode.private_flags != old_crtc_state- >mode.private_flags) + crtc_state->mode_changed = true; +drivers/gpu/drm/i915/intel_display.c +0
-4ret =drm_atomic_helper_check_modeset (dev, state);if (ret)return ret;@@ -11935,10 +11940,6 @@ static int intel_atomic_check(struct drm_device *dev, struct intel_crtc_state *pipe_config =to_intel_crtc_state (crtc_state); -/* Catch I915_MODE_FLAG_INHERITED */ -if (crtc_state->mode.private_flags != old_crtc_state- >mode.private_flags) - crtc_state->mode_changed = true; -if (!needs_modeset (crtc_state))drivers/gpu/drm/i915/intel_display.c +0
-1continue ;@@ -11947,13 +11948,6 @@ static int intel_atomic_check(struct drm_device *dev, continue; } -/* FIXME: For only active_changed we shouldn't need to do any
drivers/gpu/drm/i915/intel_display.c +0
-10-* state recomputation at all. */ - - ret =drm_atomic_add_affected_connectors (state, crtc); -if (ret) -return ret; - ret =intel_modeset_pipe_config (crtc, pipe_config);if (ret) { intel_dump_pipe_config(to_intel_crtc(crtc),@@ -11972,10 +11966,6 @@ static int intel_atomic_check(struct drm_device *dev, if (needs_modeset(crtc_state)) any_ms = true; - ret =drm_atomic_add_affected_planes (state, crtc); -if (ret) -return ret; - intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config, needs_modeset(crtc_state) ?"[modeset]" : "[fastset]");
Signature · 6 lines
Cheers, Lyude Paul _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Pushed with some small whitespace changes to make sparse happy, thanks!
Quoted 73 lines · Maarten Lankhorst
Moving the check upwards will mean we we no longer have to add planes and connectors manually, because everything is handled correctly by
drm_atomic_helper_check_modeset()as intended.Signed-off-by Maarten Lankhorst <[email protected]>Cc Lyude Paul <[email protected]>Cc Daniel Vetter <[email protected]>Reviewed-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/intel_display.c +5
-0@@ -11927,6 +11927,11 @@ static int intel_atomic_check(struct drm_device *dev, int ret, i;bool any_ms = false; +/* Catch I915_MODE_FLAG_INHERITED */ +for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, crtc_state, i) +if (crtc_state->mode.private_flags != old_crtc_state- >mode.private_flags) + crtc_state->mode_changed = true; +drivers/gpu/drm/i915/intel_display.c +0
-4ret =drm_atomic_helper_check_modeset (dev, state);if (ret)return ret;@@ -11935,10 +11940,6 @@ static int intel_atomic_check(struct drm_device *dev, struct intel_crtc_state *pipe_config =to_intel_crtc_state (crtc_state); -/* Catch I915_MODE_FLAG_INHERITED */ -if (crtc_state->mode.private_flags != old_crtc_state- >mode.private_flags) - crtc_state->mode_changed = true; -if (!needs_modeset (crtc_state))drivers/gpu/drm/i915/intel_display.c +0
-1continue ;@@ -11947,13 +11948,6 @@ static int intel_atomic_check(struct drm_device *dev, continue; } -/* FIXME: For only active_changed we shouldn't need to do any
drivers/gpu/drm/i915/intel_display.c +0
-10-* state recomputation at all. */ - - ret =drm_atomic_add_affected_connectors (state, crtc); -if (ret) -return ret; - ret =intel_modeset_pipe_config (crtc, pipe_config);if (ret) { intel_dump_pipe_config(to_intel_crtc(crtc),@@ -11972,10 +11966,6 @@ static int intel_atomic_check(struct drm_device *dev, if (needs_modeset(crtc_state)) any_ms = true; - ret =drm_atomic_add_affected_planes (state, crtc); -if (ret) -return ret; - intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config, needs_modeset(crtc_state) ?"[modeset]" : "[fastset]");
Signature · 6 lines
Cheers, Lyude Paul _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 1 line · Lyude Paul
Pushed with some small whitespace changes to make sparse happy, thanks!
Please do not push patches before they've passed CI. This patch gives [1]:
[ 281.167033] i915 0000:00:02.0: DP-2: EDID is invalid: ... [ 282.806393] [drm:intel_enable_shared_dpll [i915]] *ERROR* DPLL 1 not locked
I don't know if this is caused by the patch, but since we get this in the BAT round, the full IGT testing wasn't even run here.
BR,
Jani.
[1] https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8102/fi-skl-6700k2/igt@[email protected]
Quoted 75 lines · Maarten Lankhorst
Quoted 73 lines
Moving the check upwards will mean we we no longer have to add planes and connectors manually, because everything is handled correctly by
drm_atomic_helper_check_modeset()as intended.Signed-off-by Maarten Lankhorst <[email protected]>Cc Lyude Paul <[email protected]>Cc Daniel Vetter <[email protected]>Reviewed-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/intel_display.c +5
-0@@ -11927,6 +11927,11 @@ static int intel_atomic_check(struct drm_device *dev, int ret, i;bool any_ms = false; +/* Catch I915_MODE_FLAG_INHERITED */ +for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, crtc_state, i) +if (crtc_state->mode.private_flags != old_crtc_state- >mode.private_flags) + crtc_state->mode_changed = true; +drivers/gpu/drm/i915/intel_display.c +0
-4ret =drm_atomic_helper_check_modeset (dev, state);if (ret)return ret;@@ -11935,10 +11940,6 @@ static int intel_atomic_check(struct drm_device *dev, struct intel_crtc_state *pipe_config =to_intel_crtc_state (crtc_state); -/* Catch I915_MODE_FLAG_INHERITED */ -if (crtc_state->mode.private_flags != old_crtc_state- >mode.private_flags) - crtc_state->mode_changed = true; -if (!needs_modeset (crtc_state))drivers/gpu/drm/i915/intel_display.c +0
-1continue ;@@ -11947,13 +11948,6 @@ static int intel_atomic_check(struct drm_device *dev, continue; } -/* FIXME: For only active_changed we shouldn't need to do any
drivers/gpu/drm/i915/intel_display.c +0
-10-* state recomputation at all. */ - - ret =drm_atomic_add_affected_connectors (state, crtc); -if (ret) -return ret; - ret =intel_modeset_pipe_config (crtc, pipe_config);if (ret) { intel_dump_pipe_config(to_intel_crtc(crtc),@@ -11972,10 +11966,6 @@ static int intel_atomic_check(struct drm_device *dev, if (needs_modeset(crtc_state)) any_ms = true; - ret =drm_atomic_add_affected_planes (state, crtc); -if (ret) -return ret; - intel_dump_pipe_config(to_intel_crtc(crtc), pipe_config, needs_modeset(crtc_state) ?"[modeset]" : "[fastset]");
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
There is no open cibuglog bug for below issue. However, if a developer believe that patch didn't cause the issue, they can just mail or ping me on IRC and I'll create a cibuglog issue and FDO bug to cover it.
In developers we trust.
/Marta
Quoted 117 lines
-----Original Message-----
From: Jani Nikula [mailto:[email protected]]
Sent: Friday, March 2, 2018 11:37 AM
To: Lyude Paul <[email protected]>; Maarten Lankhorst <[email protected]>; [email protected]
Cc: Daniel Vetter <[email protected]>; Lofstedt, Marta <[email protected]>; Hiler, Arkadiusz <[email protected]>; Sarvela, Tomi P <[email protected]>; Martin Peres <[email protected]>
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Check forI915_MODE_FLAG_INHERITEDbeforedrm_atomic_helper_check_modesetQuoted 1 line · Lyude Paul
Pushed with some small whitespace changes to make sparse happy,
thanks!
Please do not push patches before they've passed CI. This patch gives [1]:
[ 281.167033] i915 0000:00:02.0: DP-2: EDID is invalid: ... [ 282.806393] [drm:intel_enable_shared_dpll [i915]] *ERROR* DPLL 1 notlocked
I don't know if this is caused by the patch, but since we get this in the BAT round, the full IGT testing wasn't even run here.
BR,
Jani.[1] https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8102/fi-skl-
6700k2/igt@[email protected]Quoted 24 lines · Maarten Lankhorst
Quoted 22 lines
Moving the check upwards will mean we we no longer have to add planes and connectors manually, because everything is handled correctly by
drm_atomic_helper_check_modeset()as intended.Signed-off-by Maarten Lankhorst <[email protected]>Cc Lyude Paul <[email protected]>Cc Daniel Vetter <[email protected]>Reviewed-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-0@@ -11927,6 +11927,11 @@ static int intel_atomic_check(structdrm_device *dev, int ret, i;bool any_ms = false;Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c static int intel_atomic_check(struct · line 11934
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +3
-0+/* Catch I915_MODE_FLAG_INHERITED */ +for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, crtc_state, i) + if (crtc_state->mode.private_flags !=old_crtc_state-
Quoted 2 lines
drivers/gpu/drm/i915/intel_display.c static int intel_atomic_check(struct · line 11936
Quoted 2 lines
drivers/gpu/drm/i915/intel_display.c +1
-0>mode.private_flags) + crtc_state->mode_changed =true;
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c static int intel_atomic_check(struct · line 11940
Quoted 11 lines
drivers/gpu/drm/i915/intel_display.c +1
-0+drivers/gpu/drm/i915/intel_display.c +0
-2ret =drm_atomic_helper_check_modeset (dev, state);if (ret)return ret;@@ -11935,10 +11940,6 @@ static int intel_atomic_check(structdrm_device *dev, struct intel_crtc_state *pipe_config =to_intel_crtc_state (crtc_state); -/* Catch I915_MODE_FLAG_INHERITED */ - if (crtc_state->mode.private_flags !=old_crtc_state-
Quoted 2 lines
drivers/gpu/drm/i915/intel_display.c static int intel_atomic_check(struct · line 11942
Quoted 2 lines
drivers/gpu/drm/i915/intel_display.c +0
-1>mode.private_flags) - crtc_state->mode_changed =true;
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c static int intel_atomic_check(struct · line 11951
Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +0
-1-if (!needs_modeset (crtc_state))drivers/gpu/drm/i915/intel_display.c +0
-1continue ;@@ -11947,13 +11948,6 @@ static int intel_atomic_check(structdrm_device *dev, continue; } -/* FIXME: For only active_changed we shouldn't need to do
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c static int intel_atomic_check(struct drm_device *dev,
Quoted 4 lines
any
drivers/gpu/drm/i915/intel_display.c +0
-3-* state recomputation at all. */ - - ret =
drm_atomic_add_affected_connectors(state, crtc);Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c static int intel_atomic_check(struct drm_device *dev,
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +0
-3-if (ret) -return ret; - ret = intel_modeset_pipe_config(crtc,
pipe_config);Quoted 2 lines
Quoted 2 lines
if (ret) {
intel_dump_pipe_config(to_intel_crtc(crtc),
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c static int intel_atomic_check(struct · line 11976
Quoted 6 lines
drivers/gpu/drm/i915/intel_display.c +0
-1@@ -11972,10 +11966,6 @@ static int intel_atomic_check(structdrm_device *dev, if (needs_modeset(crtc_state)) any_ms = true; - ret = drm_atomic_add_affected_planes(state,crtc);
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 11953
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +0
-3-if (ret) -return ret; - intel_dump_pipe_config(to_intel_crtc(crtc),
pipe_config,Quoted 1 line
Quoted 1 line
Quoted 6 lines
needs_modeset(crtc_state)?Quoted 1 line
Quoted 1 line
"[modeset]" :
"[fastset]");
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
URL : https://patchwork.freedesktop.org/series/38678/
State : failure
== Summary ==
Applying: drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/intel_display.c).
error: could not build fake ancestor
Patch failed at 0001 drm/i915: Check for I915_MODE_FLAG_INHERITED before drm_atomic_helper_check_modeset The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8102/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx