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 A20C8C6FD1D for ; Wed, 15 Mar 2023 12:43:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232743AbjCOMn4 (ORCPT ); Wed, 15 Mar 2023 08:43:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232984AbjCOMnh (ORCPT ); Wed, 15 Mar 2023 08:43:37 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C033A403F for ; Wed, 15 Mar 2023 05:42:19 -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 E91FEB81DF6 for ; Wed, 15 Mar 2023 12:42:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61737C433EF; Wed, 15 Mar 2023 12:42:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678884120; bh=8Wvl78oYKTDixm6CaR2PVovQWWqAXwBl1pvUdz+zKFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wrBR51+E5vcZ79tw+DqZ30BczDh5tKY1Rg0EhC1dafCrFn8vNdhBWl4WTGUCQDE9t v2riuaFxD62OMuKgb79Cbe0RvsBHi+JwUv3Tjr1fwVyChp8reVCR/i9Sajotwj356h fd/2T8MrhEhJbM9OR/DH1yhkZIOTtwxv355Nbfo0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Veerabadhran Gopalakrishnan , Leo Liu , Alex Deucher , Sasha Levin Subject: [PATCH 6.2 115/141] drm/amdgpu/soc21: Add video cap query support for VCN_4_0_4 Date: Wed, 15 Mar 2023 13:13:38 +0100 Message-Id: <20230315115743.500356691@linuxfoundation.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230315115739.932786806@linuxfoundation.org> References: <20230315115739.932786806@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Veerabadhran Gopalakrishnan [ Upstream commit 6ce2ea07c5ff0a8188eab0e5cd1f0e4899b36835 ] 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 Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c index e51a7bdb1eb75..3d938b52178e3 100644 --- a/drivers/gpu/drm/amd/amdgpu/soc21.c +++ b/drivers/gpu/drm/amd/amdgpu/soc21.c @@ -110,6 +110,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; -- 2.39.2