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 31CB91D0499; Wed, 2 Oct 2024 14:03:45 +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=1727877826; cv=none; b=Tf+tevFf3/AhFZARdnfAZ/YX7Q9k2ODIAgflE3idecm2mFmUmMHmdh468o8lkgWvNtu1O09To2BZtw+haO5zNWrZxW/qkz+FtsIFvO7ZS5RDtZ/+mu9DT0h5AgEEPMI98MENTvV+rg1q8Q5qwXS6y66/kFBUYXSO/oaqKMZ/MFM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727877826; c=relaxed/simple; bh=vk3q1Szd9z+x6abnbe789c1Vitk7h/XqF3crGm2GBEk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WdZ5WbciNG+BzttIp0QkCGuJxO7C0nl0zoXDkNzyq4D3laemdvQqAObPhh4o1zkLropx+Q+6hLkzRTDalFE6KVZtBlyBrA4ECxFAzpHnRPmkGFevpADCNEAQuu038hCwPEFk4vHGFu+0Hy0IbFuP5PYTq+9IGYDOfyTRzL3Mq1A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=u/Uv2aGq; 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="u/Uv2aGq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72708C4CEC2; Wed, 2 Oct 2024 14:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727877825; bh=vk3q1Szd9z+x6abnbe789c1Vitk7h/XqF3crGm2GBEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u/Uv2aGqo44OeIomZV78U/LpiZhHDCPVqzaP11qHEG7Y17uS7W08RWqG1s/a9n5gj zi30iuxoUzX/KrT3Bkb0pO59LlOqEBxohBZCXx2+8bqqBKtfkuXOAyImOJ0kc7KPDj BWiG2SrIvd29hkREmk08YYYzXu2kxvfLLH0mDESE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Connor Abbott , Rob Clark , Sasha Levin Subject: [PATCH 6.10 200/634] drm/msm: Dump correct dbgahb clusters on a750 Date: Wed, 2 Oct 2024 14:55:00 +0200 Message-ID: <20241002125818.999798826@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125811.070689334@linuxfoundation.org> References: <20241002125811.070689334@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: Connor Abbott [ Upstream commit d8c17d7aadc2463a395f9340f44c7c34399f1d48 ] This was missed thanks to the family mixup fixed in the previous commit. Fixes: f3f8207d8aed ("drm/msm: Add devcoredump support for a750") Signed-off-by: Connor Abbott Patchwork: https://patchwork.freedesktop.org/patch/607393/ Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c index f2030e521a03a..0fcae53c0b140 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -663,10 +663,13 @@ static void a7xx_get_dbgahb_clusters(struct msm_gpu *gpu, if (adreno_gpu->info->family == ADRENO_7XX_GEN1) { dbgahb_clusters = gen7_0_0_sptp_clusters; dbgahb_clusters_size = ARRAY_SIZE(gen7_0_0_sptp_clusters); - } else { - BUG_ON(adreno_gpu->info->family > ADRENO_7XX_GEN3); + } else if (adreno_gpu->info->family == ADRENO_7XX_GEN2) { dbgahb_clusters = gen7_2_0_sptp_clusters; dbgahb_clusters_size = ARRAY_SIZE(gen7_2_0_sptp_clusters); + } else { + BUG_ON(adreno_gpu->info->family != ADRENO_7XX_GEN3); + dbgahb_clusters = gen7_9_0_sptp_clusters; + dbgahb_clusters_size = ARRAY_SIZE(gen7_9_0_sptp_clusters); } a6xx_state->dbgahb_clusters = state_kcalloc(a6xx_state, -- 2.43.0