Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4573160pxv; Tue, 6 Jul 2021 04:23:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwB/vRbR7im+hevMfdVsx5qy7NeRldwpIjA3M7/6RN/G8T5pApVsinhad5X9Qiv9fDvAZhD X-Received: by 2002:a6b:b2d1:: with SMTP id b200mr93582iof.187.1625570601132; Tue, 06 Jul 2021 04:23:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570601; cv=none; d=google.com; s=arc-20160816; b=wiBPQR7edMno8dEmvErFPVTfhX9ONwlMCmuYRjHBJtGRKhj6l/CgiAmpGqXLt9BYTp 7GpzdMx3fpCR3dKgV524pkoTJMbVjiYhv8g/hOWBwAhZN/zY1N3e5yjps/RWymZpR3Lx 6WH3UvU4PeINous8GB/Bu4rbjDQDr0AXhlhiYNPXY0Y4+5uJWXTYZ4juhCnXd9L/iGYK EFbjjB0lfxyDXMkANT3lOMLulbpPeVg6IDvipKHNV3wCdOu8vIQCjnhUw7ozy0rwPGRb F0zMfpFQR4q2AI0Y+J33Ei91tEiNG7qyszvtjOLAE1a5BTkudPxXcYFUIaWvaRq0D3Fg KGeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xbACswUDSf2TZXuAv9JbaUSbhZzk09aavr6CY7LQgnA=; b=NB0b2Po3ULYFAfN+ghDe/IqpHmDi3aHZxhyQzFzFbN4y8VaAn9/TTacJJuaeAsXhif o2v9l//+Txz6OFQ6nnzKqfmG3UcWVLex+ymiw1ld1sRkWJGisqKcMDa9ZpfHY63amicn oHuqg79/GLDFctFxmZkL3UvY5nwjU2d3za6LPLUSmYNFt7EVRZLsgom699EOB6tIk58g AXAEEUpwry2nUCOJuzjjDRRE1oHbbm2yxXpwlF/+PxnrVRaAx45GOtkxtaCOqBSYyiR4 3tur+SDy+zmFVlFgF1skcd8lQh4BErrvemingbFXBMOTVAHh8aCqfBoktH4Kp5OvWCpk g2Rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XvhzsNq5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n19si5883672jaj.117.2021.07.06.04.23.09; Tue, 06 Jul 2021 04:23:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=XvhzsNq5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234410AbhGFLY1 (ORCPT + 99 others); Tue, 6 Jul 2021 07:24:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:55498 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232638AbhGFLTT (ORCPT ); Tue, 6 Jul 2021 07:19:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 75F1361C58; Tue, 6 Jul 2021 11:16:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570201; bh=qcYdnbqkX9V0lWhi62Ku1uDrc46cJ69E55kxUBiy394=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XvhzsNq59158lU8hjv26N13OwPj1/8cCm4Z14/Pxl+U77orvoaTjc6aewRhqH6JTq H8YMiHAPjhk3vZgN4Y7/cxx8bEo6JDi94GB2oqb2OxxpuTO6G0cwdzzk5bla+Wdfox kcKFX2sACNE3jFT8TE2g+Cho2hDh4cyKVWU/3I1N4vz4OnUgvJgPr1y5A1fTcFOOEL YMH3AZU+gVTR/SrD/Dp19xzFP8NCAuFuAnEbsXAjD3cHzsdgryO6UmqheA8MqugJ6l FSaGLAn2TdztYbLh/Dkag3o4qsmNz1zqX8emBciDZVjXo6hHE7jl8L8Nvzabqai8Pb YWhuH/bRRAN7Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yifan Zhang , Felix Kuehling , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.13 113/189] drm/amdgpu/gfx9: fix the doorbell missing when in CGPG issue. Date: Tue, 6 Jul 2021 07:12:53 -0400 Message-Id: <20210706111409.2058071-113-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yifan Zhang [ Upstream commit 631003101c516ea29a74aee59666708857b9a805 ] If GC has entered CGPG, ringing doorbell > first page doesn't wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround this issue. Signed-off-by: Yifan Zhang Reviewed-by: Felix Kuehling Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index 516467e962b7..c09225d065c2 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -3673,8 +3673,12 @@ static int gfx_v9_0_kiq_init_register(struct amdgpu_ring *ring) if (ring->use_doorbell) { WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER, (adev->doorbell_index.kiq * 2) << 2); + /* If GC has entered CGPG, ringing doorbell > first page doesn't + * wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround + * this issue. + */ WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER, - (adev->doorbell_index.userqueue_end * 2) << 2); + (adev->doorbell.size - 4)); } WREG32_SOC15_RLC(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL, -- 2.30.2