drm/i915/bxt: Use PHY0 GRC value for HW state verification

It's possible that BIOS enables PHY1 only to read out the GRC value from
it to be used in PHY0 and then disables PHY1. In this case we can't use
the PHY1 GRC value for state verification, so use instead the one in PHY0
always.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1461174366-16758-2-git-send-email-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index a887b31cb684268740dde32efbc19f94fb6b43fb..59dbd479c32b028492f70acebf00ee1355cde936 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1778,7 +1778,7 @@ static void broxton_phy_init(struct drm_i915_private *dev_priv,
                DRM_DEBUG_DRIVER("DDI PHY %d already enabled, "
                                 "won't reprogram it\n", phy);
                /* Still read out the GRC value for state verification */
-               if (phy == DPIO_PHY1)
+               if (phy == DPIO_PHY0)
                        dev_priv->bxt_phy_grc = broxton_get_grc(dev_priv, phy);
 
                return;