* [FFmpeg-devel] [PATCH] lavu/hwcontext_vulkan: check PCI ID if possible
@ 2024-03-18 7:26 Xiang, Haihao
2024-03-18 17:41 ` Lynne
0 siblings, 1 reply; 3+ messages in thread
From: Xiang, Haihao @ 2024-03-18 7:26 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Haihao Xiang
From: Haihao Xiang <haihao.xiang@intel.com>
Otherwise the derived device and the source device might have different
PCI ID in a multiple-device system.
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
---
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);
}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH] lavu/hwcontext_vulkan: check PCI ID if possible
2024-03-18 7:26 [FFmpeg-devel] [PATCH] lavu/hwcontext_vulkan: check PCI ID if possible Xiang, Haihao
@ 2024-03-18 17:41 ` Lynne
2024-03-19 1:41 ` Xiang, Haihao
0 siblings, 1 reply; 3+ messages in thread
From: Lynne @ 2024-03-18 17:41 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Mar 18, 2024, 08:27 by haihao.xiang-at-intel.com@ffmpeg.org:
> From: Haihao Xiang <haihao.xiang@intel.com>
>
> Otherwise the derived device and the source device might have different
> PCI ID in a multiple-device system.
>
> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
> ---
> 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;
>
LGTM
Thanks
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH] lavu/hwcontext_vulkan: check PCI ID if possible
2024-03-18 17:41 ` Lynne
@ 2024-03-19 1:41 ` Xiang, Haihao
0 siblings, 0 replies; 3+ messages in thread
From: Xiang, Haihao @ 2024-03-19 1:41 UTC (permalink / raw)
To: ffmpeg-devel
On Ma, 2024-03-18 at 18:41 +0100, Lynne wrote:
> Mar 18, 2024, 08:27 by haihao.xiang-at-intel.com@ffmpeg.org:
>
> > From: Haihao Xiang <haihao.xiang@intel.com>
> >
> > Otherwise the derived device and the source device might have different
> > PCI ID in a multiple-device system.
> >
> > Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
> > ---
> > 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;
> >
>
> LGTM
Thanks for reviewing the patch, pushed.
BRs
Haihao
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-19 1:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-18 7:26 [FFmpeg-devel] [PATCH] lavu/hwcontext_vulkan: check PCI ID if possible Xiang, Haihao
2024-03-18 17:41 ` Lynne
2024-03-19 1:41 ` Xiang, Haihao
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git