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;