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 93A14214424; Tue, 12 Nov 2024 10:44:22 +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=1731408262; cv=none; b=g822PezDoS1mUfiRtvUajjfcOO2E33q5+sHz2CeMpLdg2WImOqCeacS6ABlZxRcHHUHd4TFZKbgMxnjtREr8T2XkGyxcHNljMfp7JqTkEaKlhsSv0N+1wwSwcjfjCiloAt3MXou+/oI/qmbKZQ9X+8CKbiewJmECU9On93+OTyM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731408262; c=relaxed/simple; bh=wIgdmFVR1yIQw3WhjVQaaWYyplb2QLshwnk79iL0sOQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kq5k/PGA3/UONdERbkDQDT2sejKWrsyITKyeAwZ3BB9+X27rOfO/uMWqCiI8vRr7QejG1I+pblQEz4fMWLZzlIKTmZBnanV1WI7yMExQ3XuRMKZLnHzd7HEPvtuLj7n3iq9eZKJ3D6lVPUaLX3OAZevVqiiiLt5HrnnIgvcAL4c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=U8WeS3Nu; 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="U8WeS3Nu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10771C4CECD; Tue, 12 Nov 2024 10:44:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1731408262; bh=wIgdmFVR1yIQw3WhjVQaaWYyplb2QLshwnk79iL0sOQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U8WeS3NubcDr1G+YH+yHyYbjZ2YQxsl8zSqwj0rlCAjeWuMcB+LlcaFdJT5h06xtM 3GS7AmOl2lGDDxWrk+saetFFe8QjkoGAWpY/asnrtoKNx/qm/H9GDjlWUpDIWBRq2w J3RHx90yzvQEqHUE5HuuOBAJHz6BzAKAzdA8gbac= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lijo Lazar , Hawking Zhang , Alex Deucher Subject: [PATCH 6.11 110/184] drm/amdgpu: Fix DPX valid mode check on GC 9.4.3 Date: Tue, 12 Nov 2024 11:21:08 +0100 Message-ID: <20241112101905.086196976@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241112101900.865487674@linuxfoundation.org> References: <20241112101900.865487674@linuxfoundation.org> User-Agent: quilt/0.67 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.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lijo Lazar commit 3ce3f85787352fa48fc02ef6cbd7a5e5aba93347 upstream. For DPX mode, the number of memory partitions supported should be less than or equal to 2. Fixes: 1589c82a1085 ("drm/amdgpu: Check memory ranges for valid xcp mode") Signed-off-by: Lijo Lazar Reviewed-by: Hawking Zhang Signed-off-by: Alex Deucher (cherry picked from commit 990c4f580742de7bb78fa57420ffd182fc3ab4cd) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c +++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c @@ -484,7 +484,7 @@ static bool __aqua_vanjaram_is_valid_mod case AMDGPU_SPX_PARTITION_MODE: return adev->gmc.num_mem_partitions == 1 && num_xcc > 0; case AMDGPU_DPX_PARTITION_MODE: - return adev->gmc.num_mem_partitions != 8 && (num_xcc % 4) == 0; + return adev->gmc.num_mem_partitions <= 2 && (num_xcc % 4) == 0; case AMDGPU_TPX_PARTITION_MODE: return (adev->gmc.num_mem_partitions == 1 || adev->gmc.num_mem_partitions == 3) &&