diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c index 242e6e7c3..1d9e396a1 100644 --- a/va/x11/va_x11.c +++ b/va/x11/va_x11.c @@ -77,8 +77,34 @@ static VAStatus va_DisplayContextGetDriverNames( { VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN; - if (!getenv("LIBVA_DRI3_DISABLE")) + if (!getenv("LIBVA_DRI3_DISABLE")) { + unsigned old_num_drivers = *num_drivers; + vaStatus = va_DRI3_GetDriverNames(pDisplayContext, drivers, num_drivers); + /* As of 8 July 2023, i965 and iHD drivers lack DRI3 support. + * + * Requests by the community were raised as early as 29 July 2017, + * with DRI3 support landing in libva on the 27 September 2022. At of + * time of writing it's unknown if/when that would materialise. + * + * To handle this on libva level, we are explicitly disabling DRI3 + * support on said drivers - it scales better than having every user + * to set the environment override listed above. + */ + if (vaStatus == VA_STATUS_SUCCESS) { + for (unsigned i = 0; i < *num_drivers; i++) { + if (drivers[i] && (!strcmp(drivers[i], "iHD") || + !strcmp(drivers[i], "i965"))) + vaStatus = VA_STATUS_ERROR_UNKNOWN; + } + if (vaStatus == VA_STATUS_ERROR_UNKNOWN) { + for (unsigned i = 0; i < *num_drivers; i++) + free(drivers[i]); + *num_drivers = old_num_drivers; + } + } + } + if (vaStatus != VA_STATUS_SUCCESS) vaStatus = va_DRI2_GetDriverNames(pDisplayContext, drivers, num_drivers); #ifdef HAVE_NVCTRL