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 61296128816 for ; Wed, 4 Feb 2026 00:26:48 +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=1770164808; cv=none; b=BDCZNuoD/Xg4qhO60BftY42FlRR15Vz5QCIHg/dTN7CYGsufcy/FVoEjA0kCUAj/eS3eVXH99gBxMrdWL/KrLPKVRv/y3TWNChSVbEIzw1+zESPfJUfbGBREBefzLCvTNVfWlmsQnAhprn7z1s+ZyoSeWlum3a6WRLrHkyXlLv8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770164808; c=relaxed/simple; bh=o/c5o865DTQNIzAqFJPNUrcNI/EA63KHy4KZrAdWtTA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iE3jTy2AqXb1Nc6rRiNYA1kWoqV1i3O+soLSwZWRsOXY3ReGUM4rgWHNlloPpNhrwiwf9witmd6HAdVUEP1S0YMVTLtAt+v5PoyGZdD6NcbPRxszjD/Rjh29awr3XxYuHOkjRjNOPnxvEXXlzDdwHXpsCkEehtPV4fL80RHXIiM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jWZ+j23G; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jWZ+j23G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E828C116D0; Wed, 4 Feb 2026 00:26:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770164808; bh=o/c5o865DTQNIzAqFJPNUrcNI/EA63KHy4KZrAdWtTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jWZ+j23GeH9cr3FGTrUyt9Z9QGuWWK+4P3D6HYPz3TpDXgEs/hEhhwybTZP6dyQzG t7DO6DJ+8fPTZYSE+BPISk0OW+YyP5ICNnPTTZTaZznGcajQXTUoSXNGDoieD8IUWC cnjI0J7dehUv6zy/ATU6Olmzkf7X0Umyk6TCKdhW76T0KyVSsGfO87jiRU84x5FpOJ k8/LQqgfhK15N4LqdmRZeylkz/cBubuO2EvYij7npAc2VcjfsNcemq5eaP5nJic6MD +wegv9wnAlZFUMR90F+IQYbvHVqG+U1q1B0nOHZ2/oKiLTmNK+FzKM611PkCGKT1mc ldqHrK6yUtEOw== From: Sasha Levin To: stable@vger.kernel.org Cc: Philip Yang , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Sasha Levin Subject: [PATCH 6.6.y 1/2] drm/amdkfd: Don't use sw fault filter if retry cam enabled Date: Tue, 3 Feb 2026 19:26:44 -0500 Message-ID: <20260204002645.1462394-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026020358-resemble-wildness-53b5@gregkh> References: <2026020358-resemble-wildness-53b5@gregkh> 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 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 --- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c index 0b6a0e149f1c4..9b225acdcf974 100644 --- 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(struct amdgpu_device *adev, uint64_t addr, 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. */ -- 2.51.0