From patchwork Fri Nov 24 06:17:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 44784 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp1092484pzb; Thu, 23 Nov 2023 22:18:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IHI9WPU9Ejh6sfp3ALCncmGAfUemgY7KDtHjSs3UcKV58rSHlP497Y8bc9ULMNZmdIKy7HD X-Received: by 2002:a05:6402:290a:b0:548:5671:a54e with SMTP id ee10-20020a056402290a00b005485671a54emr949578edb.1.1700806683564; Thu, 23 Nov 2023 22:18:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700806683; cv=none; d=google.com; s=arc-20160816; b=BGMPvct1J7dEaVH7j7CIK4rfTTF7VI3zkvVQ/dCtdYNSW/vA178+axT2abHw+etrWD GW7Snh+17Tic/B9egdpHpIhWNlMZFboHSwNAgCdVaFrbZddBfxcwKAFx79yME7W3YaUo uDOIcTSoYd0FvXA8U9oE68qTe4Tjq09LwEf4zG5VLxsIykLBZT5D4xDb9JoTu8jU0zzi n2BFe1E1SsQO+YFhO8x0QnneKzqLL2Dn3zyDWRuLgkkBg9I/1nD+H3qX+2VpX6bk9ESo TTdcIMDV5UyblnriqGpTlfwVaUQjBc3tXxQgXF6aQTQbQ5ZRx0zJZqE2llxeKzB/gvFN SaAQ== 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=MZNSIBA4ROIC6KAv9Gl7jnbuWinc6DytwPgKekeu810=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=hrvWbWpZwepY05BBX3ShrFQANKNR7JbfBSSnbmDQLRKPCFyYA2OBRTfjCCyQ8tJTjF cc6JEdFyYrDIq/xRm2kqjS7TO1F1CZAy7QpltGt1DaEQFpcJ2yzH3FOlaMYFY7yvISFu t+mIlejk+6CXoF5dA+v5Dr2mruyAnF1GsmZpQXzF9vr2Qfly9AycvGQiDlmJ6EhEr18s AvygtbdHIDTepr8ikAzNTXXXOpCcAmY23uA1Son59jcXQVW2HvscUuTZYrAX/ZBHKAwV yNANH1pAYSCfrkqRQnHPevaHjMqp5XeR7uu2W4yTONOWMa6OVqw4+07EP68IHiFZMwt2 ME0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=jwcwJQ8i; 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 m3-20020a056402430300b005490ad95d33si1557365edc.451.2023.11.23.22.18.02; Thu, 23 Nov 2023 22:18:03 -0800 (PST) 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=jwcwJQ8i; 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 7CB8C68C6E6; Fri, 24 Nov 2023 08:17:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9459D68C6E6 for ; Fri, 24 Nov 2023 08:17:50 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700806676; x=1732342676; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=hrgZgJXfLoya6umtY/KFBgmG4q2OKkKMRItrYzrFZSg=; b=jwcwJQ8iS5oxpYu8lg0iZuliAEe8m/LO2Vqwa4fU0kwcM9V2BZnad8Vf FOMBcbk4O+nucR+PVMgGgntMkW/Wozn5n+J+DkeNR97WC6+CbO2Q9lYca hYKUlYa6V0oEg4RebzEAMJRopBjZqfzG9ShSEc+8zU1tCA6YoWbLSYrpe p0AZoJhGsZT6JojDkXn0wHVGQZwfj3GsLCqOOm8CMmLqHSrPCIaVnry8S C/Jas+oOCQPUoiADu8EH9zY7iaKdr8rNBUfoTEYq41A1VmtU2RzAOqXKz n2cG4M7CC9lw7I82JLcDQj99B2IL//Wru7KXobGB6tHofyzQQOz/M6HQD g==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="377404666" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="377404666" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 22:17:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="767372050" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="767372050" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2023 22:17:46 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Nov 2023 14:17:36 +0800 Message-Id: <20231124061736.170131-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: l2slcA5sKlgB 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 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 12bc95119a..6d542a9bc9 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1733,8 +1733,18 @@ 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; + } else + av_log(ctx, AV_LOG_VERBOSE, "No avaialbe 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