Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4575194pxv; Tue, 6 Jul 2021 04:26:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQ4aufckSg/1YYBI7aLsOM43/2wnSM6bZMyG2tgCkFAhbUJjJvMOFgyfeM1IFCsXaQc/DL X-Received: by 2002:a05:6402:28a1:: with SMTP id eg33mr22322725edb.249.1625570773381; Tue, 06 Jul 2021 04:26:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570773; cv=none; d=google.com; s=arc-20160816; b=lJWRBzdUsy95Tr3cjM1tagOkMpHgJ7gcA/Va98wPnTysLUYTF0a540rKDvnG4f+Nyv Gw5znpNZwbMiBJ6JH507X8CQdSehGpNw14sRaMHcNxCCU49AV1wU4ufcj0TTBaKHhVxU 0IOab7qFDkIjLUz/JR2S1uVjkQ1rj02PgNfpc5PbZ4TfU/dWSNhMhg1f8JXCvhtOp3I1 V7u98ACU40i0/DB6fEBGk1pRvnGGjpbo73+tiJZ1a7lH/GB8nLCsfr9ejZEnoqoGFw1A l47pcN+rWJvbnHR/u/zxewDTcbC1wmzKPTPj2526jHY6sJ7V65/sk6CDO7wtzESR46h9 D5RQ== 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=zTElVuZ4YCQEjpbsfv5/SmqLDYZnv2CuWJgIPD+Hr0U=; b=b0lI/A1wNXTZGwHz5PnxXZyxCVgQaDDaHOAqdxmxyfc0iECA91/iBe/soM7YXNFoyr fL3eSmneAFS2HKHWHb/5CWKByFHK59OZPn8mpHBXpzZGRlC9S0S3/tlpVI+j2CmtRKGN 4+cKm3f8hI/s1UEbry3tvmmDLwcY8pqhlz48vtvyBorvYdk4pfv4tj7RxM1DRH9ghArD hKy/7c3TRxVfvyBJZ4zVbt4deBPCcES5VScqAU0/M12JMuBNXUpnGhrLYDpOcZ71+AAH mIZI7ZCYWqb7Q+jphI5T4zWmeSB7chrwKFjDm5aTSASKMeGzYFs7/cmXa0GsPKlaz2hc ylVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=c96PTx90; 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 nd35si15276704ejc.274.2021.07.06.04.25.49; Tue, 06 Jul 2021 04:26:13 -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=c96PTx90; 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 S234333AbhGFL1W (ORCPT + 99 others); Tue, 6 Jul 2021 07:27:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:54674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232895AbhGFLUu (ORCPT ); Tue, 6 Jul 2021 07:20:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5324A61CC3; Tue, 6 Jul 2021 11:17:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570247; bh=+gJwqH3qnoQPAxy9N5oXl0R72nGKihjj2Ere3lD/uGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c96PTx90zQu2iIZsfxotCuXhno1bl6k4tYzcCrxodzq+VhCAxWiXNvCOBesZehdtN 1vMZEsYpLzgXey0r57aYd0pfwPqZ/wx0MB3xh3FeKoCSW4Q1kIGB9iHe9dMC6RbPdr QN5o6WJBWkMQwDIb9eSF4m9yzP/St+wC5F4+TrZjnY0tTv1JuwmAbv2ujQUYONY1Wt xv5+3N90q6qCpoABuPwLjT6FFFjqGxd4twgRbpHbhsJsJdU6iK5GIcFm6pChE7duWc m3XBmnu3HE71ytT8utvgQJBbG2pfuX9t4laFOAgUMxRdoq0lxTg7Mrku+Iq26dCXjy L/Xemd9T8g/zQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yifan Zhang , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.13 146/189] Revert "drm/amdgpu/gfx9: fix the doorbell missing when in CGPG issue." Date: Tue, 6 Jul 2021 07:13:26 -0400 Message-Id: <20210706111409.2058071-146-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 962f2f1ae273399e357a3192d5413ca57f9b4885 ] This reverts commit 631003101c516ea29a74aee59666708857b9a805. Reason for revert: side effect of enlarging CP_MEC_DOORBELL_RANGE may cause some APUs fail to enter gfxoff in certain user cases. Signed-off-by: Yifan Zhang Acked-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, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index c09225d065c2..516467e962b7 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -3673,12 +3673,8 @@ 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.size - 4)); + (adev->doorbell_index.userqueue_end * 2) << 2); } WREG32_SOC15_RLC(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL, -- 2.30.2