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 9BDD02D8798; Wed, 4 Feb 2026 15:33:55 +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=1770219235; cv=none; b=iSp5r93lqgWCofQSkeVzYFkSH2CsFMdPD9OmuRtP8btDe31nXty99kvl+Br8jzkBzE0ALFsTZADTMVdaAoZFXL0Jk7iwLgDhckG2QOtXn7gxEEHO4TXKxMh+M12pTF8RTOwuX2ZY8YGd8EFcMNkWrR/UHHiRkngqg6y8wTDxKoY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770219235; c=relaxed/simple; bh=OpTdW+fm/nKjZLbKSj197RzTNM6KeMdHYbZTsJ+pd+I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rQsLXhHwleLc7sQjkqjObyeR88btm04TlGKuscmroBMJ1w5jeEl0gjmroYvlEcvcznPenA4Ols4VRMVEkmgUi2gCknK7hv0LMKDKPzLD5o+L1WIpYZ+WNFeslW/qjH2WhofT9vGU+X3X4SBnRjX24CZw31UwUvaplb/+tG9KUcU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vF8so2vu; 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="vF8so2vu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2629EC4CEF7; Wed, 4 Feb 2026 15:33:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770219235; bh=OpTdW+fm/nKjZLbKSj197RzTNM6KeMdHYbZTsJ+pd+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vF8so2vuWPqqUEBlJfKaTcb8SsSfWbxrzVBVfNO2FXkHm66JtvghD6zs5Dy1W5OHQ J4p3lYWLhBvbleT304fScsBaFicrmLIjUusXS4Zmz5m1W3lOkM7qx2aTDmYlNDRrgq 9ryw5DSz4b8UvAmNXqHb1ZruoozYaw94hj3bFiNM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Timur=20Krist=C3=B3f?= , Jesse Zhang , Alex Deucher Subject: [PATCH 6.18 108/122] drm/amdgpu/gfx10: fix wptr reset in KGQ init Date: Wed, 4 Feb 2026 15:41:30 +0100 Message-ID: <20260204143855.738557817@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143851.857060534@linuxfoundation.org> References: <20260204143851.857060534@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Deucher commit cc4f433b14e05eaa4a98fd677b836e9229422387 upstream. wptr is a 64 bit value and we need to update the full value, not just 32 bits. Align with what we already do for KCQs. Reviewed-by: Timur Kristóf Reviewed-by: Jesse Zhang Signed-off-by: Alex Deucher (cherry picked from commit e80b1d1aa1073230b6c25a1a72e88f37e425ccda) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c @@ -6878,7 +6878,7 @@ static int gfx_v10_0_kgq_init_queue(stru memcpy_toio(mqd, adev->gfx.me.mqd_backup[mqd_idx], sizeof(*mqd)); /* reset the ring */ ring->wptr = 0; - *ring->wptr_cpu_addr = 0; + atomic64_set((atomic64_t *)ring->wptr_cpu_addr, 0); amdgpu_ring_clear_ring(ring); }