From patchwork Fri Nov 13 23:15:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bas Nieuwenhuizen X-Patchwork-Id: 23620 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1A4A4448D84 for ; Sat, 14 Nov 2020 02:17:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE08C68C176; Sat, 14 Nov 2020 02:17:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A8B668BF4B for ; Sat, 14 Nov 2020 02:17:49 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id d12so12042081wrr.13 for ; Fri, 13 Nov 2020 16:17:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=basnieuwenhuizen.nl; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wdraLNhYZ9Stj6w9rTq8e9/gYBy8QSA95tgI7ihdqyI=; b=gj9VrDOLGPsjOFof99k2d0IEKNs3hlWTL2DQjV3Yvweg+Co3Pt4aNmx/jzV0P0dao0 CaYnTm/nyz8lUuiOPsD08kaOKgLwx//qgK4uGw+3Qcaz8GX0PQYpSQgY3vpTqjz31HqL W3kB1vh3Mni3jywKHsrzEDc3gAncEFpshoDB5Ss/w8pxvESyek/zs0CVYQX+PcRhFo+T vAHgSz6hFhLczFZWUzyBHL6x6jCClkyFpE8djDi6d/two//aK+rO9b6eQDqY8lDRtpNO oEn2oH9vwpYF8MshRJOyhEDR+znqD0zhvlffiS51dKWSFQJDHvIjObhxJgKjKftcet3F HTjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wdraLNhYZ9Stj6w9rTq8e9/gYBy8QSA95tgI7ihdqyI=; b=p37mX1ispZP2XD1KsdpJTQPOAA/jgyirzyDs4XiSrf0nGoUOnn94a2ez0iqZwAnrHM 0jTBEPyKWLKG0tDZfnM28apd0LyuqBroQAwB1u2K+ocRwYrKaqH/wo9tQZpqJip1abKM veEWa4cEsmFJMQ4HGLjokpsVQliy3wTY2NYOUFKBzDonxzObA2V8cqLw4OsKqYhEtLUU /slehnCofHdHhJ/Joi7hcCEtQIdGbHvlzeJzzOD3RCsCWFigPz+D5EN8D5BLZVuESUpH lTqmStOYVHpqaBAaDzBh/TtgrAlEZJliECjkNBsXQ8f8kN2oLPNcOjfUrXdUVl79C47y wRZQ== X-Gm-Message-State: AOAM530O9s6bMuoK9qDAS+qnvXN+CYJly5Ttt26JiASRsv8Rb2ljtgjN CXS2/Xq1uXBwvHETxhj+htnwnQRFc/cuCk6O X-Google-Smtp-Source: ABdhPJyxGvJF4iXUGenARcMSP2itDLXL205w4CP4Sc0RH0WSTQFNMRDB3ayXNpRpUAQX8gIQ1ghBJw== X-Received: by 2002:adf:cd8d:: with SMTP id q13mr6387665wrj.61.1605309343409; Fri, 13 Nov 2020 15:15:43 -0800 (PST) Received: from localhost.localdomain ([2a02:aa12:a77f:2000:4cea:81e7:5fd4:93f7]) by smtp.gmail.com with ESMTPSA id a17sm13633512wra.61.2020.11.13.15.15.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 15:15:42 -0800 (PST) From: Bas Nieuwenhuizen To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Nov 2020 00:15:46 +0100 Message-Id: <20201113231548.869559-1-bas@basnieuwenhuizen.nl> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] kmsgrab: Use invalid modifier if modifiers weren't used. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: sw@jkqxz.net, Bas Nieuwenhuizen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The kernel defaults to initializing the field to 0 when modifiers are not used and this happens to be linear. If we end up actually passing the modifier to a driver, tiling issues happen. So if the kernel doesn't return a modifier set it explicitly to INVALID. That way later processing knows there is no explicit modifier. v2: Fix support for modifier overrides in case the getfb2 call does not return a modifier. --- libavdevice/kmsgrab.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/libavdevice/kmsgrab.c b/libavdevice/kmsgrab.c index a0aa9dc22f..b740a32171 100644 --- a/libavdevice/kmsgrab.c +++ b/libavdevice/kmsgrab.c @@ -160,6 +160,7 @@ static int kmsgrab_get_fb2(AVFormatContext *avctx, KMSGrabContext *ctx = avctx->priv_data; drmModeFB2 *fb; int err, i, nb_objects; + uint64_t modifier = ctx->drm_format_modifier; fb = drmModeGetFB2(ctx->hwctx->fd, plane->fb_id); if (!fb) { @@ -195,6 +196,9 @@ static int kmsgrab_get_fb2(AVFormatContext *avctx, goto fail; } + if (fb->flags & DRM_MODE_FB_MODIFIERS) + modifier = fb->modifier; + *desc = (AVDRMFrameDescriptor) { .nb_layers = 1, .layers[0] = { @@ -243,7 +247,7 @@ static int kmsgrab_get_fb2(AVFormatContext *avctx, desc->objects[obj] = (AVDRMObjectDescriptor) { .fd = fd, .size = size, - .format_modifier = fb->modifier, + .format_modifier = modifier, }; desc->layers[0].planes[i] = (AVDRMPlaneDescriptor) { .object_index = obj, @@ -557,15 +561,18 @@ static av_cold int kmsgrab_read_header(AVFormatContext *avctx) err = AVERROR(EINVAL); goto fail; } - if (ctx->drm_format_modifier != DRM_FORMAT_MOD_INVALID && - ctx->drm_format_modifier != fb2->modifier) { - av_log(avctx, AV_LOG_ERROR, "Framebuffer format modifier " - "%"PRIx64" does not match expected modifier.\n", - fb2->modifier); - err = AVERROR(EINVAL); - goto fail; - } else { - ctx->drm_format_modifier = fb2->modifier; + + if (fb2->flags & DRM_MODE_FB_MODIFIERS) { + if (ctx->drm_format_modifier != DRM_FORMAT_MOD_INVALID && + ctx->drm_format_modifier != fb2->modifier) { + av_log(avctx, AV_LOG_ERROR, "Framebuffer format modifier " + "%"PRIx64" does not match expected modifier.\n", + fb2->modifier); + err = AVERROR(EINVAL); + goto fail; + } else { + ctx->drm_format_modifier = fb2->modifier; + } } av_log(avctx, AV_LOG_VERBOSE, "Format is %s, from " "DRM format %"PRIx32" modifier %"PRIx64".\n", From patchwork Fri Nov 13 23:15:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bas Nieuwenhuizen X-Patchwork-Id: 23618 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id ED8AA44B79C for ; Sat, 14 Nov 2020 01:21:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C459168C1E3; Sat, 14 Nov 2020 01:21:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB3E6688178 for ; Sat, 14 Nov 2020 01:21:19 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id c16so12745191wmd.2 for ; Fri, 13 Nov 2020 15:21:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=basnieuwenhuizen.nl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JkTw24uOsna04k8mAT0eXu+Q/PbNdhJluMnf/0EGq4A=; b=QQtWptQJo40ozEO2LeggIolM5gA+MrayOIhLUGvWsttDNSojUGwKv1sXU65BsjSZRa 2toshTwSK/nMkK7mCQGNBMZyPo5duMEBUbj07ykK2Uoi7Dernu3Y4AN1PRyv9Jav+t+8 tHjveMN2MlMDr4Wgwh/bxYEx9ynxWECqBFLyMbmvy9LAuw1/+JINJZ7GSYvmy6a+DRKT 672+OF44CKu5HfU5dU5E4YnA30XEU+iYBj8Pg7j7+bViXoAKkt6INTsFVur1bkrWEqQF FIOUeguOR6P0UvRkLu5Z4KJZTtFcVRDE37bBBi62uIvsKSZALCOceAjW86BHgxAVhhQ3 7rNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JkTw24uOsna04k8mAT0eXu+Q/PbNdhJluMnf/0EGq4A=; b=CaiRFPDkabQVg0vwFKkOWBgnlKdPGIA1dCXLQfRN0jvsGYPdBzCpzLMrlVjRj9aKeF bSOKhD7eSn9/oVq9px3Ua5q74X0zcjbmgevk8kRDLYqAiHYrUnflwuq09ueHJ7I91lNg 2H3gdp2cUNEZXxa2Ek105bZEQgbE+vvvo+MsKx69h6N7mXaSXXtT53tpQbssxRfI/3v+ 9TwBx+e0fngeio/anGtJwJqLQ2li0qCzBTDc9SbGwCqQ84hi9mbBrEOr4MA5cLGiCLU0 C4QgdxN8pu35YYY3rDh2x4BeMcKRBNdvVB+4+g40Uabk5YiEO/Ip+S3UwYZp9VStHA7j HfVw== X-Gm-Message-State: AOAM532OWUkhjZhG/bRam/ttoOPrfQUfxysUbjUT73OBcY7ZYIl29qf4 QOmVO4W5Nqd3EJmI1rFv5aAkMxviApoh/0IC X-Google-Smtp-Source: ABdhPJw42fPidA6JRRGJoXARUA7ujo4LzvBA95AaBg4044FEcc2JpV1swWYU0Ipe1R9At/0qgdrnRA== X-Received: by 2002:a7b:c1d2:: with SMTP id a18mr4833220wmj.41.1605309344695; Fri, 13 Nov 2020 15:15:44 -0800 (PST) Received: from localhost.localdomain ([2a02:aa12:a77f:2000:4cea:81e7:5fd4:93f7]) by smtp.gmail.com with ESMTPSA id a17sm13633512wra.61.2020.11.13.15.15.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 15:15:43 -0800 (PST) From: Bas Nieuwenhuizen To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Nov 2020 00:15:47 +0100 Message-Id: <20201113231548.869559-2-bas@basnieuwenhuizen.nl> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201113231548.869559-1-bas@basnieuwenhuizen.nl> References: <20201113231548.869559-1-bas@basnieuwenhuizen.nl> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] kmsgrab: Do not require the modifier to stay constant. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: sw@jkqxz.net, Bas Nieuwenhuizen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" As we get a new set of objects each frame anyway, we do not gain anything by keeping the modifier constant. This helps with capturing when switching your setup a bit, e.g. from ingame to desktop or from X11 to wayland. --- libavdevice/kmsgrab.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavdevice/kmsgrab.c b/libavdevice/kmsgrab.c index b740a32171..94e32b9cae 100644 --- a/libavdevice/kmsgrab.c +++ b/libavdevice/kmsgrab.c @@ -176,13 +176,6 @@ static int kmsgrab_get_fb2(AVFormatContext *avctx, err = AVERROR(EIO); goto fail; } - if (fb->modifier != ctx->drm_format_modifier) { - av_log(avctx, AV_LOG_ERROR, "Plane %"PRIu32" framebuffer " - "format modifier changed: now %"PRIx64".\n", - ctx->plane_id, fb->modifier); - err = AVERROR(EIO); - goto fail; - } if (fb->width != ctx->width || fb->height != ctx->height) { av_log(avctx, AV_LOG_ERROR, "Plane %"PRIu32" framebuffer " "dimensions changed: now %"PRIu32"x%"PRIu32".\n", From patchwork Fri Nov 13 23:15:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bas Nieuwenhuizen X-Patchwork-Id: 23619 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3210444B79C for ; Sat, 14 Nov 2020 01:21:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B9B768C227; Sat, 14 Nov 2020 01:21:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41DB068C1F4 for ; Sat, 14 Nov 2020 01:21:24 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id c16so12745958wmd.2 for ; Fri, 13 Nov 2020 15:21:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=basnieuwenhuizen.nl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ns545DJDsGZNC/HXQC43/Bk6lcl0uMVrhR/kHD/hOGE=; b=Xi6nfgyu8yk+t8lvDQXewL6Qwiov+/5pSydxBOAKVRR2DWEKcc+lXXeNALSdzxKSGO HHwA7SessoYkI2BrOnrl9CsPX6czDQUuOM56rzWIPiEqtMi/MOf0zweDCdEHlEScpbmr 9X61Lu0JJgLP+G7eQdHDH7GnKF+M2E4A7iS3p2ASUeVz6s0rJ0syETnVbdVd8oWO6HSG HnXUzj4lb8aRj5n4mdjEedQLeKXVsqrWMbyj1yDIDy0aQ3xqUxc12P50bTu19zwZDVh1 ZfBfeBMVPA48eLZd9tOBB3L6f7tZRh8W+DitFksVNv4wBeb+y7jouHVnzB7UH+Wa4Lcn Pcfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ns545DJDsGZNC/HXQC43/Bk6lcl0uMVrhR/kHD/hOGE=; b=oB2vME89cwGgubhvkVTr2iH0qev096rPrYjX/TseZJY4CP+Pn7C2ZNPJh4KDkvCS7H zCsMEiurnlOyyZFRfj1JDaY3R5I1TliETYNhBrS6cEuqEdFs2KBP11cCuEx5DBQ+UaeN 0vRBSViemyYe/lAj7RXIkTGOtQ59LxB7O36drzVh3i4xWK+fUVAIZsiJiJjeNuy/U1kk Qvj1Z8kLjFbqBlZeSsWoTiNPWV/weClV3pwbURe7aDM8Ko8espSZA0fU9wUWXW6QY9ZR 8uk8Z3OV0AQT1qvWIqsH25KP9I7ydlEi5AcpaF1kAboRpJWJRhxRWDFJpMzE4jJKHDcT ISlg== X-Gm-Message-State: AOAM533LIwquyPf12zpXYnaEATdzCJhWX+Hnjp2l0p2e+abfI2mt3KUM hARzFeMCypyPeXsr6bRw12PHAobkXjRWfSCC X-Google-Smtp-Source: ABdhPJziSfMs+OaWwRy1EZvaduKonwMGFBTmOK3OK12oWEjSYWW2GRO0h3iNm7itEDj9XcNNIqS2VA== X-Received: by 2002:a05:600c:21d5:: with SMTP id x21mr4947906wmj.133.1605309345701; Fri, 13 Nov 2020 15:15:45 -0800 (PST) Received: from localhost.localdomain ([2a02:aa12:a77f:2000:4cea:81e7:5fd4:93f7]) by smtp.gmail.com with ESMTPSA id a17sm13633512wra.61.2020.11.13.15.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 15:15:45 -0800 (PST) From: Bas Nieuwenhuizen To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Nov 2020 00:15:48 +0100 Message-Id: <20201113231548.869559-3-bas@basnieuwenhuizen.nl> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201113231548.869559-1-bas@basnieuwenhuizen.nl> References: <20201113231548.869559-1-bas@basnieuwenhuizen.nl> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/3] hwcontext_vaapi: Use PRIME_2 memory type for modifiers. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: sw@jkqxz.net, Bas Nieuwenhuizen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This way we can pass explicit modifiers in. Sometimes the modifier matters for the number of memory planes that libva accepts, in particular when dealing with driver-compressed textures. Furthermore the driver might not actually be able to determine the implicit modifier if all the buffer-passing has used explicit modifier. All these issues should be resolved by passing in the modifier, and for that we switch to using the PRIME_2 memory type. Tested with experimental radeonsi patches for modifiers and kmsgrab. Also tested with radeonsi without the patches to double-check it works without PRIME_2 support. v2: Cache PRIME_2 support to avoid doing two calls every time on libva drivers that do not support it. --- libavutil/hwcontext_vaapi.c | 158 ++++++++++++++++++++++++++---------- 1 file changed, 115 insertions(+), 43 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 2227d6ed69..62b5a163ee 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -79,6 +79,9 @@ typedef struct VAAPIFramesContext { unsigned int rt_format; // Whether vaDeriveImage works. int derive_works; + // Caches whether VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2 is unsupported for + // surface imports. + int prime_2_import_unsupported; } VAAPIFramesContext; typedef struct VAAPIMapping { @@ -1022,6 +1025,7 @@ static void vaapi_unmap_from_drm(AVHWFramesContext *dst_fc, static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst, const AVFrame *src, int flags) { + VAAPIFramesContext *src_vafc = src_fc->internal->priv; AVHWFramesContext *dst_fc = (AVHWFramesContext*)dst->hw_frames_ctx->data; AVVAAPIDeviceContext *dst_dev = dst_fc->device_ctx->hwctx; @@ -1029,25 +1033,10 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst, const VAAPIFormatDescriptor *format_desc; VASurfaceID surface_id; VAStatus vas; + VAStatus prime2_vas = VA_STATUS_SUCCESS; + int use_prime2; uint32_t va_fourcc; - int err, i, j, k; - - unsigned long buffer_handle; - VASurfaceAttribExternalBuffers buffer_desc; - VASurfaceAttrib attrs[2] = { - { - .type = VASurfaceAttribMemoryType, - .flags = VA_SURFACE_ATTRIB_SETTABLE, - .value.type = VAGenericValueTypeInteger, - .value.value.i = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME, - }, - { - .type = VASurfaceAttribExternalBufferDescriptor, - .flags = VA_SURFACE_ATTRIB_SETTABLE, - .value.type = VAGenericValueTypePointer, - .value.value.p = &buffer_desc, - } - }; + int err, i, j; desc = (AVDRMFrameDescriptor*)src->data[0]; @@ -1083,35 +1072,115 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst, format_desc = vaapi_format_from_fourcc(va_fourcc); av_assert0(format_desc); - buffer_handle = desc->objects[0].fd; - buffer_desc.pixel_format = va_fourcc; - buffer_desc.width = src_fc->width; - buffer_desc.height = src_fc->height; - buffer_desc.data_size = desc->objects[0].size; - buffer_desc.buffers = &buffer_handle; - buffer_desc.num_buffers = 1; - buffer_desc.flags = 0; - - k = 0; - for (i = 0; i < desc->nb_layers; i++) { - for (j = 0; j < desc->layers[i].nb_planes; j++) { - buffer_desc.pitches[k] = desc->layers[i].planes[j].pitch; - buffer_desc.offsets[k] = desc->layers[i].planes[j].offset; - ++k; + use_prime2 = !src_vafc->prime_2_import_unsupported && + desc->objects[0].format_modifier != DRM_FORMAT_MOD_INVALID; + if (use_prime2) { + VADRMPRIMESurfaceDescriptor prime_desc; + VASurfaceAttrib prime_attrs[2] = { + { + .type = VASurfaceAttribMemoryType, + .flags = VA_SURFACE_ATTRIB_SETTABLE, + .value.type = VAGenericValueTypeInteger, + .value.value.i = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME_2, + }, + { + .type = VASurfaceAttribExternalBufferDescriptor, + .flags = VA_SURFACE_ATTRIB_SETTABLE, + .value.type = VAGenericValueTypePointer, + .value.value.p = &prime_desc, + } + }; + prime_desc.fourcc = va_fourcc; + prime_desc.width = src_fc->width; + prime_desc.height = src_fc->height; + prime_desc.num_objects = desc->nb_objects; + for (i = 0; i < desc->nb_objects; ++i) { + prime_desc.objects[i].fd = desc->objects[i].fd; + prime_desc.objects[i].size = desc->objects[i].size; + prime_desc.objects[i].drm_format_modifier = + desc->objects[i].format_modifier; + } + + prime_desc.num_layers = desc->nb_layers; + for (i = 0; i < desc->nb_layers; ++i) { + prime_desc.layers[i].drm_format = desc->layers[i].format; + prime_desc.layers[i].num_planes = desc->layers[i].nb_planes; + for (j = 0; j < desc->layers[i].nb_planes; ++j) { + prime_desc.layers[i].object_index[j] = + desc->layers[i].planes[j].object_index; + prime_desc.layers[i].offset[j] = desc->layers[i].planes[j].offset; + prime_desc.layers[i].pitch[j] = desc->layers[i].planes[j].pitch; + } + + if (format_desc->chroma_planes_swapped && + desc->layers[i].nb_planes == 3) { + FFSWAP(uint32_t, prime_desc.layers[i].pitch[1], + prime_desc.layers[i].pitch[2]); + FFSWAP(uint32_t, prime_desc.layers[i].offset[1], + prime_desc.layers[i].offset[2]); + } } - } - buffer_desc.num_planes = k; - if (format_desc->chroma_planes_swapped && - buffer_desc.num_planes == 3) { - FFSWAP(uint32_t, buffer_desc.pitches[1], buffer_desc.pitches[2]); - FFSWAP(uint32_t, buffer_desc.offsets[1], buffer_desc.offsets[2]); + /* + * We can query for PRIME_2 support with vaQuerySurfaceAttributes, but that + * that needs the config_id which we don't have here . Both Intel and + * Gallium seem to do the correct error checks, so lets just try the + * PRIME_2 import first. + */ + prime2_vas = vaCreateSurfaces(dst_dev->display, format_desc->rt_format, + src->width, src->height, &surface_id, 1, + prime_attrs, FF_ARRAY_ELEMS(prime_attrs)); } - vas = vaCreateSurfaces(dst_dev->display, format_desc->rt_format, - src->width, src->height, - &surface_id, 1, - attrs, FF_ARRAY_ELEMS(attrs)); + if (prime2_vas != VA_STATUS_SUCCESS || !use_prime2) { + int k; + unsigned long buffer_handle; + VASurfaceAttribExternalBuffers buffer_desc; + VASurfaceAttrib buffer_attrs[2] = { + { + .type = VASurfaceAttribMemoryType, + .flags = VA_SURFACE_ATTRIB_SETTABLE, + .value.type = VAGenericValueTypeInteger, + .value.value.i = VA_SURFACE_ATTRIB_MEM_TYPE_DRM_PRIME, + }, + { + .type = VASurfaceAttribExternalBufferDescriptor, + .flags = VA_SURFACE_ATTRIB_SETTABLE, + .value.type = VAGenericValueTypePointer, + .value.value.p = &buffer_desc, + } + }; + + buffer_handle = desc->objects[0].fd; + buffer_desc.pixel_format = va_fourcc; + buffer_desc.width = src_fc->width; + buffer_desc.height = src_fc->height; + buffer_desc.data_size = desc->objects[0].size; + buffer_desc.buffers = &buffer_handle; + buffer_desc.num_buffers = 1; + buffer_desc.flags = 0; + + k = 0; + for (i = 0; i < desc->nb_layers; i++) { + for (j = 0; j < desc->layers[i].nb_planes; j++) { + buffer_desc.pitches[k] = desc->layers[i].planes[j].pitch; + buffer_desc.offsets[k] = desc->layers[i].planes[j].offset; + ++k; + } + } + buffer_desc.num_planes = k; + + if (format_desc->chroma_planes_swapped && + buffer_desc.num_planes == 3) { + FFSWAP(uint32_t, buffer_desc.pitches[1], buffer_desc.pitches[2]); + FFSWAP(uint32_t, buffer_desc.offsets[1], buffer_desc.offsets[2]); + } + + vas = vaCreateSurfaces(dst_dev->display, format_desc->rt_format, + src->width, src->height, + &surface_id, 1, + buffer_attrs, FF_ARRAY_ELEMS(buffer_attrs)); + } if (vas != VA_STATUS_SUCCESS) { av_log(dst_fc, AV_LOG_ERROR, "Failed to create surface from DRM " "object: %d (%s).\n", vas, vaErrorStr(vas)); @@ -1119,6 +1188,9 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst, } av_log(dst_fc, AV_LOG_DEBUG, "Create surface %#x.\n", surface_id); + if (prime2_vas != VA_STATUS_SUCCESS) + src_vafc->prime_2_import_unsupported = 1; + err = ff_hwframe_map_create(dst->hw_frames_ctx, dst, src, &vaapi_unmap_from_drm, (void*)(uintptr_t)surface_id);