* [PATCH] drm/i915: FBC needs vblank before enable / disable.
@ 2019-04-03 6:17 kiran.s.kumar
2019-04-03 6:39 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: FBC needs vblank before enable / disable. (rev4) Patchwork
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: kiran.s.kumar @ 2019-04-03 6:17 UTC (permalink / raw)
To: intel-gfx
From: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
As per the display workaround #1200, FBC needs wait for vblank before
enabling and before disabling FBC.
In some cases, depending on whether FBC was compressing in that frame,
several control signals in the compression engine also will fail to
properly recognize the final segment of the frame as a result of the
missing last pixel indication. As a result of this, we're seeing
corrupted cache line/compression indicators after FBC re-enables
which causes underruns or corruption when they're used to decompress.
WA sequence as below:
1) Display enables plane 1A
2) Wait for 1 vblank
3) FBC gets enabled
4) Wait for 1 VBLANK
5) Turn off FBC
In GLK Chrome OS, if FBC is enabled by default, few top lines on the screen
got corrupted. With the above WA, issue was resolved.
Change-Id: I8a3baeda363b2d2ec4e9e8673e89013a341c646a
Signed-off-by: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
---
drivers/gpu/drm/i915/intel_display.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8576a7f799f2..90360dfc674b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13207,8 +13207,12 @@ static void intel_update_crtc(struct drm_crtc *crtc,
if (pipe_config->update_pipe && !pipe_config->enable_fbc)
intel_fbc_disable(intel_crtc);
- else if (new_plane_state)
+ else if (new_plane_state) {
+ /* Display WA #1200: GLK */
+ if (IS_GEMINILAKE(dev_priv))
+ intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
+ }
intel_begin_crtc_commit(crtc, old_crtc_state);
@@ -13419,6 +13423,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
dev_priv->display.crtc_disable(old_intel_crtc_state, state);
intel_crtc->active = false;
+ /* Display WA #1200: GLK */
+ intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
intel_fbc_disable(intel_crtc);
intel_disable_shared_dpll(old_intel_crtc_state);
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: FBC needs vblank before enable / disable. (rev4)
2019-04-03 6:17 [PATCH] drm/i915: FBC needs vblank before enable / disable kiran.s.kumar
@ 2019-04-03 6:39 ` Patchwork
2019-04-03 7:01 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-04-05 18:10 ` [PATCH] drm/i915: FBC needs vblank before enable / disable Ville Syrjälä
2 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2019-04-03 6:39 UTC (permalink / raw)
To: kiran.s.kumar; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: FBC needs vblank before enable / disable. (rev4)
URL : https://patchwork.freedesktop.org/series/58843/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
02d1d129c090 drm/i915: FBC needs vblank before enable / disable.
-:26: ERROR:GERRIT_CHANGE_ID: Remove Gerrit Change-Id's before submitting upstream.
#26:
Change-Id: I8a3baeda363b2d2ec4e9e8673e89013a341c646a
total: 1 errors, 0 warnings, 0 checks, 21 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: FBC needs vblank before enable / disable. (rev4)
2019-04-03 6:17 [PATCH] drm/i915: FBC needs vblank before enable / disable kiran.s.kumar
2019-04-03 6:39 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: FBC needs vblank before enable / disable. (rev4) Patchwork
@ 2019-04-03 7:01 ` Patchwork
2019-04-05 18:10 ` [PATCH] drm/i915: FBC needs vblank before enable / disable Ville Syrjälä
2 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2019-04-03 7:01 UTC (permalink / raw)
To: kiran.s.kumar; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: FBC needs vblank before enable / disable. (rev4)
URL : https://patchwork.freedesktop.org/series/58843/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_5860 -> Patchwork_12668
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_12668 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_12668, 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/58843/revisions/4/mbox/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_12668:
### IGT changes ###
#### Possible regressions ####
* igt@debugfs_test@read_all_entries:
- fi-byt-j1900: PASS -> DMESG-WARN
* igt@gem_ctx_create@basic:
- fi-icl-y: PASS -> INCOMPLETE
* igt@gem_exec_suspend@basic-s3:
- fi-kbl-r: PASS -> DMESG-WARN
- fi-skl-lmem: PASS -> DMESG-WARN
- fi-bdw-gvtdvm: PASS -> DMESG-WARN
- fi-skl-iommu: PASS -> DMESG-WARN
- fi-icl-u2: PASS -> DMESG-WARN
- fi-bsw-kefka: PASS -> DMESG-WARN
- fi-byt-clapper: PASS -> DMESG-WARN
- fi-skl-gvtdvm: PASS -> DMESG-WARN
- fi-skl-6600u: PASS -> DMESG-WARN
* igt@runner@aborted:
- fi-ilk-650: NOTRUN -> FAIL
- fi-pnv-d510: NOTRUN -> FAIL
- fi-bdw-gvtdvm: NOTRUN -> FAIL
- fi-hsw-peppy: NOTRUN -> FAIL
- fi-icl-u2: NOTRUN -> FAIL
- fi-gdg-551: NOTRUN -> FAIL
- fi-snb-2520m: NOTRUN -> FAIL
- fi-hsw-4770: NOTRUN -> FAIL
- fi-whl-u: NOTRUN -> FAIL
- fi-icl-u3: NOTRUN -> FAIL
- fi-ivb-3770: NOTRUN -> FAIL
- fi-byt-j1900: NOTRUN -> FAIL
- fi-blb-e6850: NOTRUN -> FAIL
- fi-bsw-kefka: NOTRUN -> FAIL
- fi-hsw-4770r: NOTRUN -> FAIL
- fi-byt-clapper: NOTRUN -> FAIL
- fi-bdw-5557u: NOTRUN -> FAIL
- fi-bwr-2160: NOTRUN -> FAIL
- fi-byt-n2820: NOTRUN -> FAIL
- fi-elk-e7500: NOTRUN -> FAIL
Known issues
------------
Here are the changes found in Patchwork_12668 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3:
- fi-icl-u3: PASS -> DMESG-WARN [fdo#109638]
* igt@runner@aborted:
- fi-cfl-8109u: NOTRUN -> FAIL [k.org#202107] / [k.org#202109]
- fi-bxt-j4205: NOTRUN -> FAIL [fdo#109516]
- fi-skl-iommu: NOTRUN -> FAIL [fdo#104108]
- fi-cfl-guc: NOTRUN -> FAIL [k.org#202107] / [k.org#202109]
- fi-kbl-7567u: NOTRUN -> FAIL [fdo#108903] / [fdo#108904] / [fdo#108905]
- fi-skl-guc: NOTRUN -> FAIL [fdo#104108]
- fi-skl-6700k2: NOTRUN -> FAIL [fdo#104108]
- fi-kbl-x1275: NOTRUN -> FAIL [fdo#108903] / [fdo#108904] / [fdo#108905]
- fi-cfl-8700k: NOTRUN -> FAIL [k.org#202107] / [k.org#202109]
- fi-skl-6600u: NOTRUN -> FAIL [fdo#104108]
- fi-skl-lmem: NOTRUN -> FAIL [fdo#104108]
- fi-kbl-r: NOTRUN -> FAIL [fdo#109383]
- fi-skl-6770hq: NOTRUN -> FAIL [fdo#104108]
- fi-skl-gvtdvm: NOTRUN -> FAIL [fdo#104108]
- fi-snb-2600: NOTRUN -> FAIL [fdo#108929]
#### Warnings ####
* igt@gem_exec_suspend@basic-s3:
- fi-whl-u: FAIL [fdo#103375] -> DMESG-FAIL [fdo#103375]
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#108903]: https://bugs.freedesktop.org/show_bug.cgi?id=108903
[fdo#108904]: https://bugs.freedesktop.org/show_bug.cgi?id=108904
[fdo#108905]: https://bugs.freedesktop.org/show_bug.cgi?id=108905
[fdo#108929]: https://bugs.freedesktop.org/show_bug.cgi?id=108929
[fdo#109383]: https://bugs.freedesktop.org/show_bug.cgi?id=109383
[fdo#109516]: https://bugs.freedesktop.org/show_bug.cgi?id=109516
[fdo#109638]: https://bugs.freedesktop.org/show_bug.cgi?id=109638
[k.org#202107]: https://bugzilla.kernel.org/show_bug.cgi?id=202107
[k.org#202109]: https://bugzilla.kernel.org/show_bug.cgi?id=202109
Participating hosts (46 -> 41)
------------------------------
Additional (2): fi-hsw-4770r fi-snb-2600
Missing (7): fi-kbl-soraka fi-ilk-m540 fi-bsw-n3050 fi-byt-squawks fi-ctg-p8600 fi-icl-dsi fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5860 -> Patchwork_12668
CI_DRM_5860: 837ba3cd997b59e53903ba29f4fe65c81f86f1e9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4923: 6285eec4f3b8f21833d9d2d852883569d6551822 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12668: 02d1d129c0901cf4cc393c4bc26dae31b2ad8009 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
02d1d129c090 drm/i915: FBC needs vblank before enable / disable.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12668/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH] drm/i915: FBC needs vblank before enable / disable.
2019-04-03 6:17 [PATCH] drm/i915: FBC needs vblank before enable / disable kiran.s.kumar
2019-04-03 6:39 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: FBC needs vblank before enable / disable. (rev4) Patchwork
2019-04-03 7:01 ` ✗ Fi.CI.BAT: failure " Patchwork
@ 2019-04-05 18:10 ` Ville Syrjälä
2 siblings, 0 replies; 11+ messages in thread
From: Ville Syrjälä @ 2019-04-05 18:10 UTC (permalink / raw)
To: kiran.s.kumar; +Cc: intel-gfx
On Wed, Apr 03, 2019 at 11:47:00AM +0530, kiran.s.kumar@intel.com wrote:
> From: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
>
> As per the display workaround #1200, FBC needs wait for vblank before
> enabling and before disabling FBC.
>
> In some cases, depending on whether FBC was compressing in that frame,
> several control signals in the compression engine also will fail to
> properly recognize the final segment of the frame as a result of the
> missing last pixel indication. As a result of this, we're seeing
> corrupted cache line/compression indicators after FBC re-enables
> which causes underruns or corruption when they're used to decompress.
>
> WA sequence as below:
> 1) Display enables plane 1A
> 2) Wait for 1 vblank
> 3) FBC gets enabled
> 4) Wait for 1 VBLANK
> 5) Turn off FBC
>
> In GLK Chrome OS, if FBC is enabled by default, few top lines on the screen
> got corrupted. With the above WA, issue was resolved.
>
> Change-Id: I8a3baeda363b2d2ec4e9e8673e89013a341c646a
> Signed-off-by: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 8576a7f799f2..90360dfc674b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -13207,8 +13207,12 @@ static void intel_update_crtc(struct drm_crtc *crtc,
>
> if (pipe_config->update_pipe && !pipe_config->enable_fbc)
> intel_fbc_disable(intel_crtc);
> - else if (new_plane_state)
> + else if (new_plane_state) {
> + /* Display WA #1200: GLK */
The w/a doesn't seem specific to glk.
> + if (IS_GEMINILAKE(dev_priv))
> + intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
Doing this uncodintionally for any plane update is quite rude. We need
to limit it to cases where the plane is being enabled or disabled. And
since most planes can't even do FBC we should not have to pay the cost
for all planes.
> intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
> + }
>
> intel_begin_crtc_commit(crtc, old_crtc_state);
>
> @@ -13419,6 +13423,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
>
> dev_priv->display.crtc_disable(old_intel_crtc_state, state);
> intel_crtc->active = false;
> + /* Display WA #1200: GLK */
> + intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
The disable case seems to be w/a 1198. Also not glk specific. Also, this
code is only used for the case where the whole pipe is getting disabled,
so this wouldn't cover the cases where just the plane is being
disabled.
Do we have any igts that excecise plane enable/disable vs. FBC?
> intel_fbc_disable(intel_crtc);
> intel_disable_shared_dpll(old_intel_crtc_state);
>
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
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] 11+ messages in thread
* [PATCH] drm/i915: FBC needs vblank before enable / disable
@ 2019-05-29 5:58 kiran.s.kumar
0 siblings, 0 replies; 11+ messages in thread
From: kiran.s.kumar @ 2019-05-29 5:58 UTC (permalink / raw)
To: intel-gfx
From: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
As per the display workaround #1200, FBC needs wait for vblank
before enabling and before disabling FBC.
In some cases, depending on whether FBC was compressing in that frame,
several control signals in the compression engine also will fail to
properly recognize the final segment of the frame as a result of the
missing last pixel indication. As a result of this, we're seeing corrupted
cache line/compression indicators after FBC re-enables which causes
underruns or corruption when they're used to decompress.
WA sequence as below:
1) Display enables plane 1A
2) Wait for 1 vblank
3) FBC gets enabled
4) Wait for 1 VBLANK
5) Turn off FBC
In GLK Chrome OS, if FBC is enabled by default, few top lines on the screen
got corrupted. With the above WA, issue was resolved.
v2: Added wait for vblank code in FBC as it will be called if and only if
fbc is enabled.
And also, as per the information from hardware team that the above
WA is for GLK.
Signed-off-by: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
---
drivers/gpu/drm/i915/intel_fbc.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index 5679f2fffb7c..d4b8cfb8419e 100644
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -1094,6 +1094,8 @@ void intel_fbc_enable(struct intel_crtc *crtc,
if (fbc->crtc == crtc) {
WARN_ON(!crtc_state->enable_fbc);
WARN_ON(fbc->active);
+ if (IS_GEMINILAKE(dev_priv))
+ intel_wait_for_vblank(dev_priv, crtc->pipe);
}
goto out;
}
@@ -1134,8 +1136,11 @@ void intel_fbc_disable(struct intel_crtc *crtc)
return;
mutex_lock(&fbc->lock);
- if (fbc->crtc == crtc)
+ if (fbc->crtc == crtc) {
__intel_fbc_disable(dev_priv);
+ if (IS_GEMINILAKE(dev_priv))
+ intel_wait_for_vblank(dev_priv, crtc->pipe);
+ }
mutex_unlock(&fbc->lock);
}
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] drm/i915: FBC needs vblank before enable / disable.
@ 2019-04-03 7:10 kiran.s.kumar
0 siblings, 0 replies; 11+ messages in thread
From: kiran.s.kumar @ 2019-04-03 7:10 UTC (permalink / raw)
To: intel-gfx
From: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
As per the display workaround #1200, FBC needs wait for vblank before
enabling and before disabling FBC.
In some cases, depending on whether FBC was compressing in that frame,
several control signals in the compression engine also will fail to
properly recognize the final segment of the frame as a result of the
missing last pixel indication. As a result of this, we're seeing
corrupted cache line/compression indicators after FBC re-enables
which causes underruns or corruption when they're used to decompress.
WA sequence as below:
1) Display enables plane 1A
2) Wait for 1 vblank
3) FBC gets enabled
4) Wait for 1 VBLANK
5) Turn off FBC
In GLK Chrome OS, if FBC is enabled by default, few top lines on the screen
got corrupted. With the above WA, issue was resolved.
Signed-off-by: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
---
drivers/gpu/drm/i915/intel_display.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8576a7f799f2..97c9af921ae1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13207,8 +13207,12 @@ static void intel_update_crtc(struct drm_crtc *crtc,
if (pipe_config->update_pipe && !pipe_config->enable_fbc)
intel_fbc_disable(intel_crtc);
- else if (new_plane_state)
+ else if (new_plane_state) {
+ /* Display WA #1200: GLK */
+ if (IS_GEMINILAKE(dev_priv))
+ intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
+ }
intel_begin_crtc_commit(crtc, old_crtc_state);
@@ -13419,6 +13423,10 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
dev_priv->display.crtc_disable(old_intel_crtc_state, state);
intel_crtc->active = false;
+ /* Display WA #1200: GLK */
+ if (IS_GEMINILAKE(dev_priv))
+ intel_wait_for_vblank(dev_priv,
+ intel_crtc->pipe);
intel_fbc_disable(intel_crtc);
intel_disable_shared_dpll(old_intel_crtc_state);
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] drm/i915: FBC needs vblank before enable / disable.
@ 2019-04-03 7:03 kiran.s.kumar
0 siblings, 0 replies; 11+ messages in thread
From: kiran.s.kumar @ 2019-04-03 7:03 UTC (permalink / raw)
To: intel-gfx
From: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
As per the display workaround #1200, FBC needs wait for vblank before
enabling and before disabling FBC.
In some cases, depending on whether FBC was compressing in that frame,
several control signals in the compression engine also will fail to
properly recognize the final segment of the frame as a result of the
missing last pixel indication. As a result of this, we're seeing
corrupted cache line/compression indicators after FBC re-enables
which causes underruns or corruption when they're used to decompress.
WA sequence as below:
1) Display enables plane 1A
2) Wait for 1 vblank
3) FBC gets enabled
4) Wait for 1 VBLANK
5) Turn off FBC
In GLK Chrome OS, if FBC is enabled by default, few top lines on the screen
got corrupted. With the above WA, issue was resolved.
Signed-off-by: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
---
drivers/gpu/drm/i915/intel_display.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8576a7f799f2..90360dfc674b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13207,8 +13207,12 @@ static void intel_update_crtc(struct drm_crtc *crtc,
if (pipe_config->update_pipe && !pipe_config->enable_fbc)
intel_fbc_disable(intel_crtc);
- else if (new_plane_state)
+ else if (new_plane_state) {
+ /* Display WA #1200: GLK */
+ if (IS_GEMINILAKE(dev_priv))
+ intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
+ }
intel_begin_crtc_commit(crtc, old_crtc_state);
@@ -13419,6 +13423,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
dev_priv->display.crtc_disable(old_intel_crtc_state, state);
intel_crtc->active = false;
+ /* Display WA #1200: GLK */
+ intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
intel_fbc_disable(intel_crtc);
intel_disable_shared_dpll(old_intel_crtc_state);
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] drm/i915: FBC needs vblank before enable / disable.
@ 2019-04-03 4:50 kiran.s.kumar
0 siblings, 0 replies; 11+ messages in thread
From: kiran.s.kumar @ 2019-04-03 4:50 UTC (permalink / raw)
To: intel-gfx
From: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
As per the display workaround #1200, FBC needs wait for vblank before
enabling and before disabling FBC.
In some cases, depending on whether FBC was compressing in that frame,
several control signals in the compression engine also will fail to
properly recognize the final segment of the frame as a result of the
missing last pixel indication. As a result of this, we're seeing
corrupted cache line/compression indicators after FBC re-enables
which causes underruns or corruption when they're used to decompress.
WA sequence as below:
1) Display enables plane 1A
2) Wait for 1 vblank
3) FBC gets enabled
4) Wait for 1 VBLANK
5) Turn off FBC
In GLK Chrome OS, if FBC is enabled by default, few top lines on the screen
got corrupted. With the above WA, issue was resolved.
Signed-off-by: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
---
drivers/gpu/drm/i915/intel_display.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8576a7f799f2..5118a36782eb 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13207,8 +13207,11 @@ static void intel_update_crtc(struct drm_crtc *crtc,
if (pipe_config->update_pipe && !pipe_config->enable_fbc)
intel_fbc_disable(intel_crtc);
- else if (new_plane_state)
+ else if (new_plane_state) {
+ /* Display WA #1200: GLK */
+ intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
+ }
intel_begin_crtc_commit(crtc, old_crtc_state);
@@ -13419,6 +13422,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
dev_priv->display.crtc_disable(old_intel_crtc_state, state);
intel_crtc->active = false;
+ /* Display WA #1200: GLK */
+ intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
intel_fbc_disable(intel_crtc);
intel_disable_shared_dpll(old_intel_crtc_state);
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH] drm/i915: FBC needs vblank before enable / disable.
@ 2019-04-03 4:30 kiran.s.kumar
2019-04-03 17:54 ` Souza, Jose
0 siblings, 1 reply; 11+ messages in thread
From: kiran.s.kumar @ 2019-04-03 4:30 UTC (permalink / raw)
To: intel-gfx
From: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
As per the display workaround #1200, FBC needs wait for vblank before
enabling and before disabling FBC.
In some cases, depending on whether FBC was compressing in that frame,
several control signals in the compression engine also will fail to properly
recognize the final segment of the frame as a result of the missing last
pixel indication. As a result of this, we're seeing corrupted cache
line/compression indicators after FBC re-enables which causes underruns or
corruption when they're used to decompress.
WA sequence as below:
1) Display enables plane 1A
2) Wait for 1 vblank
3) FBC gets enabled
4) Wait for 1 VBLANK
5) Turn off FBC
In GLK Chrome OS, if FBC is enabled by default, few top lines on the screen
got corrupted. With the above WA, issue was resolved.
Change-Id: I2465610bb0a82df99e5c53b1eb4ed74565996b1e
Signed-off-by: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
---
drivers/gpu/drm/i915/intel_display.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 8576a7f799f2..5118a36782eb 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13207,8 +13207,11 @@ static void intel_update_crtc(struct drm_crtc *crtc,
if (pipe_config->update_pipe && !pipe_config->enable_fbc)
intel_fbc_disable(intel_crtc);
- else if (new_plane_state)
+ else if (new_plane_state) {
+ /* Display WA #1200: GLK */
+ intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
intel_fbc_enable(intel_crtc, pipe_config, new_plane_state);
+ }
intel_begin_crtc_commit(crtc, old_crtc_state);
@@ -13419,6 +13422,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
dev_priv->display.crtc_disable(old_intel_crtc_state, state);
intel_crtc->active = false;
+ /* Display WA #1200: GLK */
+ intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
intel_fbc_disable(intel_crtc);
intel_disable_shared_dpll(old_intel_crtc_state);
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH] drm/i915: FBC needs vblank before enable / disable.
2019-04-03 4:30 kiran.s.kumar
@ 2019-04-03 17:54 ` Souza, Jose
0 siblings, 0 replies; 11+ messages in thread
From: Souza, Jose @ 2019-04-03 17:54 UTC (permalink / raw)
To: intel-gfx@lists.freedesktop.org, Kumar, Kiran S
[-- Attachment #1.1: Type: text/plain, Size: 2503 bytes --]
On Wed, 2019-04-03 at 10:00 +0530, kiran.s.kumar@intel.com wrote:
> From: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
>
> As per the display workaround #1200, FBC needs wait for vblank before
> enabling and before disabling FBC.
>
> In some cases, depending on whether FBC was compressing in that
> frame,
> several control signals in the compression engine also will fail to
> properly
> recognize the final segment of the frame as a result of the missing
> last
> pixel indication. As a result of this, we're seeing corrupted cache
> line/compression indicators after FBC re-enables which causes
> underruns or
> corruption when they're used to decompress.
>
> WA sequence as below:
> 1) Display enables plane 1A
> 2) Wait for 1 vblank
> 3) FBC gets enabled
> 4) Wait for 1 VBLANK
> 5) Turn off FBC
>
> In GLK Chrome OS, if FBC is enabled by default, few top lines on the
> screen
> got corrupted. With the above WA, issue was resolved.
>
> Change-Id: I2465610bb0a82df99e5c53b1eb4ed74565996b1e
> Signed-off-by: Kiran Kumar S <
> kiran.s.kumar@intel.corp-partner.google.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 8576a7f799f2..5118a36782eb 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -13207,8 +13207,11 @@ static void intel_update_crtc(struct
> drm_crtc *crtc,
>
> if (pipe_config->update_pipe && !pipe_config->enable_fbc)
> intel_fbc_disable(intel_crtc);
> - else if (new_plane_state)
> + else if (new_plane_state) {
> + /* Display WA #1200: GLK */
> + intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
Wait a vblank of partially changed state? That is not a good idea at
all.
Also it would wait a vblank even if FBC is not enabled.
> intel_fbc_enable(intel_crtc, pipe_config,
> new_plane_state);
> + }
>
> intel_begin_crtc_commit(crtc, old_crtc_state);
>
> @@ -13419,6 +13422,8 @@ static void intel_atomic_commit_tail(struct
> drm_atomic_state *state)
>
> dev_priv-
> >display.crtc_disable(old_intel_crtc_state, state);
> intel_crtc->active = false;
> + /* Display WA #1200: GLK */
> + intel_wait_for_vblank(dev_priv, intel_crtc-
> >pipe);
> intel_fbc_disable(intel_crtc);
> intel_disable_shared_dpll(old_intel_crtc_state)
> ;
>
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] drm/i915: FBC needs vblank before enable / disable.
@ 2019-04-01 16:30 kiran.s.kumar
0 siblings, 0 replies; 11+ messages in thread
From: kiran.s.kumar @ 2019-04-01 16:30 UTC (permalink / raw)
To: intel-gfx
From: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
As per the display workaround #1200, FBC needs wait for vblank before
enabling and before disabling FBC.
In some cases, depending on whether FBC was compressing in that frame,
several control signals in the compression engine also will fail to properly
recognize the final segment of the frame as a result of the missing last
pixel indication. As a result of this, we're seeing corrupted cache
line/compression indicators after FBC re-enables which causes underruns or
corruption when they're used to decompress.
WA sequence as below:
1) Display enables plane 1A
2) Wait for 1 vblank
3) FBC gets enabled
4) Wait for 1 VBLANK
5) Turn off FBC
In GLK Chrome OS, if FBC is enabled by default, few top lines on the screen
got corrupted. With the above WA, issue was resolved.
Change-Id: I6c5cc8978bc23fb6fc1f5fedd9599c6281bd78e9
Signed-off-by: Kiran Kumar S <kiran.s.kumar@intel.corp-partner.google.com>
---
drivers/gpu/drm/i915/intel_display.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c2d8589a4150..fec06447ab72 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12246,6 +12246,8 @@ static void intel_update_crtc(struct drm_crtc *crtc,
}
if (drm_atomic_get_existing_plane_state(state, crtc->primary)) {
+ /* Display WA #1200: GLK */
+ intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
intel_fbc_enable(
intel_crtc, pipe_config,
to_intel_plane_state(crtc->primary->state));
@@ -12419,6 +12421,8 @@ static void intel_atomic_commit_tail(struct drm_atomic_state *state)
intel_crtc_disable_planes(crtc, old_crtc_state->plane_mask);
dev_priv->display.crtc_disable(to_intel_crtc_state(old_crtc_state), state);
intel_crtc->active = false;
+ /* Display WA #1200: GLK */
+ intel_wait_for_vblank(dev_priv, intel_crtc->pipe);
intel_fbc_disable(intel_crtc);
intel_disable_shared_dpll(intel_crtc);
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-05-29 6:08 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-03 6:17 [PATCH] drm/i915: FBC needs vblank before enable / disable kiran.s.kumar
2019-04-03 6:39 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: FBC needs vblank before enable / disable. (rev4) Patchwork
2019-04-03 7:01 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-04-05 18:10 ` [PATCH] drm/i915: FBC needs vblank before enable / disable Ville Syrjälä
-- strict thread matches above, loose matches on Subject: below --
2019-05-29 5:58 kiran.s.kumar
2019-04-03 7:10 kiran.s.kumar
2019-04-03 7:03 kiran.s.kumar
2019-04-03 4:50 kiran.s.kumar
2019-04-03 4:30 kiran.s.kumar
2019-04-03 17:54 ` Souza, Jose
2019-04-01 16:30 kiran.s.kumar
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.