From patchwork Fri Jul 22 18:06:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rogozhkin, Dmitry V" X-Patchwork-Id: 36893 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp585153pzb; Fri, 22 Jul 2022 11:05:45 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uxFBJsIRKcjvKFJ4xk6dfZmg7nBx+KJPxJz7Obsty5n/F4KyX54mJL5PqYKg05v5jFlg7j X-Received: by 2002:a05:6402:3041:b0:43a:d8b1:8b5 with SMTP id bs1-20020a056402304100b0043ad8b108b5mr1059783edb.242.1658513145061; Fri, 22 Jul 2022 11:05:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658513145; cv=none; d=google.com; s=arc-20160816; b=ZoU4paMKIcxtoDnUp2TXgDi/C0fRjnsZX15q30+aswn3cp8n1obock+0hCaqinU0TD BRsYN/VEM3e5AY4RD0Hb8EVDD3VxlQRYzcTPYENTsbZYWTmZE9MM0mcXYXgL3TWzvoB/ Luf/m1rTWDVVz5gKN3+DVnAEgUX8LwFq5vsRthtpVMPXezrzJo2+lumIS9/b6Co2x5a+ ZhiPg/cwsCmaq8Y/UGZTRuotzeu9mPVqtqeNkfv27esT1Lk0JuLr28idv/32bJIlnsgy +gkndW5VH+INyiZ6mgkMvvT/LPwOOz+6QO/JYpRE7HfAaYk9H4fGH2qnF8E0fzy2SycX f3VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=n8gGAttTmXdHJmz8z7aSzfBQrkqnww9CBLbJq1lkmko=; b=S04PgO4mHZ0Ad42pchY2nDXNsZ4JjJPzapMb5C3LGPcY4k7WutOP9hHhtbIbgWFcVN C+0CR+RBIvMFlS4RJ4SyZiU1++97a3aWPC1r94eF7vyq0z4vqStMHsS+5kYvB3PHyqTB tBge6ikORCVpi5ZF+gZzv6mp1A1SyW+fvgqIViBWd0ZCbmEBGBAwifP4kcGszd5wlopS jTHt8AZmOeRkVyfRzCNXSTUk4cTQ1cL1IHvztSWCtpHPFCjrMSiVKx+8P5R7Bf7qHDkO T0ISgferBVGVaCRQjxcuPbij87DGGTPp39DfiXgIn4d3Zl8UJy91eeJ4G02VmCSocXRw /slg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=nDHiuzbn; 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 q4-20020a1709064cc400b0072b49fe5a49si5359252ejt.372.2022.07.22.11.05.44; Fri, 22 Jul 2022 11:05:45 -0700 (PDT) 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=nDHiuzbn; 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 ABEC968B704; Fri, 22 Jul 2022 21:05:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 630F768B6CB for ; Fri, 22 Jul 2022 21:05:34 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658513139; x=1690049139; h=from:to:cc:subject:date:message-id; bh=cVV9oUwmnY3bg+X4k8Y+ns/HDVrvS8gqiYyL0LHFXt8=; b=nDHiuzbnfntN+o9rVBacttlNQO1KM/mPeMjoF2jRgQ+5TSn/HHKnM5g0 opfpn5tdJwOxOWrxpBv+JOQGO3FgfhdpmaKWzMtE0QOSDLjITUOwRZ5tS KRImPdLxz0OAkwqKhX8HakvIi1r9NCRu8OtJZu5vIGvFswQ9M4aY5cxPI QAxtiz5TDlTL/9N8q8bqeeescgYuHF3fHWScmDryExhKfeN3ZNyX/54Eq VhuGKF2n3HfeSHWZIEEt8P7pdxly49l0CBlbSgbuBGXMcFXZmBY3ufsfi zP6bQqcW+Lk/beA5gUQ8QeTlT6jk4kIrnQJg+/qVhcphe2iJUpfEV0+89 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10416"; a="349075905" X-IronPort-AV: E=Sophos;i="5.93,186,1654585200"; d="scan'208";a="349075905" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2022 11:05:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,186,1654585200"; d="scan'208";a="741139303" Received: from dvrscl.jf.intel.com ([10.54.72.26]) by fmsmga001.fm.intel.com with ESMTP; 22 Jul 2022 11:05:32 -0700 From: Dmitry Rogozhkin To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Jul 2022 11:06:19 -0700 Message-Id: <1658513179-11943-1-git-send-email-dmitry.v.rogozhkin@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] qsv: Update ffmpeg qsv_errors to recognize GPU hang 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: Hon Wai Chow , Dmitry Rogozhkin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: igxSTcA49Zx5 GPU hang is one of the most typical errors on Intel GPUs in case something goes wrong. It's important to recognize it explicitly for easier bugs triage. Also, this error code can be used to trigger GPU recovery path in self-written applications. Signed-off-by: Hon Wai Chow Signed-off-by: Dmitry Rogozhkin --- libavcodec/qsv.c | 1 + libavfilter/qsvvpp.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 385b43b..55bcb6e 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -125,6 +125,7 @@ static const struct { { MFX_ERR_INVALID_VIDEO_PARAM, AVERROR(EINVAL), "invalid video parameters" }, { MFX_ERR_UNDEFINED_BEHAVIOR, AVERROR_BUG, "undefined behavior" }, { MFX_ERR_DEVICE_FAILED, AVERROR(EIO), "device failed" }, + { MFX_ERR_GPU_HANG, AVERROR(EIO), "GPU Hang" }, { MFX_ERR_INCOMPATIBLE_AUDIO_PARAM, AVERROR(EINVAL), "incompatible audio parameters" }, { MFX_ERR_INVALID_AUDIO_PARAM, AVERROR(EINVAL), "invalid audio parameters" }, diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 954f882..7504906 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -100,6 +100,7 @@ static const struct { { MFX_ERR_INVALID_VIDEO_PARAM, AVERROR(EINVAL), "invalid video parameters" }, { MFX_ERR_UNDEFINED_BEHAVIOR, AVERROR_BUG, "undefined behavior" }, { MFX_ERR_DEVICE_FAILED, AVERROR(EIO), "device failed" }, + { MFX_ERR_GPU_HANG, AVERROR(EIO), "GPU Hang" }, { MFX_ERR_INCOMPATIBLE_AUDIO_PARAM, AVERROR(EINVAL), "incompatible audio parameters" }, { MFX_ERR_INVALID_AUDIO_PARAM, AVERROR(EINVAL), "invalid audio parameters" },