From patchwork Mon Mar 18 07:26:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 47158 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp849035pzb; Mon, 18 Mar 2024 00:27:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWTf5sflh8gV7126rDlcfe8IZ8nFfMnRpyj1BbLOCiwilV76gSpTCh20lkoB7tBYbc6vcsYyU6SVmL+WqirLMZGTRmEsGTvj70nMQ== X-Google-Smtp-Source: AGHT+IHUQBEp/T3VpEk0nhdFGlmnF+u4Y1FugrB+1zJGuEQ9Et9pr9VTuu6zJmjZgiWYAQDjKXso X-Received: by 2002:a2e:99c5:0:b0:2d4:ad34:85a7 with SMTP id l5-20020a2e99c5000000b002d4ad3485a7mr751019ljj.29.1710746850919; Mon, 18 Mar 2024 00:27:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710746850; cv=none; d=google.com; s=arc-20160816; b=xfWVgbXchM2dEKbSTTwUljy4AmWod8ZRU7fLLYE1J1tX9w/9mZv4g5oTViuOoz7Wmp xTRRrVZ573+jNprmxziz2X4aDfHaBNIizjMPiC4+DTqiwPnd2S1fnQoy1r2IU9n5sbHh RmmrdkYcgnuCHFTJGHWN8KjGvmYErM2FJgX8TbluC1+aU3Cmc+4Mf1277MOTrYPYQ1AL FfSK6ndbvpPRW+lkDonzJsnR+F0yyM3XklcqsWgqh1fQoC8mAkcw8rJVFSfs0duxHK1h pDRo1ZCyf/u2O/LJHvXAaQh0f3UNo64ofRsIDWKD50/fU5NqHcYim9RpGCLaepVfGEbf cTrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=P+BeApRQo+yQigvxlR6dZ/Wsp2Gz0LkpqiPwPIqfP2o=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=PTu8HkaaWYePqejXiZCM4DCygMEpb+9OzH7u6LGrfuteLoyFng2pDk+ktKXVpfsTJa jIhluQNkfQBMESlIhfwdGotwB9c/TNpsFGejug+aYoGoQwCfG9UqlKRIu+z027S14aDW gcdOTF5VsGTvNAYpeU+1B9QzdbSCrk4GH5EMe39NbXxsKwVk+udL957HelByYXV1iTTd /XzNXkcqmPyE/oiKn3Ctn3uRTrPK8vakliW77aDdn7loKPiUHggBfjwO0AvyLe3SGG0Y NN+bNADaqFRAtkcVuUPxt0Mp8YFEM4c6ahsyJcbJ73d4T/gbyKzx9kqTDSMLpZr9ihb/ bdJA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="i5/vdNrf"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bl15-20020a056402210f00b0056b81c892b6si102129edb.443.2024.03.18.00.27.30; Mon, 18 Mar 2024 00:27:30 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="i5/vdNrf"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F51868D24A; Mon, 18 Mar 2024 09:27:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03FF968D1F9 for ; Mon, 18 Mar 2024 09:27:18 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1710746844; x=1742282844; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=YRQcWuisZUuYotELzwFokt5l9940Swdi0xBQ5gx2T6E=; b=i5/vdNrfVVxLm+3irKj3jH4yDQFo4pxvGT7Qpe1CujYqV0gzfykbYqk/ 9B8mpQwNRg17KGZKPrt8C+OmhBehLAsuCxPN14j0xuhgrIHlLnrOjUBZ6 9VW65jxay6n77NzZMDw4eggnPvLEAeU5v/8wC1UvGg3EJwxvm/czjd4aD 2KyzNJkfVAJJ5STiY1hXJQHQ7FURsyJfeNvCYiAm61iOR+r6pfFnH5dLf cgRilDwAg/XBgeiWK0Cb+6/wLdscrRNpCa90EFMFlEWm0tjyV3eoD4E+g EXWdoXcIcd2TQQD0laSXsz6Ozy14/+Q2SFBC86T/ftjOFF1yTat4ErtDR A==; X-IronPort-AV: E=McAfee;i="6600,9927,11016"; a="5380504" X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="5380504" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2024 00:27:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,134,1708416000"; d="scan'208";a="17990928" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2024 00:27:15 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 15:26:59 +0800 Message-Id: <20240318072659.3641656-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavu/hwcontext_vulkan: check PCI ID if possible X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: d6HKy5fc3xhg From: Haihao Xiang Otherwise the derived device and the source device might have different PCI ID in a multiple-device system. Signed-off-by: Haihao Xiang --- libavutil/hwcontext_vulkan.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 855f099e26..91b9f96ccf 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1597,15 +1597,31 @@ static int vulkan_device_derive(AVHWDeviceContext *ctx, #if CONFIG_VAAPI case AV_HWDEVICE_TYPE_VAAPI: { AVVAAPIDeviceContext *src_hwctx = src_ctx->hwctx; + VADisplay dpy = src_hwctx->display; +#if VA_CHECK_VERSION(1, 15, 0) + VAStatus vas; + VADisplayAttribute attr = { + .type = VADisplayPCIID, + }; +#endif + const char *vendor; - const char *vendor = vaQueryVendorString(src_hwctx->display); - if (!vendor) { - av_log(ctx, AV_LOG_ERROR, "Unable to get device info from VAAPI!\n"); - return AVERROR_EXTERNAL; - } +#if VA_CHECK_VERSION(1, 15, 0) + vas = vaGetDisplayAttributes(dpy, &attr, 1); + if (vas == VA_STATUS_SUCCESS && attr.flags != VA_DISPLAY_ATTRIB_NOT_SUPPORTED) + dev_select.pci_device = (attr.value & 0xFFFF); +#endif + + if (!dev_select.pci_device) { + vendor = vaQueryVendorString(dpy); + if (!vendor) { + av_log(ctx, AV_LOG_ERROR, "Unable to get device info from VAAPI!\n"); + return AVERROR_EXTERNAL; + } - if (strstr(vendor, "AMD")) - dev_select.vendor_id = 0x1002; + if (strstr(vendor, "AMD")) + dev_select.vendor_id = 0x1002; + } return vulkan_device_create_internal(ctx, &dev_select, 0, opts, flags); }