From e99278fcf8d69d14c44cda2677c956bc800f2c58 Mon Sep 17 00:00:00 2001 From: Ed Baker Date: Thu, 2 Sep 2021 16:03:24 -0700 Subject: [PATCH] frontends/va: Fix test_va_api VAAPIDisplayAttribs tests Set max_display_attribs to 0 instead of 1 to match va[Query,Get,Set]DisplayAttributes implementations [1]. If max_display_attribs is greater than 0 libva-utils tests check vaQueryDisplayAttributes() accordingly [2]. [1] https://gitlab.freedesktop.org/mesa/mesa/-/blob/2de348cdb01e45/src/gallium/frontends/va/display.c#L32 [2] https://github.com/intel/libva-utils/blob/master/test/test_va_api_display_attribs.cpp#L90 Signed-off-by: Ed Baker Part-of: --- src/gallium/frontends/va/context.c | 2 +- src/gallium/frontends/va/display.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/frontends/va/context.c b/src/gallium/frontends/va/context.c index e036c4d99bf..665187cd410 100644 --- a/src/gallium/frontends/va/context.c +++ b/src/gallium/frontends/va/context.c @@ -179,7 +179,7 @@ VA_DRIVER_INIT_FUNC(VADriverContextP ctx) ctx->max_attributes = 1; ctx->max_image_formats = VL_VA_MAX_IMAGE_FORMATS; ctx->max_subpic_formats = 1; - ctx->max_display_attributes = 1; + ctx->max_display_attributes = 0; snprintf(drv->vendor_string, sizeof(drv->vendor_string), "Mesa Gallium driver " PACKAGE_VERSION " for %s", diff --git a/src/gallium/frontends/va/display.c b/src/gallium/frontends/va/display.c index 3d0fe09ca61..c72d2f38dca 100644 --- a/src/gallium/frontends/va/display.c +++ b/src/gallium/frontends/va/display.c @@ -35,7 +35,7 @@ vlVaQueryDisplayAttributes(VADriverContextP ctx, VADisplayAttribute *attr_list, return VA_STATUS_ERROR_INVALID_CONTEXT; if (!(attr_list && num_attributes)) - return VA_STATUS_ERROR_UNKNOWN; + return VA_STATUS_ERROR_UNIMPLEMENTED; *num_attributes = 0;