Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01a55197 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/i915: Only poll DW3_A when init DDI PHY for ports B and C. 



According to Bspec we need to
"Poll for PORT_REF_DW3_A grc_done == 1b"
only on ports B and C initialization sequence when
copying rcomp from port A.

So let's follow the spec and only poll for that case
and not on every port A initialization.

v2: Also remove the grc_done check from bxt_ddi_phy_is_enabled()
    otherwise it might believe it is disabled and force it to re program.

Cc: Imre Deak <imre.deak@intel.com>
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1479410256-25735-1-git-send-email-rodrigo.vivi@intel.com
parent e9c98825

drivers/gpu/drm/i915/intel_dpio_phy.c

+3 −12
Original line number Diff line number Diff line
@@ -328,14 +328,6 @@ bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv, 
		return false;

	}



	if (phy_info->rcomp_phy == -1 &&

	    !(I915_READ(BXT_PORT_REF_DW3(phy)) & GRC_DONE)) {

		DRM_DEBUG_DRIVER("DDI PHY %d powered, but GRC isn't done\n",

				 phy);



		return false;

	}



	if (!(I915_READ(BXT_PHY_CTL_FAMILY(phy)) & COMMON_RESET_DIS)) {

		DRM_DEBUG_DRIVER("DDI PHY %d powered, but still in reset\n",

				 phy);
@@ -441,6 +433,9 @@ static void _bxt_ddi_phy_init(struct drm_i915_private *dev_priv, 


	if (phy_info->rcomp_phy != -1) {

		uint32_t grc_code;



		bxt_phy_wait_grc_done(dev_priv, phy_info->rcomp_phy);



		/*

		 * PHY0 isn't connected to an RCOMP resistor so copy over

		 * the corresponding calibrated value from PHY1, and disable
@@ -464,10 +459,6 @@ static void _bxt_ddi_phy_init(struct drm_i915_private *dev_priv, 
	val = I915_READ(BXT_PHY_CTL_FAMILY(phy));

	val |= COMMON_RESET_DIS;

	I915_WRITE(BXT_PHY_CTL_FAMILY(phy), val);



	if (phy_info->rcomp_phy == -1)

		bxt_phy_wait_grc_done(dev_priv, phy);



}



void bxt_ddi_phy_uninit(struct drm_i915_private *dev_priv, enum dpio_phy phy)