From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 924D3C61DA4 for ; Mon, 13 Mar 2023 10:40:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230174AbjCMKkP (ORCPT ); Mon, 13 Mar 2023 06:40:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230162AbjCMKkN (ORCPT ); Mon, 13 Mar 2023 06:40:13 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D96681911F for ; Mon, 13 Mar 2023 03:39:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 91CB9B80EFD for ; Mon, 13 Mar 2023 10:39:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CE0CC4339B; Mon, 13 Mar 2023 10:39:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678703994; bh=eACqjDuYjumWGYIYEbFep7jVMqaXsrYfvL7AfJy2lMM=; h=Subject:To:Cc:From:Date:From; b=pnFvsGV8H+rF9JoLIBAl+dqD6h0bqSj8aHMsOEi9JH/0I+EnV/IdU2pDfvLLMFqwh 4XGpTg04BEdnjGr0va1kLcLclBCHcojvK6HsZwNkIRSteAfEZp3HPJ6sP0W0Ege1XW hoWjMM4dpt/Qjm/6LoDO86+v6kgnhN9xyR8KFams= Subject: FAILED: patch "[PATCH] drm/amdgpu/soc21: Add video cap query support for VCN_4_0_4" failed to apply to 6.2-stable tree To: veerabadhran.gopalakrishnan@amd.com, alexander.deucher@amd.com, leo.liu@amd.com Cc: From: Date: Mon, 13 Mar 2023 11:39:43 +0100 Message-ID: <16787039832486@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 6.2-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.2.y git checkout FETCH_HEAD git cherry-pick -x 6ce2ea07c5ff0a8188eab0e5cd1f0e4899b36835 # git commit -s git send-email --to '' --in-reply-to '16787039832486@kroah.com' --subject-prefix 'PATCH 6.2.y' HEAD^.. Possible dependencies: 6ce2ea07c5ff ("drm/amdgpu/soc21: Add video cap query support for VCN_4_0_4") a6de636eb04f ("drm/amdgpu/soc21: don't expose AV1 if VCN0 is harvested") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 6ce2ea07c5ff0a8188eab0e5cd1f0e4899b36835 Mon Sep 17 00:00:00 2001 From: Veerabadhran Gopalakrishnan Date: Wed, 8 Mar 2023 19:33:53 +0530 Subject: [PATCH] drm/amdgpu/soc21: Add video cap query support for VCN_4_0_4 Added the video capability query support for VCN version 4_0_4 Signed-off-by: Veerabadhran Gopalakrishnan Reviewed-by: Leo Liu Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 6.1.x diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c index 9df2236007ab..061793d390cc 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc21.c +++ b/drivers/gpu/drm/amd/amdgpu/soc21.c @@ -111,6 +111,7 @@ static int soc21_query_video_codecs(struct amdgpu_device *adev, bool encode, switch (adev->ip_versions[UVD_HWIP][0]) { case IP_VERSION(4, 0, 0): case IP_VERSION(4, 0, 2): + case IP_VERSION(4, 0, 4): if (adev->vcn.harvest_config & AMDGPU_VCN_HARVEST_VCN0) { if (encode) *codecs = &vcn_4_0_0_video_codecs_encode_vcn1;