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 5CC19421EED; Wed, 4 Feb 2026 15:22:33 +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=1770218553; cv=none; b=G+D7W+W/eb8R5BUB0LV+pm+ump6+mUY4Jo/98vsheq8KGd+Xsf415G2/vEunmmJd+sC8jZYcG8fSGlrr3t4OtG56ILrbOeWm5QUERZbEBNVue1pGkZciHGg4eWMyhjfLu8iCq2czKStJIvUHe81ixNAf48jaYmw7zQFX1VdKLEI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770218553; c=relaxed/simple; bh=2m2y2mQJQRom29y3ZJF4L+jBuZB18ByTOkuaJN1W2Tk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LR3qbx1tdP//ahj4dBfzOZuh4Hie4nBMQ/Cbb+ZJChYrTfBPRHaUzoVug7RJ1apPuUSwYmETVkSG51XvqlFfQgs1zrO45vSEZmQcXfFOt5Ce5EVeCJ+rU5dayD/5BF8ZSzrF9q6nXpRnaNaHJW0FVhw4YdskbZzyhGsrKB14GKs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gW3opK1f; 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="gW3opK1f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEEE9C4CEF7; Wed, 4 Feb 2026 15:22:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770218553; bh=2m2y2mQJQRom29y3ZJF4L+jBuZB18ByTOkuaJN1W2Tk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gW3opK1fWEULW4RXKxIkeHkdwwHxiyw6z+4grm9MfCipaeb1Yx4O5+SksQWOJ3k2Z FK0gDLGzITizLdCEsk86EwguGy0Un9Vqi/v8EO8aJKuttus1Qr05dYPKMMydJb+ggG d8vF8DEia+4x002VbAR31MjK52mrzExUH3F7ucg8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Philip Yang , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Sasha Levin Subject: [PATCH 6.6 64/72] drm/amdkfd: Dont use sw fault filter if retry cam enabled Date: Wed, 4 Feb 2026 15:41:07 +0100 Message-ID: <20260204143847.957649630@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143845.603454952@linuxfoundation.org> References: <20260204143845.603454952@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Philip Yang [ Upstream commit e61801f162ddcf8874c820639483ec4849b0fb0b ] If retry cam enabled, we don't use sw retry fault filter and add fault into sw filter ring, so we shouldn't remove fault from sw filter. Signed-off-by: Philip Yang Reviewed-by: Christian König Signed-off-by: Alex Deucher Stable-dep-of: 8b1ecc9377bc ("drm/amdgpu: fix NULL pointer dereference in amdgpu_gmc_filter_faults_remove") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c @@ -452,7 +452,10 @@ void amdgpu_gmc_filter_faults_remove(str uint32_t hash; uint64_t tmp; - ih = adev->irq.retry_cam_enabled ? &adev->irq.ih_soft : &adev->irq.ih1; + if (adev->irq.retry_cam_enabled) + return; + + ih = &adev->irq.ih1; /* Get the WPTR of the last entry in IH ring */ last_wptr = amdgpu_ih_get_wptr(adev, ih); /* Order wptr with ring data. */