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 4DF3E28136D; Thu, 13 Feb 2025 14:32:53 +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=1739457174; cv=none; b=oW0EjJVPX7k3EwtwaMWV9jGlDwE+7VrXnL69K7SYdBznZy20PTqBhjetE1G+KV1B1rn9xVgYZTyV9MPPn8ZPXhFPu+i2A/Ga1lSOHLkO4aKkxeFzF0bx4YFXEDZO4uR2/y1I0YiVthRIM3mqXPH35cVRCohzAowza4S3vV4K/YU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739457174; c=relaxed/simple; bh=6ZOScTvSUa2wRkRhfJxwSOGcFTbmvGiVBlA4cnKwqp0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A1E2jrm8RZyfJeN0UsymBTLioALy6xSP0wIKyNp5cil84SWUs7/h3e1aux0xaBFk0xRnb5PnXlD8gySRyY7HoJ45nhXqbRkvEDAH9H6t248iqd5EYOJLICDQOFnVrs4APuXAWmvYUi9uhEfEj3VysW9Y1tAVlWtyMaIr/cDirZM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MFGYjqPi; 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="MFGYjqPi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D808C4CEE2; Thu, 13 Feb 2025 14:32:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739457173; bh=6ZOScTvSUa2wRkRhfJxwSOGcFTbmvGiVBlA4cnKwqp0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MFGYjqPiNdPnKrEqFYQWzYt7mtP27eS0OaLwdmqnK3mlIZj55oJT3gvLolqbOvz4w jYUX6ltBM1GOyOGe/YSNLax9iXq3DlWQLRZFk934x40Mm8FoUlzbG7PrMR9xJyNfeR luZzC6d/spmX2KxOtewFx26mE9bJ9LMP8VVwTyxw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Philip Yang , Felix Kuehling , Alex Deucher , Sasha Levin Subject: [PATCH 6.12 037/422] drm/amdgpu: Dont enable sdma 4.4.5 CTXEMPTY interrupt Date: Thu, 13 Feb 2025 15:23:06 +0100 Message-ID: <20250213142437.988204413@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250213142436.408121546@linuxfoundation.org> References: <20250213142436.408121546@linuxfoundation.org> User-Agent: quilt/0.68 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Philip Yang [ Upstream commit b4b7271e5ca95b581f2fcc4ae852c4079215e92d ] The sdma context empty interrupt is dropped in amdgpu_irq_dispatch as unregistered interrupt src_id 243, this interrupt accounts to 1/3 of total interrupts and causes IH primary ring overflow when running stressful benchmark application. Disable this interrupt has no side effect found. Signed-off-by: Philip Yang Reviewed-by: Felix Kuehling Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c index c77889040760a..4dd86c682ee6a 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c @@ -953,10 +953,12 @@ static int sdma_v4_4_2_inst_start(struct amdgpu_device *adev, /* set utc l1 enable flag always to 1 */ temp = RREG32_SDMA(i, regSDMA_CNTL); temp = REG_SET_FIELD(temp, SDMA_CNTL, UTC_L1_ENABLE, 1); - /* enable context empty interrupt during initialization */ - temp = REG_SET_FIELD(temp, SDMA_CNTL, CTXEMPTY_INT_ENABLE, 1); - WREG32_SDMA(i, regSDMA_CNTL, temp); + if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) < IP_VERSION(4, 4, 5)) { + /* enable context empty interrupt during initialization */ + temp = REG_SET_FIELD(temp, SDMA_CNTL, CTXEMPTY_INT_ENABLE, 1); + WREG32_SDMA(i, regSDMA_CNTL, temp); + } if (!amdgpu_sriov_vf(adev)) { if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) { /* unhalt engine */ -- 2.39.5