drm/i915: Calculate ironlake intermediate watermarks correctly
Subsystems (2)
PATCH 1/2 drm/i915: Calculate ironlake intermediate watermarks correctly
The watermarks it should calculate against are the old optimal watermarks. The currently active crtc watermarks are pure fiction, and are invalid in case of a nonblocking modeset, page flip enabling/disabling planes or any other reason.
When the crtc is disabled or during a modeset the intermediate watermarks don't need to be programmed separately, and could be directly assigned to the optimal watermarks.
--- drivers/gpu/drm/i915/intel_pm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +6 -1
@@ -2639,7 +2639,9 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev, struct intel_crtc_state *newstate) {struct intel_pipe_wm *a = &newstate->wm.ilk.intermediate; -struct intel_pipe_wm *b = &intel_crtc->wm.active.ilk; +const struct drm_crtc_state *old_drm_state = +drm_atomic_get_old_crtc_state (newstate->base.state, &intel_crtc->base); +const struct intel_pipe_wm *b = &to_intel_crtc_state (old_drm_state)->wm.ilk.optimal;int level, max_level =ilk_wm_max_level (to_i915 (dev));/*
@@ -2648,6 +2650,9 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev,* and after the vblank. */ *a = newstate->wm.ilk.optimal; +if (!newstate->base.active ||drm_atomic_crtc_needs_modeset (&newstate->base)) +return 0 ; + a->pipe_enabled |= b->pipe_enabled; a->sprites_enabled |= b->sprites_enabled; a->sprites_scaled |= b->sprites_scaled;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Calculate vlv/chv intermediate watermarks correctly
The watermarks it should calculate against are the old optimal watermarks. The currently active crtc watermarks are pure fiction, and are invalid in case of a nonblocking modeset, page flip enabling/disabling planes or any other reason.
When the crtc is disabled or during a modeset the intermediate watermarks don't need to be programmed separately, and could be directly assigned to the optimal watermarks.
Also rename crtc_state to new_crtc_state, to distinguish it from the old state.
--- drivers/gpu/drm/i915/intel_pm.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +14 -6
@@ -1458,16 +1458,24 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,static int vlv_compute_intermediate_wm (struct drm_device *dev,struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state) +struct intel_crtc_state *new_crtc_state) { -struct vlv_wm_state *intermediate = &crtc_state->wm.vlv.intermediate; -const struct vlv_wm_state *optimal = &crtc_state->wm.vlv.optimal; -const struct vlv_wm_state *active = &crtc->wm.active.vlv; +struct vlv_wm_state *intermediate = &new_crtc_state->wm.vlv.intermediate; +const struct vlv_wm_state *optimal = &new_crtc_state->wm.vlv.optimal; +const struct drm_crtc_state *old_drm_crtc_state = +drm_atomic_get_old_crtc_state (new_crtc_state->base.state, &crtc->base); +const struct vlv_wm_state *active = &to_intel_crtc_state (old_drm_crtc_state)->wm.vlv.optimal;int level; +if (!new_crtc_state->base.active ||drm_atomic_crtc_needs_modeset (&new_crtc_state->base)) { + *intermediate = *optimal; + +return 0 ; + } + intermediate->num_levels =min (optimal->num_levels, active->num_levels); intermediate->cxsr = optimal->cxsr && active->cxsr && - !crtc_state->disable_cxsr; + !new_crtc_state->disable_cxsr;for (level =0 ; level < intermediate->num_levels; level++) {enum plane_id plane_id;
@@ -1491,7 +1499,7 @@ static int vlv_compute_intermediate_wm(struct drm_device *dev,* omit the post-vblank programming; only update if it's different. */ if (memcmp (intermediate, optimal,sizeof (*intermediate)) !=0 ) - crtc_state->wm.need_postvbl_update = true; + new_crtc_state->wm.need_postvbl_update = true;return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Calculate ironlake intermediate watermarks correctly
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Calculate ironlake intermediate watermarks correctly
URL : https://patchwork.freedesktop.org/series/23444/
State : success
== Summary ==
Series 23444v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/23444/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:430s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:428s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:577s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:508s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:486s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:478s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:412s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:403s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:427s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:486s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:483s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:457s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:567s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:458s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:573s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:464s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:495s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:433s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:528s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:405s
fi-bxt-t5700 failed to collect. IGT log at Patchwork_4535/fi-bxt-t5700/igt.log
bc781a3cf9a80e4c5ed0d47fd0c67923bcfcdf2c drm-tip: 2017y-04m-22d-08h-49m-55s UTC integration manifest ecb65dc drm/i915: Calculate vlv/chv intermediate watermarks correctly
99ba5c6 drm/i915: Calculate ironlake intermediate watermarks correctly
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4535/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 20 lines · Maarten Lankhorst
The watermarks it should calculate against are the old optimal watermarks. The currently active crtc watermarks are pure fiction, and are invalid in case of a nonblocking modeset, page flip enabling/disabling planes or any other reason.
When the crtc is disabled or during a modeset the intermediate watermarks don't need to be programmed separately, and could be directly assigned to the optimal watermarks.
Signed-off-by Maarten Lankhorst <[email protected]>Cc Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c static int ilk_compute_intermediate_wm(struct drm_device *dev, · line 2643
Quoted 6 lines
drivers/gpu/drm/i915/intel_pm.c +2
-1@@ -2639,7 +2639,9 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev, struct intel_crtc_state *newstate) {struct intel_pipe_wm *a = &newstate->wm.ilk.intermediate; -struct intel_pipe_wm *b = &intel_crtc->wm.active.ilk; +const struct drm_crtc_state *old_drm_state = +drm_atomic_get_old_crtc_state (newstate->base.state, &intel_crtc->base);
Can we get a intel_atomic_get_old_crtc_state() please?
Quoted 16 lines
drivers/gpu/drm/i915/intel_pm.c +4
-0+const struct intel_pipe_wm *b = &to_intel_crtc_state (old_drm_state)->wm.ilk.optimal;int level, max_level =ilk_wm_max_level (to_i915 (dev));/* @@ -2648,6 +2650,9 @@ static int ilk_compute_intermediate_wm(struct drm_device *dev,* and after the vblank. */ *a = newstate->wm.ilk.optimal; +if (!newstate->base.active ||drm_atomic_crtc_needs_modeset (&newstate->base)) +return 0 ; + a->pipe_enabled |= b->pipe_enabled; a->sprites_enabled |= b->sprites_enabled; a->sprites_scaled |= b->sprites_scaled;Signature · 1 line
2.7.4
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx