[Intel-gfx] [PATCH xf86-video-intel] uxa: only call intel_sync_close when built with HAVE_DRI3

[Chris Wilson]

On Mon, Sep 05, 2016 at 09:10:02PM +1000, Jonathan Gray wrote:
> On Mon, Sep 05, 2016 at 10:04:33AM +0100, Chris Wilson wrote:
> > On Fri, Sep 02, 2016 at 08:58:22PM +1000, Jonathan Gray wrote:
> > > Avoid calling a function only built with dri3, fixes an undefined
> > > symbol crash when opting into uxa reported by Walter Alejandro Iglesias
> > > when running OpenBSD.
> > > 
> > > Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
> > > ---
> > >  src/uxa/intel_driver.c | 2 ++
> > >  1 file changed, 2 insertions(+)
> > > 
> > > diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
> > > index 3703c41..9fb05c4 100644
> > > --- a/src/uxa/intel_driver.c
> > > +++ b/src/uxa/intel_driver.c
> > > @@ -1191,7 +1191,9 @@ static Bool I830CloseScreen(CLOSE_SCREEN_ARGS_DECL)
> > >  		intel->dri3 = DRI_NONE;
> > >  	}
> > >  
> > > +#if HAVE_DRI3
> > >  	intel_sync_close(screen);
> > > +#endif
> > 
> > In src/uxa/intel.h, we have
> > 
> > #if HAVE_DRI3
> > Bool intel_sync_init(ScreenPtr screen);
> > void intel_sync_close(ScreenPtr screen);
> > #else
> > static inline Bool intel_sync_init(ScreenPtr screen) { return 0; }
> > static inline void intel_sync_close(ScreenPtr screen) { }
> > #endif
> > 
> > Ideas?
> > -Chris
> 
> Sorry I should have mentioned it was with 2.99.916 which has
> 
> #if HAVE_DRI3
> Bool intel_sync_init(ScreenPtr screen);
> void intel_sync_close(ScreenPtr screen);
> #else
> static inline Bool intel_sync_init(ScreenPtr screen) { return 0; }
> void intel_sync_close(ScreenPtr screen);
> #endif
> 
> As the latest 2.99.917 release was causing some issues on broadwell
> before we made broadwell use modesetting.

That is more likely to be a bug in your kernel.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre