| Message ID | 20201030153209.14808-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Reduce severity for fixing up mistaken VBT tc->legacy_port | expand |
On Fri, Oct 30, 2020 at 03:32:09PM +0000, Chris Wilson wrote: > If the VBT assigned tc->legacy_port mismatches the live_status indicator > for the connector, we ignore the VBT directive and switch over to the HW > setting. This is not a driver error, unless we happen to misparse the > VBT or the live_status registers. However, for the system in CI where > the error is only reported on 1 port out of 4, the evidence indicates > the VBT is wrong. Stop flaging this as an error since the cause is > beyond our control, fixup the mistake and continue on. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Imre Deak <imre.deak@intel.com> My intention was to keep this as an error so BIOS etc. team would have more motivation to act on it. But it didn't work out, so yes no need to add noise: Reviewed-by: Imre Deak <imre.deak@intel.com> The rule could be then to never add errors for known BIOS issues. > --- > drivers/gpu/drm/i915/display/intel_tc.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c > index 8f67aef18b2d..6155ea6127a4 100644 > --- a/drivers/gpu/drm/i915/display/intel_tc.c > +++ b/drivers/gpu/drm/i915/display/intel_tc.c > @@ -228,9 +228,9 @@ static void tc_port_fixup_legacy_flag(struct intel_digital_port *dig_port, > return; > > /* If live status mismatches the VBT flag, trust the live status. */ > - drm_err(&i915->drm, > - "Port %s: live status %08x mismatches the legacy port flag, fix flag\n", > - dig_port->tc_port_name, live_status_mask); > + drm_dbg_kms(&i915->drm, > + "Port %s: live status %08x mismatches the legacy port flag %08x, fixing flag\n", > + dig_port->tc_port_name, live_status_mask, valid_hpd_mask); > > dig_port->tc_legacy_port = !dig_port->tc_legacy_port; > } > -- > 2.20.1 >
diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c index 8f67aef18b2d..6155ea6127a4 100644 --- a/drivers/gpu/drm/i915/display/intel_tc.c +++ b/drivers/gpu/drm/i915/display/intel_tc.c @@ -228,9 +228,9 @@ static void tc_port_fixup_legacy_flag(struct intel_digital_port *dig_port, return; /* If live status mismatches the VBT flag, trust the live status. */ - drm_err(&i915->drm, - "Port %s: live status %08x mismatches the legacy port flag, fix flag\n", - dig_port->tc_port_name, live_status_mask); + drm_dbg_kms(&i915->drm, + "Port %s: live status %08x mismatches the legacy port flag %08x, fixing flag\n", + dig_port->tc_port_name, live_status_mask, valid_hpd_mask); dig_port->tc_legacy_port = !dig_port->tc_legacy_port; }
If the VBT assigned tc->legacy_port mismatches the live_status indicator for the connector, we ignore the VBT directive and switch over to the HW setting. This is not a driver error, unless we happen to misparse the VBT or the live_status registers. However, for the system in CI where the error is only reported on 1 port out of 4, the evidence indicates the VBT is wrong. Stop flaging this as an error since the cause is beyond our control, fixup the mistake and continue on. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/i915/display/intel_tc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)