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 97931635; Thu, 5 Sep 2024 09:47:37 +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=1725529657; cv=none; b=Nk0p2bHltBkAcIZI6+MJRaBhYsNWwzcU1MdilQyjqv2bpHmfeghTFzlA45z+SZDMcrPDiDDaE7KRHG9DsDPMcD4NdU2QUGKsJ69G+MRD5YYN+p1/nKiQCWve8zb+NhiWtGxLsJaNTgEHcNq5OUbzfsLFCBFVmUHc1Hn+PoAr8ys= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725529657; c=relaxed/simple; bh=xqfjOm8Vqt5RJVzyPAQLznsUxRr1EOndaGHIydWHJ9c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n0a/REe99vDj9W9zmtEJ56KxViaLes7f0SmPpQ5aPuXnnb6LS7Iy697R7jI2b1/60+nkXUCcC0VJroEB3ziFWkCg2kCww+z+PkoQBGisKcjKlayxuEyPDKWJOWXtD0SbKfHppyS4v4KZ7ncECgjb2O/nv2KVC+ovH5KANMsQ5O0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=sYDZJeHh; 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="sYDZJeHh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14D90C4CEC3; Thu, 5 Sep 2024 09:47:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725529657; bh=xqfjOm8Vqt5RJVzyPAQLznsUxRr1EOndaGHIydWHJ9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sYDZJeHhi+NvX+7vJ2OQlCg6lYaEHadJn0wRW9qlyJoGAWL18rvTaUNrqM0O/5HwC 52Ti7S8yO1VXCrjRw82sbBs/phvamkCdF2OrtGjtgtrJpLCGs8ugCs4Uwumu98SRPt i+tmxdv3itec4lP9QG9thzJTln2GKYTzsEw0k4EY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jesse Zhang , Lijo Lazar , Alex Deucher , Sasha Levin Subject: [PATCH 6.10 103/184] drm/amdgpu: Fix the warning division or modulo by zero Date: Thu, 5 Sep 2024 11:40:16 +0200 Message-ID: <20240905093736.257282775@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240905093732.239411633@linuxfoundation.org> References: <20240905093732.239411633@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.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jesse Zhang [ Upstream commit 1a00f2ac82d6bc6689388c7edcd2a4bd82664f3c ] Checks the partition mode and returns an error for an invalid mode. Signed-off-by: Jesse Zhang Suggested-by: Lijo Lazar Reviewed-by: Lijo Lazar Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c index d4e2aed2efa3..2c9a0aa41e2d 100644 --- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c +++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c @@ -501,6 +501,12 @@ static int aqua_vanjaram_switch_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr, if (mode == AMDGPU_AUTO_COMPUTE_PARTITION_MODE) { mode = __aqua_vanjaram_get_auto_mode(xcp_mgr); + if (mode == AMDGPU_UNKNOWN_COMPUTE_PARTITION_MODE) { + dev_err(adev->dev, + "Invalid config, no compatible compute partition mode found, available memory partitions: %d", + adev->gmc.num_mem_partitions); + return -EINVAL; + } } else if (!__aqua_vanjaram_is_valid_mode(xcp_mgr, mode)) { dev_err(adev->dev, "Invalid compute partition mode requested, requested: %s, available memory partitions: %d", -- 2.43.0