Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3930226pxj; Mon, 21 Jun 2021 09:36:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyb8DRupSFIJZc3J9jXL3y5WznFyWunq7/SKnhsg5hkXJ8MJNedWT/A9fv7C27viszgApZ8 X-Received: by 2002:a17:907:170f:: with SMTP id le15mr5412285ejc.329.1624293372432; Mon, 21 Jun 2021 09:36:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624293372; cv=none; d=google.com; s=arc-20160816; b=yM0NmmO29jNdh4TSLaT9dabqN/6/5VQwSctbabJkotkKjr9UjhG4WSmWt+qOrG6UU5 rXDVH7tfMSdC2JwiFeAt8KrW3BjTxnudheLlS30as1/Y+vLAcpXzWBIggbTN+ZRewYFW uXxVep+Apw9X6kbkV1/KVR7xA4Z1O6SYsUBIKYsunj4Q0GgNrpPKo6Dtq3xtOvrtApeZ es2n98LQLnMT0Nexoapt+PG6gUzKp28zRfQFAIuX1i6BVJQZdaY/Uk80iQTzpT3TUAVs HjnR4/+EqE0rbkp3P2WF4KZ5/URECNdK43ec4hO1g4w6buzg9ZFUTq6Op9LDAZThOb6u 6B2g== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZMKN50SHkXUYg/ur3QlWuJHV0b581zJO/FYumP9CurU=; b=qkGlr6WNeObnxKTBDrktLm5DvJS2qyZN4040WJGE7kWxySm5iR/92dWHgMyyUlnRxT rRxZvptS0LdCKjWtQIsEbnMG20vI+QYwqf5oRyuvY0MwdlpVKD7ozvCMF3e7pKsaFqUN DKMsybDWiUvVPQCCA8wKF4+YYXEkTc8kMUBf2TbcLCKwZPj+3U2GaFFvAnyEay5c3qw8 Pq/I69tNLU1X3wQPniCW/vc3qaGV6B08Gvo8JRrikv6C080hc3cxi+dnxkdXylIdEZP7 zjO9rli4oHxfQ4CKZZCDl3Vr533NWMHef4fJyEhn0pcDTMHeDKtcQ2QZhEKJEZVN1L+J OQnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tCTo9jCF; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 8si12212758ejx.447.2021.06.21.09.35.49; Mon, 21 Jun 2021 09:36:12 -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=@linuxfoundation.org header.s=korg header.b=tCTo9jCF; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232082AbhFUQhL (ORCPT + 99 others); Mon, 21 Jun 2021 12:37:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:56050 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232250AbhFUQdO (ORCPT ); Mon, 21 Jun 2021 12:33:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A72126141C; Mon, 21 Jun 2021 16:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1624292786; bh=W0+r2mh3izDae03coLBYFoO1p1kMi1t/p2byjHOP7yI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tCTo9jCFigI5JkCZzQOnROfk7QsUU7OdRfZtJcCwQlTP/Db/n+xS9C0xiqWvMDOTT gKPGdJm9w+FJDwrFDH9gi0ktky0pf6WGCDBW7qtoIcyyZyWe8NvRE/pFshi6KbJNfD ir2Mpp2g/2OFYDMO0ujEj8XlRPvK9zJv4swfM4YE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yifan Zhang , Felix Kuehling , Alex Deucher Subject: [PATCH 5.10 130/146] drm/amdgpu/gfx10: enlarge CP_MEC_DOORBELL_RANGE_UPPER to cover full doorbell. Date: Mon, 21 Jun 2021 18:16:00 +0200 Message-Id: <20210621154919.748586693@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210621154911.244649123@linuxfoundation.org> References: <20210621154911.244649123@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yifan Zhang commit 1c0b0efd148d5b24c4932ddb3fa03c8edd6097b3 upstream. 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 Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c @@ -6590,8 +6590,12 @@ static int gfx_v10_0_kiq_init_register(s 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(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,