From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D9B9E479D2 for ; Tue, 28 Nov 2023 05:38:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A88A368CCA9; Tue, 28 Nov 2023 07:38:37 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 136AE68C6D3 for ; Tue, 28 Nov 2023 07:38:30 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701149916; x=1732685916; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=yRbkgcOsdjrqyzp3MeThYKvhkF89JotflSBsPn+tnlw=; b=CbBC4RsB7+wh8ZpU0jqELUxMMfr5G5UN1WmLOJL4SYMusiVPLPRN8Sb5 psxkq8+7mRLwSljQT+KAwLjpdwVK1WqkTFN/VBNY2cnAWeoywzxJqQ+/e 7PDPmQ4E7/Dj4hBymd962L2RYS8JjmjldSGYcsZPXqQ/YNbf693iwSWz1 LG4VvC3/LVQJWbdhbTEuLlUl4c3ok1O6Ll4LAXT3c5dghTaP/sJOMCWJa 6fRbYFx0nJJ3tfPJaJq7p851C+/EOEUNkWP80ISzv8AOPsL/0vym3dQM7 1lstcc77J6XwP+dqephLeOC4EZCuriRSdzC8cQAotzMC48hgrnRuq80bi A==; X-IronPort-AV: E=McAfee;i="6600,9927,10907"; a="391728815" X-IronPort-AV: E=Sophos;i="6.04,233,1695711600"; d="scan'208";a="391728815" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2023 21:38:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10907"; a="797484454" X-IronPort-AV: E=Sophos;i="6.04,233,1695711600"; d="scan'208";a="797484454" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2023 21:38:26 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Nov 2023 13:38:09 +0800 Message-Id: <20231128053810.2441045-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] lavu/hwcontext_vaapi: ignore nonexistent device in default DRM device selection 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Haihao Xiang 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 --- 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 -- 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".