[Intel-gfx] [PATCH] drm/i915/dg2: Print PHY name properly on calibration error

Matt Roper matthew.d.roper at intel.com
Tue Feb 22 16:00:05 UTC 2022


On Mon, Feb 21, 2022 at 09:42:21AM +0000, Tvrtko Ursulin wrote:
> 
> On 15/02/2022 16:35, Matt Roper wrote:
> > We need to use phy_name() to convert the PHY value into a human-readable
> > character in the error message.
> > 
> > Fixes: a6a128116e55 ("drm/i915/dg2: Wait for SNPS PHY calibration during display init")
> 
> I picked this for drm-intel-fixes, and as it did not apply cleanly, noticed
> in the process that a6a128116e55 is all the way back in 5.15. I reckon you
> didn't want to copy stable because it is just a log message tweak?

Correct; not needed for stable since this is only relevant to DG2 and
DG2 still isn't enabled for actual use (the PCI IDs are still in a
CI-only branch while we wait for the final bits of enabling work to be
hammered out).


Matt

> 
> Regards,
> 
> Tvrtko
> 
> > Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
> > ---
> >   drivers/gpu/drm/i915/display/intel_snps_phy.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/intel_snps_phy.c b/drivers/gpu/drm/i915/display/intel_snps_phy.c
> > index 8573a458811a..8fd00de981fc 100644
> > --- a/drivers/gpu/drm/i915/display/intel_snps_phy.c
> > +++ b/drivers/gpu/drm/i915/display/intel_snps_phy.c
> > @@ -35,7 +35,7 @@ void intel_snps_phy_wait_for_calibration(struct drm_i915_private *i915)
> >   		if (intel_de_wait_for_clear(i915, ICL_PHY_MISC(phy),
> >   					    DG2_PHY_DP_TX_ACK_MASK, 25))
> >   			drm_err(&i915->drm, "SNPS PHY %c failed to calibrate after 25ms.\n",
> > -				phy);
> > +				phy_name(phy));
> >   	}
> >   }

-- 
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795


More information about the Intel-gfx mailing list