x11: allow disabling DRI3 via LIBVA_DRI3_DISABLE env var

evelikov-work · XinfengZhang · commit 3ac96ade4802 · 2023-06-08T22:01:07.000+08:00
There are some corner cases where DRI3 does not work correctly. While
bug reports are appreciated, this enables users to get back to their
machines in meaningful way - aka w/o having to rebuild libva.

Signed-off-by: Emil Velikov &lt;emil.velikov@collabora.com&gt;
diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c
@@ -211,9 +211,10 @@ static VAStatus va_DisplayContextGetDriverNames(
     char **drivers, unsigned *num_drivers
 )
 {
-    VAStatus vaStatus;
+    VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN;
 
-    vaStatus = va_DRI3_GetDriverNames(pDisplayContext, drivers, num_drivers);
+    if (!getenv("LIBVA_DRI3_DISABLE"))
+        vaStatus = va_DRI3_GetDriverNames(pDisplayContext, drivers, num_drivers);
     if (vaStatus != VA_STATUS_SUCCESS)
         vaStatus = va_DRI2_GetDriverNames(pDisplayContext, drivers, num_drivers);
 #ifdef HAVE_NVCTRL

Original file line number	Diff line number	Diff line change
`@@ -211,9 +211,10 @@ static VAStatus va_DisplayContextGetDriverNames(`
`211`	`211`	`char *drivers, unsigned num_drivers`
`212`	`212`	`)`
`213`	`213`	`{`
`214`		`- VAStatus vaStatus;`
	`214`	`+ VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN;`
`215`	`215`
`216`		`- vaStatus = va_DRI3_GetDriverNames(pDisplayContext, drivers, num_drivers);`
	`216`	`+ if (!getenv("LIBVA_DRI3_DISABLE"))`
	`217`	`+ vaStatus = va_DRI3_GetDriverNames(pDisplayContext, drivers, num_drivers);`
`217`	`218`	`if (vaStatus != VA_STATUS_SUCCESS)`
`218`	`219`	`vaStatus = va_DRI2_GetDriverNames(pDisplayContext, drivers, num_drivers);`
`219`	`220`	`#ifdef HAVE_NVCTRL`