| Message ID | 20231128053810.2441045-1-haihao.xiang@intel.com |
|---|---|
| State | Accepted |
| Commit | d36d9994e4273371c457d37b0a161c887ae9f6b1 |
| Headers | show |
| Series | [FFmpeg-devel,v2] lavu/hwcontext_vaapi: ignore nonexistent device in default DRM device selection | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Di, 2023-11-28 at 13:38 +0800, Xiang, Haihao wrote: > From: Haihao Xiang <haihao.xiang@intel.com> > > 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@intel.com> > --- > 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 Will apply, Haihao
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