[igt-dev] [PATCH i-g-t 1/3] lib/igt_chamelium: Added toggle for fsm_handling

[Petri Latvala]

On Thu, Feb 18, 2021 at 03:26:57PM +0200, Petri Latvala wrote:
> On Thu, Feb 18, 2021 at 03:08:57PM +0530, Kunal Joshi wrote:
> > Added bool fsm_handling
> > 
> > Signed-off-by: Kunal Joshi <kunal1.joshi at intel.com>
> > ---
> >  lib/igt_chamelium.c | 4 ++--
> >  lib/igt_chamelium.h | 2 ++
> >  2 files changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c
> > index 585fdfa8..0f1bfddc 100644
> > --- a/lib/igt_chamelium.c
> > +++ b/lib/igt_chamelium.c
> > @@ -327,7 +327,7 @@ static xmlrpc_value *__chamelium_rpc_va(struct chamelium *chamelium,
> >  	 * to handle the chamelium attempting FSM, we have to fork into another
> >  	 * thread and have that handle hotplugging displays
> >  	 */
> > -	if (fsm_port) {
> > +	if (fsm_port && fsm_handling) {
> >  		monitor_args.chamelium = chamelium;
> >  		monitor_args.port = fsm_port;
> >  		monitor_args.mon = igt_watch_uevents();
> > @@ -355,7 +355,7 @@ static xmlrpc_value *__chamelium_rpc_va(struct chamelium *chamelium,
> >  		/* i2c error, let's try to retry */
> >  	}
> >  
> > -	if (fsm_port) {
> > +	if (fsm_port && fsm_handling) {
> >  		pthread_cancel(fsm_thread_id);
> >  		pthread_join(fsm_thread_id, NULL);
> >  		igt_cleanup_uevents(monitor_args.mon);
> > diff --git a/lib/igt_chamelium.h b/lib/igt_chamelium.h
> > index 359f4ab3..5177279d 100644
> > --- a/lib/igt_chamelium.h
> > +++ b/lib/igt_chamelium.h
> > @@ -100,6 +100,8 @@ struct chamelium_edid;
> >   */
> >  #define CHAMELIUM_MAX_AUDIO_CHANNELS 8
> >  
> > +bool fsm_handling;
> 
> You need to make this 'extern' and define it in
> lib/igt_chamelium.c. This will fail to build with a gcc that defaults
> to -fno-common (version 10 I think?) instead of -fcommon.

Forgot to mention that it needs to be initialized to true if the tests
are not fiddling with it, right?

Oh and that name is also bad for an externally accessible variable in
the library. igt_chamelium_allow_fsm_handling or something maybe?


-- 
Petri Latvala