From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEEAEC433E6 for ; Mon, 31 Aug 2020 15:33:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E0BB207EA for ; Mon, 31 Aug 2020 15:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598888016; bh=P2MC/YP6p1guc9B/2z+SRDFbG5v6erQYKBki/Y+23eM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=f1zhwv5WEQjOHpH/0Ei4gmldE96kqsbOSrz1Em9PF2Uj86zUTbNaxVdi9rZrd1wXU kXW8NkZXID0dJ2up03Ac5FU6wa0gnV5Y8D9RnY6mJ8Y1fBrLIoneKOemsEnHPKTTok JwzZyAdvOVrnVdpuLDSqsAy9+XQbyxV8XWzr/lWQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728973AbgHaPbn (ORCPT ); Mon, 31 Aug 2020 11:31:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:42386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728857AbgHaPb3 (ORCPT ); Mon, 31 Aug 2020 11:31:29 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 46C5921531; Mon, 31 Aug 2020 15:31:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598887889; bh=P2MC/YP6p1guc9B/2z+SRDFbG5v6erQYKBki/Y+23eM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cKpOEQKmV0bxxyoTr4T/C/3ZZfjlUqJkQNoBQjYdB3CtaGi9R69Km3DwLSmQN3znj vGP/gKv9i0R1IZZsRVQzZnSOvKPNw31lvYmpBA1a8mBj6ptXVkNBRwTrq8mZaWKD3O xHLrDjq+lNIg0p0a8z0h8XBIK8VfiyTYHe+bde4Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Baryshkov , Rob Clark , Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 07/11] drm/msm/a6xx: fix gmu start on newer firmware Date: Mon, 31 Aug 2020 11:31:13 -0400 Message-Id: <20200831153117.1024537-7-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200831153117.1024537-1-sashal@kernel.org> References: <20200831153117.1024537-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmitry Baryshkov [ Upstream commit f5749d6181fa7df5ae741788e5d96f593d3a60b6 ] New Qualcomm firmware has changed a way it reports back the 'started' event. Support new register values. Signed-off-by: Dmitry Baryshkov Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index 9cde79a7335c8..739ca9c2081a6 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -117,12 +117,22 @@ static int a6xx_gmu_start(struct a6xx_gmu *gmu) { int ret; u32 val; + u32 mask, reset_val; + + val = gmu_read(gmu, REG_A6XX_GMU_CM3_DTCM_START + 0xff8); + if (val <= 0x20010004) { + mask = 0xffffffff; + reset_val = 0xbabeface; + } else { + mask = 0x1ff; + reset_val = 0x100; + } gmu_write(gmu, REG_A6XX_GMU_CM3_SYSRESET, 1); gmu_write(gmu, REG_A6XX_GMU_CM3_SYSRESET, 0); ret = gmu_poll_timeout(gmu, REG_A6XX_GMU_CM3_FW_INIT_RESULT, val, - val == 0xbabeface, 100, 10000); + (val & mask) == reset_val, 100, 10000); if (ret) dev_err(gmu->dev, "GMU firmware initialization timed out\n"); -- 2.25.1