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 DD08E44C77; Mon, 14 Oct 2024 14:57:43 +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=1728917864; cv=none; b=p3JPOEWR0naae/1PLTJh/Q2/0UVtAIbQOqHSIDLHn8rqyHj4ycWgLDCuqpAFPQaSUk4V7OJcurVhwZ5WTvK7BLQI39exJHmMZ8dSRI3Ra7rOPN3KquW+zh37gpxpQDp2sqHiRBt3qibny8W8nTY+9yJucK8CUfhuj6MR297xCoo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728917864; c=relaxed/simple; bh=nF5YYl3qEuNKrzxO1eyQtVTHD1/2EbqdAVVNsZWthOs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AXA8sMBUHtG7EAbqZ1hq+MKRbGpEkHLXgTCNBrntfNM+DoiyR4X9bVVxyqDCsuhAsA1wDA+qoveUs8kqOk0b694SLyi3Qx44fNBbU7zZdKRen9qmtmuKZzJkFBMtNFYXJB4rbkQcSKTRMbz0b8dmYqfzNFjOs/OPtZQUs6MhVVg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zlVymxL+; 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="zlVymxL+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F473C4CEC7; Mon, 14 Oct 2024 14:57:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728917863; bh=nF5YYl3qEuNKrzxO1eyQtVTHD1/2EbqdAVVNsZWthOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zlVymxL+PPlilvO+VB3NzjTspH9cO976ErawoojT2qJrvP5WdvrBuNH9qn9AW0QAm s7bzq6LYSn8vt4AhixCjGtJis10ZcZcTYPL1JwHrf1/gG6II5zXyU11BNqiCNlYVx2 tXJ03N55d5dnyPk5SguH1JVDAdm4DkhEhyuhk82s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vladimir Lypak , Konrad Dybcio , Rob Clark , Sasha Levin Subject: [PATCH 6.1 126/798] drm/msm/a5xx: properly clear preemption records on resume Date: Mon, 14 Oct 2024 16:11:20 +0200 Message-ID: <20241014141222.872835756@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vladimir Lypak [ Upstream commit 64fd6d01a52904bdbda0ce810a45a428c995a4ca ] Two fields of preempt_record which are used by CP aren't reset on resume: "data" and "info". This is the reason behind faults which happen when we try to switch to the ring that was active last before suspend. In addition those faults can't be recovered from because we use suspend and resume to do so (keeping values of those fields again). Fixes: b1fc2839d2f9 ("drm/msm: Implement preemption for A5XX targets") Signed-off-by: Vladimir Lypak Reviewed-by: Konrad Dybcio Patchwork: https://patchwork.freedesktop.org/patch/612043/ Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/msm/adreno/a5xx_preempt.c b/drivers/gpu/drm/msm/adreno/a5xx_preempt.c index f58dd564d122b..67a8ef4adf6b6 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_preempt.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_preempt.c @@ -204,6 +204,8 @@ void a5xx_preempt_hw_init(struct msm_gpu *gpu) return; for (i = 0; i < gpu->nr_rings; i++) { + a5xx_gpu->preempt[i]->data = 0; + a5xx_gpu->preempt[i]->info = 0; a5xx_gpu->preempt[i]->wptr = 0; a5xx_gpu->preempt[i]->rptr = 0; a5xx_gpu->preempt[i]->rbase = gpu->rb[i]->iova; -- 2.43.0