[FFmpeg-cvslog] lavu/hwcontext_vaapi: ignore nonexistent device in default DRM device selection
Haihao Xiang
git at videolan.org
Tue Dec 5 06:52:33 EET 2023
ffmpeg | branch: master | Haihao Xiang <haihao.xiang at intel.com> | Tue Nov 28 13:38:09 2023 +0800| [d36d9994e4273371c457d37b0a161c887ae9f6b1] | committer: Haihao Xiang
lavu/hwcontext_vaapi: ignore nonexistent device in default DRM device selection
It is possible that renderD128 doesn't exist but renderD129 is
available in a system (see [1]). This change can make sure the default
DRM device selection works even if renderD128 doesn't exist.
[1] https://github.com/intel/intel-device-plugins-for-kubernetes/blob/main/cmd/gpu_plugin/README.md#issues-with-media-workloads-on-multi-gpu-setups
Signed-off-by: Haihao Xiang <haihao.xiang at intel.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d36d9994e4273371c457d37b0a161c887ae9f6b1
---
libavutil/hwcontext_vaapi.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
index 12bc95119a..29fc8bd648 100644
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@@ -1733,8 +1733,19 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
"/dev/dri/renderD%d", 128 + n);
priv->drm_fd = open(path, O_RDWR);
if (priv->drm_fd < 0) {
- av_log(ctx, AV_LOG_VERBOSE, "Cannot open "
- "DRM render node for device %d.\n", n);
+ if (errno == ENOENT) {
+ if (n != max_devices - 1) {
+ av_log(ctx, AV_LOG_VERBOSE,
+ "No render device %s, try next device for "
+ "DRM render node.\n", path);
+ continue;
+ }
+
+ av_log(ctx, AV_LOG_VERBOSE, "No available render device "
+ "for DRM render node.\n");
+ } else
+ av_log(ctx, AV_LOG_VERBOSE, "Cannot open "
+ "DRM render node for device %d.\n", n);
break;
}
#if CONFIG_LIBDRM
More information about the ffmpeg-cvslog
mailing list