diff --git a/src/gallium/frontends/va/context.c b/src/gallium/frontends/va/context.c
index d1281d58dd5..f9367820a2d 100644
--- a/src/gallium/frontends/va/context.c
+++ b/src/gallium/frontends/va/context.c
@@ -214,7 +214,11 @@ VA_DRIVER_INIT_FUNC(VADriverContextP ctx)
    ctx->max_attributes = 1;
    ctx->max_image_formats = VL_VA_MAX_IMAGE_FORMATS;
    ctx->max_subpic_formats = 1;
+#if VA_CHECK_VERSION(1, 15, 0)
+   ctx->max_display_attributes = 1; /* VADisplayPCIID */
+#else
    ctx->max_display_attributes = 0;
+#endif
 
    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 c72d2f38dca..c189ec98069 100644
--- a/src/gallium/frontends/va/display.c
+++ b/src/gallium/frontends/va/display.c
@@ -26,6 +26,7 @@
  *
  **************************************************************************/
 
+#include "vl/vl_winsys.h"
 #include "va_private.h"
 
 VAStatus
@@ -34,21 +35,62 @@ vlVaQueryDisplayAttributes(VADriverContextP ctx, VADisplayAttribute *attr_list,
    if (!ctx)
       return VA_STATUS_ERROR_INVALID_CONTEXT;
 
-   if (!(attr_list && num_attributes))
+   if (ctx->max_display_attributes <= 0)
       return VA_STATUS_ERROR_UNIMPLEMENTED;
 
+   if (!(attr_list && num_attributes))
+      return VA_STATUS_ERROR_INVALID_PARAMETER;
+
    *num_attributes = 0;
 
-   return VA_STATUS_SUCCESS;
+#if VA_CHECK_VERSION(1, 15, 0)
+   attr_list->type = VADisplayPCIID;
+   (*num_attributes)++;
+#endif
+
+   return vlVaGetDisplayAttributes(ctx, attr_list, *num_attributes);
 }
 
 VAStatus
 vlVaGetDisplayAttributes(VADriverContextP ctx, VADisplayAttribute *attr_list, int num_attributes)
 {
+   struct pipe_screen *pscreen;
+
    if (!ctx)
       return VA_STATUS_ERROR_INVALID_CONTEXT;
 
-   return VA_STATUS_ERROR_UNIMPLEMENTED;
+   if (ctx->max_display_attributes <= 0)
+      return VA_STATUS_ERROR_UNIMPLEMENTED;
+
+   pscreen = VL_VA_PSCREEN(ctx);
+
+   if (!pscreen)
+      return VA_STATUS_ERROR_INVALID_CONTEXT;
+
+   if (!attr_list)
+      return VA_STATUS_ERROR_INVALID_PARAMETER;
+
+   for (unsigned i = 0; i < num_attributes; i++) {
+      switch (attr_list->type) {
+#if VA_CHECK_VERSION(1, 15, 0)
+      case VADisplayPCIID: {
+         uint32_t vendor_id = pscreen->get_param(pscreen, PIPE_CAP_VENDOR_ID);
+         uint32_t device_id = pscreen->get_param(pscreen, PIPE_CAP_DEVICE_ID);
+         attr_list->min_value = attr_list->max_value = attr_list->value = (vendor_id << 16) | (device_id & 0xFFFF);
+         attr_list->flags = VA_DISPLAY_ATTRIB_GETTABLE;
+         break;
+      }
+#endif
+      default:
+         /* Only attributes returned with VA_DISPLAY_ATTRIB_GETTABLE set in the "flags" field
+          * from vaQueryDisplayAttributes() can have their values retrieved.
+          */
+         break;
+      }
+      attr_list++;
+   }
+
+   return VA_STATUS_SUCCESS;
 }
 
 VAStatus