* [PATCH] drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm()
@ 2018-11-08 15:10 Ville Syrjala
2018-11-08 16:39 ` ✗ Fi.CI.BAT: failure for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ville Syrjala @ 2018-11-08 15:10 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
No point in cluttering the common codepaths with the
skip_intermediate_wm handling. Just move it into
ilk_compute_intermediate_wm() as those are the only
platforms using this.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 7 +------
drivers/gpu/drm/i915/intel_pm.c | 3 ++-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 71b7bff85e52..00e775f22a45 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10817,7 +10817,6 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
struct intel_crtc_state *pipe_config =
to_intel_crtc_state(crtc_state);
- struct drm_atomic_state *state = crtc_state->state;
int ret;
bool mode_changed = needs_modeset(crtc_state);
@@ -10854,8 +10853,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
}
}
- if (dev_priv->display.compute_intermediate_wm &&
- !to_intel_atomic_state(state)->skip_intermediate_wm) {
+ if (dev_priv->display.compute_intermediate_wm) {
if (WARN_ON(!dev_priv->display.compute_pipe_wm))
return 0;
@@ -10871,9 +10869,6 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
DRM_DEBUG_KMS("No valid intermediate pipe watermarks are possible\n");
return ret;
}
- } else if (dev_priv->display.compute_intermediate_wm) {
- if (HAS_PCH_SPLIT(dev_priv) && INTEL_GEN(dev_priv) < 9)
- pipe_config->wm.ilk.intermediate = pipe_config->wm.ilk.optimal;
}
if (INTEL_GEN(dev_priv) >= 9) {
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 9da8ff263d36..2b57e360c043 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3159,7 +3159,8 @@ 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))
+ if (!newstate->base.active || drm_atomic_crtc_needs_modeset(&newstate->base) ||
+ intel_state->skip_intermediate_wm)
return 0;
a->pipe_enabled |= b->pipe_enabled;
--
2.18.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: failure for drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm()
2018-11-08 15:10 [PATCH] drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm() Ville Syrjala
@ 2018-11-08 16:39 ` Patchwork
2018-11-09 19:17 ` ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-11-08 16:39 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm()
URL : https://patchwork.freedesktop.org/series/52248/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_5105 -> Patchwork_10777 =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_10777 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_10777, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/52248/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10777:
=== IGT changes ===
==== Possible regressions ====
igt@drv_selftest@live_hangcheck:
fi-skl-6700k2: PASS -> INCOMPLETE
==== Warnings ====
igt@pm_rpm@basic-rte:
fi-kbl-7567u: SKIP -> PASS +4
== Known issues ==
Here are the changes found in Patchwork_10777 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_hangcheck:
fi-kbl-7560u: PASS -> INCOMPLETE (fdo#108044)
igt@gem_exec_suspend@basic-s3:
fi-blb-e6850: PASS -> INCOMPLETE (fdo#107718)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-byt-clapper: PASS -> FAIL (fdo#107362, fdo#103191)
==== Possible fixes ====
igt@drv_module_reload@basic-reload-inject:
fi-kbl-7567u: DMESG-WARN (fdo#105602, fdo#108529) -> PASS +1
igt@gem_ctx_create@basic-files:
fi-icl-u2: DMESG-WARN (fdo#107724) -> PASS
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b-frame-sequence:
fi-byt-clapper: FAIL (fdo#107362, fdo#103191) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-kbl-7567u: DMESG-FAIL (fdo#105079) -> PASS
igt@pm_rpm@module-reload:
fi-kbl-7567u: DMESG-WARN (fdo#108529) -> PASS
==== Warnings ====
igt@kms_chamelium@common-hpd-after-suspend:
fi-skl-6700k2: FAIL (fdo#103841) -> WARN (fdo#108680)
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#105079 https://bugs.freedesktop.org/show_bug.cgi?id=105079
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#107724 https://bugs.freedesktop.org/show_bug.cgi?id=107724
fdo#108044 https://bugs.freedesktop.org/show_bug.cgi?id=108044
fdo#108529 https://bugs.freedesktop.org/show_bug.cgi?id=108529
fdo#108680 https://bugs.freedesktop.org/show_bug.cgi?id=108680
== Participating hosts (51 -> 47) ==
Additional (2): fi-byt-j1900 fi-glk-dsi
Missing (6): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-snb-2520m
== Build changes ==
* Linux: CI_DRM_5105 -> Patchwork_10777
CI_DRM_5105: e44a1cc644d1719d195bd0afb9e319ae555059e1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4712: a3ede1b535ac8137f6949c468edd7054453d5dae @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10777: c1295490941055863001b55f77315bc400ca20b5 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
c12954909410 drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10777/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
* ✓ Fi.CI.BAT: success for drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm()
2018-11-08 15:10 [PATCH] drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm() Ville Syrjala
2018-11-08 16:39 ` ✗ Fi.CI.BAT: failure for " Patchwork
@ 2018-11-09 19:17 ` Patchwork
2018-11-10 5:16 ` ✓ Fi.CI.IGT: " Patchwork
2018-11-13 16:00 ` [PATCH] " Ville Syrjälä
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-11-09 19:17 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm()
URL : https://patchwork.freedesktop.org/series/52248/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5116 -> Patchwork_10799 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10799 need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_10799, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/52248/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10799:
=== IGT changes ===
==== Warnings ====
igt@drv_selftest@live_guc:
fi-skl-iommu: SKIP -> PASS +1
== Known issues ==
Here are the changes found in Patchwork_10799 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_module_reload@basic-reload:
fi-blb-e6850: PASS -> INCOMPLETE (fdo#107718)
igt@gem_mmap_gtt@basic-copy:
fi-glk-dsi: PASS -> INCOMPLETE (k.org#198133, fdo#103359)
igt@kms_flip@basic-flip-vs-modeset:
fi-hsw-4770r: PASS -> DMESG-WARN (fdo#105602)
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c:
fi-skl-6700k2: PASS -> FAIL (fdo#103191, fdo#107362)
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
fi-skl-iommu: INCOMPLETE (fdo#108602) -> PASS
igt@drv_selftest@live_hugepages:
fi-skl-6700k2: INCOMPLETE -> PASS
igt@kms_chamelium@common-hpd-after-suspend:
fi-skl-6700k2: TIMEOUT -> PASS
igt@kms_flip@basic-plain-flip:
fi-ilk-650: DMESG-WARN (fdo#106387) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-byt-clapper: FAIL (fdo#103191, fdo#107362) -> PASS
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#106387 https://bugs.freedesktop.org/show_bug.cgi?id=106387
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#108602 https://bugs.freedesktop.org/show_bug.cgi?id=108602
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (51 -> 45) ==
Additional (1): fi-glk-j4005
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-icl-u2 fi-bsw-cyan fi-ctg-p8600 fi-icl-u
== Build changes ==
* Linux: CI_DRM_5116 -> Patchwork_10799
CI_DRM_5116: ade66f7f60026c1c7e68a12ce07d5d4000afce13 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4714: cab148ca3ec904a94d0cd43476cf7e1f8663f906 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10799: dd7ebb2e178a08e8095841db8d5c1a97943e68ed @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
dd7ebb2e178a drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10799/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
* ✓ Fi.CI.IGT: success for drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm()
2018-11-08 15:10 [PATCH] drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm() Ville Syrjala
2018-11-08 16:39 ` ✗ Fi.CI.BAT: failure for " Patchwork
2018-11-09 19:17 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2018-11-10 5:16 ` Patchwork
2018-11-13 16:00 ` [PATCH] " Ville Syrjälä
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-11-10 5:16 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm()
URL : https://patchwork.freedesktop.org/series/52248/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5116_full -> Patchwork_10799_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_10799_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_10799_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_10799_full:
=== IGT changes ===
==== Warnings ====
igt@kms_atomic_interruptible@universal-setplane-cursor:
shard-snb: SKIP -> PASS +2
igt@perf_pmu@rc6:
shard-kbl: SKIP -> PASS
== Known issues ==
Here are the changes found in Patchwork_10799_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_ctx_isolation@rcs0-s3:
shard-skl: PASS -> INCOMPLETE (fdo#107773, fdo#104108)
igt@gem_exec_schedule@pi-ringfull-blt:
shard-skl: NOTRUN -> FAIL (fdo#103158)
igt@kms_atomic_transition@1x-modeset-transitions-nonblocking:
shard-skl: NOTRUN -> FAIL (fdo#108228, fdo#108470)
igt@kms_available_modes_crc@available_mode_test_crc:
shard-snb: NOTRUN -> FAIL (fdo#106641)
igt@kms_busy@extended-modeset-hang-newfb-render-a:
shard-snb: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_busy@extended-modeset-hang-newfb-render-c:
shard-skl: NOTRUN -> DMESG-WARN (fdo#107956) +2
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
shard-kbl: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-c:
shard-glk: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_cursor_crc@cursor-64x21-sliding:
shard-skl: NOTRUN -> FAIL (fdo#103232) +1
igt@kms_frontbuffer_tracking@fbc-1p-pri-indfb-multidraw:
shard-skl: NOTRUN -> FAIL (fdo#105682) +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite:
shard-apl: PASS -> FAIL (fdo#103167) +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
shard-glk: PASS -> FAIL (fdo#103167)
igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-fullscreen:
shard-skl: NOTRUN -> FAIL (fdo#103167) +2
igt@kms_plane@pixel-format-pipe-b-planes:
shard-skl: NOTRUN -> DMESG-WARN (fdo#106885) +2
igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
shard-skl: NOTRUN -> FAIL (fdo#108145, fdo#107815) +1
igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
shard-glk: NOTRUN -> FAIL (fdo#108145)
igt@kms_plane_alpha_blend@pipe-b-alpha-transparant-fb:
shard-skl: NOTRUN -> FAIL (fdo#108145) +1
igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
shard-glk: PASS -> FAIL (fdo#103166) +1
shard-apl: PASS -> FAIL (fdo#103166)
igt@kms_rotation_crc@primary-rotation-90:
shard-skl: NOTRUN -> FAIL (fdo#103925, fdo#107815)
igt@kms_setmode@basic:
shard-snb: NOTRUN -> FAIL (fdo#99912)
igt@pm_rpm@dpms-mode-unset-lpsp:
shard-skl: NOTRUN -> INCOMPLETE (fdo#107807)
==== Possible fixes ====
igt@gem_cpu_reloc@full:
shard-skl: INCOMPLETE (fdo#108073) -> PASS
igt@gem_ppgtt@blt-vs-render-ctx0:
shard-kbl: INCOMPLETE (fdo#106887, fdo#106023, fdo#103665) -> PASS
igt@kms_cursor_crc@cursor-64x64-suspend:
shard-skl: INCOMPLETE (fdo#104108) -> PASS +1
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-glk: FAIL (fdo#105363) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-cpu:
shard-apl: FAIL (fdo#103167) -> PASS +2
igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render:
shard-glk: FAIL (fdo#103167) -> PASS
igt@kms_plane@plane-panning-bottom-right-pipe-b-planes:
shard-skl: FAIL (fdo#103166) -> PASS
igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max:
shard-glk: FAIL (fdo#108145) -> PASS
igt@kms_setmode@basic:
shard-kbl: FAIL (fdo#99912) -> PASS
igt@perf@blocking:
shard-hsw: FAIL (fdo#102252) -> PASS
igt@pm_rpm@cursor-dpms:
shard-skl: INCOMPLETE (fdo#107807) -> PASS +2
igt@pm_rpm@modeset-non-lpsp-stress-no-wait:
shard-skl: INCOMPLETE (fdo#107807) -> SKIP
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
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#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105682 https://bugs.freedesktop.org/show_bug.cgi?id=105682
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106641 https://bugs.freedesktop.org/show_bug.cgi?id=106641
fdo#106885 https://bugs.freedesktop.org/show_bug.cgi?id=106885
fdo#106887 https://bugs.freedesktop.org/show_bug.cgi?id=106887
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108073 https://bugs.freedesktop.org/show_bug.cgi?id=108073
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#108228 https://bugs.freedesktop.org/show_bug.cgi?id=108228
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_5116 -> Patchwork_10799
CI_DRM_5116: ade66f7f60026c1c7e68a12ce07d5d4000afce13 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4714: cab148ca3ec904a94d0cd43476cf7e1f8663f906 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10799: dd7ebb2e178a08e8095841db8d5c1a97943e68ed @ 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_10799/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
* Re: [PATCH] drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm()
2018-11-08 15:10 [PATCH] drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm() Ville Syrjala
` (2 preceding siblings ...)
2018-11-10 5:16 ` ✓ Fi.CI.IGT: " Patchwork
@ 2018-11-13 16:00 ` Ville Syrjälä
3 siblings, 0 replies; 5+ messages in thread
From: Ville Syrjälä @ 2018-11-13 16:00 UTC (permalink / raw)
To: intel-gfx
On Thu, Nov 08, 2018 at 05:10:13PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> No point in cluttering the common codepaths with the
> skip_intermediate_wm handling. Just move it into
> ilk_compute_intermediate_wm() as those are the only
> platforms using this.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Pushed with Maarten's irc r-b.
> ---
> drivers/gpu/drm/i915/intel_display.c | 7 +------
> drivers/gpu/drm/i915/intel_pm.c | 3 ++-
> 2 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 71b7bff85e52..00e775f22a45 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -10817,7 +10817,6 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> struct intel_crtc_state *pipe_config =
> to_intel_crtc_state(crtc_state);
> - struct drm_atomic_state *state = crtc_state->state;
> int ret;
> bool mode_changed = needs_modeset(crtc_state);
>
> @@ -10854,8 +10853,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
> }
> }
>
> - if (dev_priv->display.compute_intermediate_wm &&
> - !to_intel_atomic_state(state)->skip_intermediate_wm) {
> + if (dev_priv->display.compute_intermediate_wm) {
> if (WARN_ON(!dev_priv->display.compute_pipe_wm))
> return 0;
>
> @@ -10871,9 +10869,6 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
> DRM_DEBUG_KMS("No valid intermediate pipe watermarks are possible\n");
> return ret;
> }
> - } else if (dev_priv->display.compute_intermediate_wm) {
> - if (HAS_PCH_SPLIT(dev_priv) && INTEL_GEN(dev_priv) < 9)
> - pipe_config->wm.ilk.intermediate = pipe_config->wm.ilk.optimal;
> }
>
> if (INTEL_GEN(dev_priv) >= 9) {
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 9da8ff263d36..2b57e360c043 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3159,7 +3159,8 @@ 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))
> + if (!newstate->base.active || drm_atomic_crtc_needs_modeset(&newstate->base) ||
> + intel_state->skip_intermediate_wm)
> return 0;
>
> a->pipe_enabled |= b->pipe_enabled;
> --
> 2.18.1
--
Ville Syrjälä
Intel
_______________________________________________
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-11-13 16:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-08 15:10 [PATCH] drm/i915: Move skip_intermediate_wm handling into ilk_compute_intermediate_wm() Ville Syrjala
2018-11-08 16:39 ` ✗ Fi.CI.BAT: failure for " Patchwork
2018-11-09 19:17 ` ✓ Fi.CI.BAT: success " Patchwork
2018-11-10 5:16 ` ✓ Fi.CI.IGT: " Patchwork
2018-11-13 16:00 ` [PATCH] " Ville Syrjälä
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.