intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Imre Deak <imre.deak@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>,
	Rodrigo Vivi <rodrigo.vivi@intel.c>
Subject: [PATCH 1/5] drm/i915/icl: Fix combo PHY uninit
Date: Fri,  2 Nov 2018 20:07:02 +0200	[thread overview]
Message-ID: <20181102180706.16582-2-imre.deak@intel.com> (raw)
In-Reply-To: <20181102180706.16582-1-imre.deak@intel.com>

BSpec says to clear the comp init HW flag too during combo PHY uninit,
so do that. The lack of this could badly interact with the PHY reinit
after a DC6/9 transition at least, where (after a follow-up patch fixing
the init code) we'd skip the initialization incorrectly due to this flag
being set.

BSpec: 21257
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.c
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 6c453366cd24..a7eea8423580 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -3668,6 +3668,10 @@ void icl_display_core_uninit(struct drm_i915_private *dev_priv)
 		val = I915_READ(ICL_PHY_MISC(port));
 		val |= ICL_PHY_MISC_DE_IO_COMP_PWR_DOWN;
 		I915_WRITE(ICL_PHY_MISC(port), val);
+
+		val = I915_READ(ICL_PORT_COMP_DW0(port));
+		val &= ~COMP_INIT;
+		I915_WRITE(ICL_PORT_COMP_DW0(port), val);
 	}
 }
 
-- 
2.13.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2018-11-02 18:07 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-02 18:07 [PATCH 0/5] drm/i915/icl: Fix combo PHY HW context loss Imre Deak
2018-11-02 18:07 ` Imre Deak [this message]
2018-11-02 20:57   ` [PATCH 1/5] drm/i915/icl: Fix combo PHY uninit Souza, Jose
2018-11-02 22:04     ` Imre Deak
2018-11-02 18:07 ` [PATCH 2/5] drm/i915/cnl+: Move the combo PHY init/uninit code to a new file Imre Deak
2018-11-02 19:25   ` Rodrigo Vivi
2018-11-02 21:06   ` Souza, Jose
2018-11-02 22:11     ` Imre Deak
2018-11-02 18:07 ` [PATCH 3/5] drm/i915/cnl+: Verify combo PHY HW state during PHY uninit Imre Deak
2018-11-02 21:25   ` Souza, Jose
2018-11-02 22:00     ` Imre Deak
2018-11-02 21:34   ` Souza, Jose
2018-11-02 18:07 ` [PATCH 4/5] drm/i915/icl: Skip init for an already enabled combo PHY Imre Deak
2018-11-02 19:28   ` Rodrigo Vivi
2018-11-02 21:29   ` Souza, Jose
2018-11-02 18:07 ` [PATCH 5/5] drm/i915/icl: Fix port B combo PHY context loss after DC transitions Imre Deak
2018-11-02 19:22   ` Rodrigo Vivi
2018-11-05 11:02     ` Imre Deak
2018-11-02 21:44   ` Souza, Jose
2018-11-02 19:07 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915/icl: Fix combo PHY HW context loss Patchwork
2018-11-02 19:08 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-11-02 19:25 ` ✓ Fi.CI.BAT: success " Patchwork
2018-11-02 23:02 ` ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181102180706.16582-2-imre.deak@intel.com \
    --to=imre.deak@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=paulo.r.zanoni@intel.com \
    --cc=rodrigo.vivi@intel.c \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).