| Message ID | 20180419155109.29451-1-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Apr 19, 2018 at 06:51:09PM +0300, Imre Deak wrote: > The DMC FW specific part of display WA#1183 is supposed to be enabled > whenever enabling DC5 or DC6, so move it to the DC6 enable function > from the DC6 disable function. That does make more sense :) Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > I noticed this after Daniel's patch to remove the unused > skl_disable_dc6() function. > > Fixes: 53421c2fe99c ("drm/i915: Apply Display WA #1183 on skl, kbl, and cfl") > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: <stable@vger.kernel.org> > Signed-off-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c > index 53ea564f971e..66de4b2dc8b7 100644 > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c > @@ -641,19 +641,18 @@ void skl_enable_dc6(struct drm_i915_private *dev_priv) > > DRM_DEBUG_KMS("Enabling DC6\n"); > > - gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6); > + /* Wa Display #1183: skl,kbl,cfl */ > + if (IS_GEN9_BC(dev_priv)) > + I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) | > + SKL_SELECT_ALTERNATE_DC_EXIT); > > + gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6); > } > > void skl_disable_dc6(struct drm_i915_private *dev_priv) > { > DRM_DEBUG_KMS("Disabling DC6\n"); > > - /* Wa Display #1183: skl,kbl,cfl */ > - if (IS_GEN9_BC(dev_priv)) > - I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) | > - SKL_SELECT_ALTERNATE_DC_EXIT); > - > gen9_set_dc_state(dev_priv, DC_STATE_DISABLE); > } > > -- > 2.13.2
On Thu, Apr 19, 2018 at 11:07:31PM +0000, Patchwork wrote: > == Series Details == > > Series: drm/i915: Enable display WA#1183 from its correct spot > URL : https://patchwork.freedesktop.org/series/41983/ > State : success Thanks for the review, pushed it to -dinq. > > == Summary == > > = CI Bug Log - changes from CI_DRM_4070_full -> Patchwork_8756_full = > > == Summary - WARNING == > > Minor unknown changes coming with Patchwork_8756_full need to be verified > manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_8756_full, 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/41983/revisions/1/mbox/ > > == Possible new issues == > > Here are the unknown changes that may have been introduced in Patchwork_8756_full: > > === IGT changes === > > ==== Warnings ==== > > igt@gem_exec_schedule@deep-bsd2: > shard-kbl: PASS -> SKIP +2 > > igt@gem_mmap_wc@set-cache-level: > shard-glk: PASS -> SKIP +92 > > igt@gem_mocs_settings@mocs-rc6-vebox: > shard-kbl: SKIP -> PASS +2 > > igt@kms_vblank@pipe-b-wait-forked-busy-hang: > shard-glk: SKIP -> PASS +58 > > > == Known issues == > > Here are the changes found in Patchwork_8756_full that come from known issues: > > === IGT changes === > > ==== Issues hit ==== > > igt@kms_cursor_legacy@cursor-vs-flip-toggle: > shard-hsw: PASS -> FAIL (fdo#103355) > > igt@kms_cursor_legacy@flip-vs-cursor-toggle: > shard-hsw: PASS -> FAIL (fdo#102670) > > igt@kms_flip@2x-plain-flip-ts-check: > shard-hsw: PASS -> FAIL (fdo#100368) > > igt@kms_flip@absolute-wf_vblank-interruptible: > shard-glk: PASS -> FAIL (fdo#106087) > > igt@kms_flip@flip-vs-expired-vblank-interruptible: > shard-hsw: PASS -> FAIL (fdo#105707) > > igt@kms_flip@modeset-vs-vblank-race-interruptible: > shard-hsw: PASS -> FAIL (fdo#103060) > > igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-gtt: > shard-apl: PASS -> FAIL (fdo#103167) > > igt@kms_setmode@basic: > shard-kbl: PASS -> FAIL (fdo#99912) > > igt@kms_universal_plane@universal-plane-pipe-b-sanity: > shard-hsw: PASS -> DMESG-WARN (fdo#102614) > > > ==== Possible fixes ==== > > igt@gem_ppgtt@blt-vs-render-ctx0: > shard-kbl: INCOMPLETE (fdo#103665, fdo#106023) -> PASS > > igt@kms_flip@2x-plain-flip-ts-check-interruptible: > shard-hsw: FAIL (fdo#100368) -> PASS +1 > > igt@kms_frontbuffer_tracking@basic: > shard-glk: FAIL (fdo#103167) -> PASS > > igt@kms_sysfs_edid_timing: > shard-apl: WARN (fdo#100047) -> PASS > > > fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047 > fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368 > fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614 > fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670 > fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060 > fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167 > fdo#103355 https://bugs.freedesktop.org/show_bug.cgi?id=103355 > fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665 > fdo#105707 https://bugs.freedesktop.org/show_bug.cgi?id=105707 > fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023 > fdo#106087 https://bugs.freedesktop.org/show_bug.cgi?id=106087 > fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912 > > > == Participating hosts (6 -> 5) == > > Missing (1): shard-glkb > > > == Build changes == > > * Linux: CI_DRM_4070 -> Patchwork_8756 > > CI_DRM_4070: 47f407780a2b330f097892203401986838eb9795 @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_4441: 83ba5b7d3bde48b383df41792fc9c955a5a23bdb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_8756: 38a485385f9326dc10d8927c4d0647e0f3a6e1ad @ git://anongit.freedesktop.org/gfx-ci/linux > piglit_4441: e60d247eb359f044caf0c09904da14e39d7adca1 @ git://anongit.freedesktop.org/piglit > > == Logs == > > For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8756/shards.html
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index 53ea564f971e..66de4b2dc8b7 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -641,19 +641,18 @@ void skl_enable_dc6(struct drm_i915_private *dev_priv) DRM_DEBUG_KMS("Enabling DC6\n"); - gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6); + /* Wa Display #1183: skl,kbl,cfl */ + if (IS_GEN9_BC(dev_priv)) + I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) | + SKL_SELECT_ALTERNATE_DC_EXIT); + gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6); } void skl_disable_dc6(struct drm_i915_private *dev_priv) { DRM_DEBUG_KMS("Disabling DC6\n"); - /* Wa Display #1183: skl,kbl,cfl */ - if (IS_GEN9_BC(dev_priv)) - I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) | - SKL_SELECT_ALTERNATE_DC_EXIT); - gen9_set_dc_state(dev_priv, DC_STATE_DISABLE); }
The DMC FW specific part of display WA#1183 is supposed to be enabled whenever enabling DC5 or DC6, so move it to the DC6 enable function from the DC6 disable function. I noticed this after Daniel's patch to remove the unused skl_disable_dc6() function. Fixes: 53421c2fe99c ("drm/i915: Apply Display WA #1183 on skl, kbl, and cfl") Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: <stable@vger.kernel.org> Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)