[Intel-gfx] [PATCH] drm/i915: BXT DDI PHY sequence BUN

[Imre Deak]

On ti, 2016-03-29 at 15:03 +0300, Imre Deak wrote:
> On ke, 2016-03-23 at 04:43 +0000, Kannan, Vandana wrote:
> > > -----Original Message-----
> > > From: Ville Syrjälä [mailto:ville.syrjala at linux.intel.com]
> > > Sent: Monday, March 21, 2016 7:34 PM
> > > To: Kannan, Vandana <vandana.kannan at intel.com>
> > > Cc: intel-gfx at lists.freedesktop.org
> > > Subject: Re: [Intel-gfx] [PATCH] drm/i915: BXT DDI PHY sequence
> > > BUN
> > > 
> > > On Mon, Mar 21, 2016 at 12:12:40PM +0530, Vandana Kannan wrote:
> > > > According to the BSpec update, bit 7 of PORT_CL1CM_DW0 register
> > > needs
> > > > to be checked to ensure that the register is in accessible
> > > > state.
> > > > Also, based on a BSpec update, changing the timeout value to
> > > > check
> > > > iphypwrgood, from 10ms to wait for up to 100us.
> > > > 
> > > > Signed-off-by: Vandana Kannan <vandana.kannan at intel.com>
> > > > Reported-by: Philippe Lecluse <Philippe.Lecluse at intel.com>
> > > > Cc: Deak, Imre <imre.deak at intel.com>
> > > > ---
> > > >  drivers/gpu/drm/i915/i915_reg.h  |  1 +
> > > > drivers/gpu/drm/i915/intel_ddi.c | 11 +++++++++--
> > > >  2 files changed, 10 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/drivers/gpu/drm/i915/i915_reg.h
> > > > b/drivers/gpu/drm/i915/i915_reg.h index 7dfc400..9a02bfc 100644
> > > > --- a/drivers/gpu/drm/i915/i915_reg.h
> > > > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > > > @@ -1318,6 +1318,7 @@ enum skl_disp_power_wells {
> > > >  #define _PORT_CL1CM_DW0_A		0x162000
> > > >  #define _PORT_CL1CM_DW0_BC		0x6C000
> > > >  #define   PHY_POWER_GOOD		(1 << 16)
> > > > +#define   PHY_RESERVED			(1 << 7)
> > > >  #define BXT_PORT_CL1CM_DW0(phy)		_BXT_PHY((phy),
> > > _PORT_CL1CM_DW0_BC, \
> > > >  							_PORT_
> > > > CL1CM_DW0_A)
> > > > 
> > > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c
> > > > b/drivers/gpu/drm/i915/intel_ddi.c
> > > > index 62de9f4..354f949 100644
> > > > --- a/drivers/gpu/drm/i915/intel_ddi.c
> > > > +++ b/drivers/gpu/drm/i915/intel_ddi.c
> > > > @@ -2669,9 +2669,16 @@ static void broxton_phy_init(struct
> > > drm_i915_private *dev_priv,
> > > >  	val |= GT_DISPLAY_POWER_ON(phy);
> > > >  	I915_WRITE(BXT_P_CR_GT_DISP_PWRON, val);
> > > > 
> > > > -	/* Considering 10ms timeout until BSpec is updated */
> > > > -	if (wait_for(I915_READ(BXT_PORT_CL1CM_DW0(phy)) &
> > > PHY_POWER_GOOD, 10))
> > > > +	/*
> > > > +	 * HW team confirmed that the time to reach
> > > > phypowergood status
> > > is
> > > > +	 * anywhere between 50 us and 100us.
> > > > +	 */
> > > > +	if
> > > > (wait_for_atomic_us(((!(I915_READ(BXT_PORT_CL1CM_DW0(phy))
> > > &
> > > 
> > > Switching to atomic wait seems silly.
> > > 
> > [Vandana] You think wait_for_us should suffice here? 
> 
> Yes.
> 
> > > > +				PHY_RESERVED)) &&
> > > > +				((I915_READ(BXT_PORT_CL1CM_DW0
> > > > (phy)) &
> > > > +				  PHY_POWER_GOOD) ==
> > > PHY_POWER_GOOD)), 100)) {
> > > >  		DRM_ERROR("timeout during PHY%d power on\n",
> > > > phy);
> > > > +	}
> 
> Please also add a comment on how the detection magic works: Reading
> any
> PHY register while the PHY is powered down will result in all
> register
> bits set, while the reserved bit 7 is guaranteed to be 0 when the PHY
> is powered up.

Vandana, could you resend this patch with the comments addressed?

--Imre