From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 913653B0AF1; Mon, 23 Mar 2026 14:15:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774275320; cv=none; b=mHVvxgHPt8+SwZ+8KAL8p8cNWmJEm+AsJKxx+EB7fCslPOEC/NlFVA0AtVbNb3X6n8Q5PCKArty6TFHBzUZ1ACYyviUrQs8dJbi47ieDN622+MG/UrIflLCoXA9CvB8b7QDq1pF6HQ1Fng7AOofL/pxeS/UDXq5W47tmxN2PLlA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774275320; c=relaxed/simple; bh=YmN7iasrB8x/IZc5+a9latALHGd5byIk35ToVRUgmgY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N1E5TS2vbpIwED+LnNd2h7mBPCGzmw5jVS2ZfcEAxPg5mTeHUmyxke8Uztnqnz1LLJ5f1ZMj6CfVTyiP64lMiaMgi+f9hMmw4C+yECjdICwPFKkjmjX2zyEhI1nAgsuamRa2D7H/DlEi9Br2SN7MSiSd9qDhnf+d1vUMA/KRQno= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vcuVpPOy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vcuVpPOy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A236C2BC9E; Mon, 23 Mar 2026 14:15:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774275320; bh=YmN7iasrB8x/IZc5+a9latALHGd5byIk35ToVRUgmgY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vcuVpPOy8W4US27gbpa7+iIQRwi4LJEaEWhwXxgZKR2Ch1VBCnVaAjvJWqxGSY0C2 uH07O8KVEHsegKDViWePDKuNccjt+JSK/INAyEOKXklRVxZZ6Am4/K0Tb0Z2UF87NV 523IgQ18rwDER3CIN4rsICh3PDM06BpXM7JrOkP8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sguttula , Pratik Vishwakarma , Alex Deucher , Sasha Levin Subject: [PATCH 6.12 014/460] drm/amdgpu/vcn5: Add SMU dpm interface type Date: Mon, 23 Mar 2026 14:40:10 +0100 Message-ID: <20260323134527.014157734@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134526.647552166@linuxfoundation.org> References: <20260323134526.647552166@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: sguttula [ Upstream commit a5fe1a54513196e4bc8f9170006057dc31e7155e ] This will set AMDGPU_VCN_SMU_DPM_INTERFACE_* smu_type based on soc type and fixing ring timeout issue seen for DPM enabled case. Signed-off-by: sguttula Reviewed-by: Pratik Vishwakarma Signed-off-by: Alex Deucher (cherry picked from commit f0f23c315b38c55e8ce9484cf59b65811f350630) Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c index a359d612182dd..3aa715830fbe8 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c @@ -166,6 +166,10 @@ static int vcn_v5_0_0_sw_init(void *handle) fw_shared->present_flag_0 = cpu_to_le32(AMDGPU_FW_SHARED_FLAG_0_UNIFIED_QUEUE); fw_shared->sq.is_enabled = 1; + fw_shared->present_flag_0 |= cpu_to_le32(AMDGPU_VCN_SMU_DPM_INTERFACE_FLAG); + fw_shared->smu_dpm_interface.smu_interface_type = (adev->flags & AMD_IS_APU) ? + AMDGPU_VCN_SMU_DPM_INTERFACE_APU : AMDGPU_VCN_SMU_DPM_INTERFACE_DGPU; + if (amdgpu_vcnfw_log) amdgpu_vcn_fwlog_init(&adev->vcn.inst[i]); } -- 2.51.0