[igt-dev] [PATCH] lib/igt_chamelium: Only plug in the ports configured in the config file
Mark Yacoub
markyacoub at chromium.org
Tue Aug 2 15:49:22 UTC 2022
On Mon, Aug 1, 2022 at 6:04 AM Petri Latvala <petri.latvala at intel.com> wrote:
>
> On Fri, Jul 29, 2022 at 10:25:24AM -0400, Mark Yacoub wrote:
> > On Fri, Jul 29, 2022 at 9:08 AM Petri Latvala <petri.latvala at intel.com> wrote:
> > >
> > > On Fri, Jul 15, 2022 at 03:15:39PM -0400, Mark Yacoub wrote:
> > > > [Why]
> > > > Some Chamelium setups do not have all ports connected.
> > > > On current Chamelium V3, the hardware is limited to only plug in 1 port
> > > > at time. [hardware bug is to be fixed]
> > > > When all prompted to be connected, plugging any port will unplug
> > > > everything before it, which is not what we want.
> > > >
> > > > [How]
> > > > Iterate over the ~/.igtrc config file and only plug the ports there.
> > > > This guarantees that each setup is in control of what makes the most
> > > > sense for it.
> > >
> > >
> > > Doesn't this break autoconfigured setups though?
> > I'm not sure what you mean.
> > From what I saw in the doc, it looks like we write a map for each DUT
> > Display-Chamelium port couple in igtrc.
> > My guess is that each device has 4 ports mapped in igtrc.
> > What the change does is that it iterates over these mapped ports
> > instead of everything, which can include ports that aren't physically
> > connected in any way.
> >
> > What kind of setup is not handled in this case?
>
>
> Looks like autoconfiguration is not documented =(
>
> We have a setup where the port mapping is _not_ written down in
> .igtrc. chamelium_autodiscover() is called if the count of configured
> ports is 0, which will set up a special EDID on all chamelium ports
> and plugs everything, then reads the system connectors looking for
> that special EDID, to construct the mapping automatically.
>
autoconfiguration seems pretty cool.
I have added a workaround in my current chameleon for the time being
and i don't need this change anymore.
I'm abandoning this patch.
>
> --
> Petri Latvala
>
>
>
> > >
> > > CI results for this were useless to determine that for sure, I queued
> > > another round for this series.
> > >
> > >
> > > --
> > > Petri Latvala
> > >
> > >
> > >
> > > >
> > > > Test: ./kms_chamelium --run-subtest dp-hp
> > > > Tested on: Volteer & cv3
> > > >
> > > > Signed-off-by: Mark Yacoub <markyacoub at chromium.org>
> > > > ---
> > > > lib/igt_chamelium.c | 30 ++++++++++++++++++++----------
> > > > lib/igt_chamelium.h | 2 +-
> > > > lib/igt_kms.c | 2 +-
> > > > 3 files changed, 22 insertions(+), 12 deletions(-)
> > > >
> > > > diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c
> > > > index 55cbfa12..c7b99ebc 100644
> > > > --- a/lib/igt_chamelium.c
> > > > +++ b/lib/igt_chamelium.c
> > > > @@ -2830,25 +2830,35 @@ void chamelium_deinit(struct chamelium *chamelium)
> > > > chamelium_deinit_rpc_only(chamelium);
> > > > }
> > > >
> > > > -bool chamelium_plug_all(struct chamelium *chamelium)
> > > > +bool chamelium_plug_all_connected(struct chamelium* chamelium)
> > > > {
> > > > - size_t port_count;
> > > > - int port_ids[CHAMELIUM_MAX_PORTS];
> > > > - xmlrpc_value *v;
> > > > + /* Iterate over all ports in the config file and plug them all. */
> > > > + char** group_list = g_key_file_get_groups(igt_key_file, NULL);
> > > > + int i;
> > > > +
> > > > + for (i = 0; group_list[i] != NULL; i++) {
> > > > + int port_id;
> > > > + GError* error = NULL;
> > > > + xmlrpc_value* v;
> > > > + char* group = group_list[i];
> > > > +
> > > > +
> > > > + if (!strstr(group, "Chamelium:"))
> > > > + continue;
> > > > +
> > > > + port_id = g_key_file_get_integer(igt_key_file, group,
> > > > + "ChameliumPortID",
> > > > + &error);
> > > >
> > > > - port_count = chamelium_get_video_ports(chamelium, port_ids);
> > > > - if (port_count <= 0)
> > > > - return false;
> > > >
> > > > - for (int i = 0; i < port_count; ++i) {
> > > > - v = __chamelium_rpc(chamelium, NULL, "Plug", "(i)", port_ids[i]);
> > > > + v = __chamelium_rpc(chamelium, NULL, "Plug", "(i)", port_id);
> > > >
> > > > if (v != NULL)
> > > > xmlrpc_DECREF(v);
> > > >
> > > > if (chamelium->env.fault_occurred) {
> > > > igt_debug("Chamelium RPC call failed: %s\n",
> > > > - chamelium->env.fault_string);
> > > > + chamelium->env.fault_string);
> > > >
> > > > return false;
> > > > }
> > > > diff --git a/lib/igt_chamelium.h b/lib/igt_chamelium.h
> > > > index f40e848e..78985469 100644
> > > > --- a/lib/igt_chamelium.h
> > > > +++ b/lib/igt_chamelium.h
> > > > @@ -244,7 +244,7 @@ void chamelium_crop_analog_frame(struct chamelium_frame_dump *dump, int width,
> > > > void chamelium_destroy_frame_dump(struct chamelium_frame_dump *dump);
> > > > void chamelium_destroy_audio_file(struct chamelium_audio_file *audio_file);
> > > > void chamelium_infoframe_destroy(struct chamelium_infoframe *infoframe);
> > > > -bool chamelium_plug_all(struct chamelium *chamelium);
> > > > +bool chamelium_plug_all_connected(struct chamelium *chamelium);
> > > > bool chamelium_wait_all_configured_ports_connected(struct chamelium *chamelium,
> > > > int drm_fd);
> > > >
> > > > diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> > > > index d8867f09..81eb1881 100644
> > > > --- a/lib/igt_kms.c
> > > > +++ b/lib/igt_kms.c
> > > > @@ -2349,7 +2349,7 @@ void igt_display_require(igt_display_t *display, int drm_fd)
> > > > if (chamelium) {
> > > > igt_abort_on_f(!chamelium_wait_reachable(chamelium, 20),
> > > > "cannot reach the configured chamelium!\n");
> > > > - igt_abort_on_f(!chamelium_plug_all(chamelium),
> > > > + igt_abort_on_f(!chamelium_plug_all_connected(chamelium),
> > > > "failed to plug all the chamelium ports!\n");
> > > > igt_abort_on_f(!chamelium_wait_all_configured_ports_connected(chamelium, drm_fd),
> > > > "not all configured chamelium ports are connected!\n");
> > > > --
> > > > 2.37.0.170.g444d1eabd0-goog
> > > >
More information about the igt-dev
mailing list