[igt-dev] [PATCH i-g-t] lib/igt_eld: Remove requirement for "IGT" named monitor

[Ser, Simon]

On Thu, 2019-06-13 at 13:55 +0100, Kahola, Mika wrote:
> On Thu, 2019-06-13 at 13:53 +0100, Ser, Simon wrote:
> > On Thu, 2019-06-13 at 15:52 +0300, Mika Kahola wrote:
> > > Remove requirement of "IGT" named monitor when checking whether
> > > ALSA
> > > has detected audio capable EDID.
> > > 
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Skipping non-IGT ELD:
> > > /proc/asound/card0/eld#2.0 (monitor name: AthenaDP)
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.1
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.2
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.3
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.4
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.5
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.6
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.7
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.8
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.9
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.10
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.11
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.12
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.13
> > > (kms_hdmi_inject:2306) igt_eld-DEBUG: Monitor not present in ELD:
> > > /proc/asound/card0/eld#2.14
> > > 
> > > As an example, we may find valid ELD on monitor named AthenaDP but
> > > the test itself skips as
> > > the monitor is not named as "IGT".
> > > cat /proc/asound/card0/eld#2.0
> > > monitor_present		1
> > > eld_valid		1
> > > monitor_name		AthenaDP
> > > connection_type		DisplayPort
> > > eld_version		[0x2] CEA-861D or below
> > > edid_version		[0x3] CEA-861-B, C or D
> > > manufacture_id		0x8d4e
> > > product_id		0x2454
> > > port_id			0x0
> > > support_hdcp		0
> > > support_ai		0
> > > audio_sync_delay	0
> > > speakers		[0x1] FL/FR
> > > sad_count		1
> > > sad0_coding_type	[0x1] LPCM
> > > sad0_channels		2
> > > sad0_rates		[0xe0] 32000 44100 48000
> > > sad0_bits		[0xe0000] 16 20 24
> > > 
> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=102370
> > > 
> > > Signed-off-by: Mika Kahola <mika.kahola at intel.com>
> > 
> > -1. We don't want to make the HDMI injection tests succeed because
> > the
> > Chamelium is active.
> So the whole test is useless and could be removed as we have chamelium
> tests now in place?

Nope. Only a few DUTs are connected to a Chamelium device, and the HDMI
injection test is a lot faster than the Chamelium test.

> > Nacked-by: Simon Ser <simon.ser at intel.com>
> > 
> > > ---
> > >  lib/igt_eld.c | 7 -------
> > >  1 file changed, 7 deletions(-)
> > > 
> > > diff --git a/lib/igt_eld.c b/lib/igt_eld.c
> > > index 15dd8ac9..7b3af2d4 100644
> > > --- a/lib/igt_eld.c
> > > +++ b/lib/igt_eld.c
> > > @@ -233,13 +233,6 @@ bool eld_get_igt(struct eld_entry *eld)
> > >  				continue;
> > >  			}
> > >  
> > > -			if (strcmp(eld->monitor_name, "IGT") != 0) {
> > > -				igt_debug("Skipping non-IGT ELD: %s "
> > > -					  "(monitor name: %s)\n",
> > > -					  path, eld->monitor_name);
> > > -				continue;
> > > -			}
> > > -
> > >  			closedir(dir);
> > >  			return true;
> > >  		}