From patchwork Tue Sep 12 10:04:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 138634 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp843502vqx; Tue, 12 Sep 2023 21:17:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTu0q2a3/ilvnohb1UP/upr0VPO6qtJbL/gJdgrNDOyzQR/Mcyc+xuvX4wQx9z+8sJsCkt X-Received: by 2002:a54:4d02:0:b0:3a4:357a:ebf4 with SMTP id v2-20020a544d02000000b003a4357aebf4mr1594028oix.0.1694578656270; Tue, 12 Sep 2023 21:17:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694578656; cv=none; d=google.com; s=arc-20160816; b=pCtufKtPuwy9JCEaqZfJUrKME1FhmJeEvEe3t8C6o5vwzc9OmPgZ7/3zrQZk5b9nJG jw5HY7+Y0jHDcda7b7Qx45ze3MvL26IaN1ImxvcQJd9mPXq0js0UHqS8a39yWkc6gpXM 8f7MC6ONzZjecG/jNjye0RXEY/utDk9LBYw3jqbimtzGJvG8hEf6WrgC5/pfP1Odm+ad BZRXcuDM2v44sLDlJCFyCmsqGa/shhKHTsHGUvANDKwR8DR3UlRdsPAMEyl2wl0qPmYS RjUrQQgdriRXnq2SOsGjYkZ2Pa4kWl/0cjDOXAwkZLmmF1E8ADqEkDlZHRs3vikTYn1O ID0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=dFC/pTqRgOjYtF1eBy169/e4YScgRvybAMb04hqUx/E=; fh=iqRI9er+zpecFXyn7o4JiK1UzZHkS2qPJHlMFBU83Qo=; b=oE6xSTUoCmrA/VwhD9iR5eKQQPjDx0HCH8m/gLkcSFcNzVIDimSzwoHaSkCVfeMWvu dAfBMQBB4tge8xTyLfqHIeY1rfLLOhE0WFp2KAKwWaqtNrTdAEDqgDOB1WM87ahZou1a MqJcfGePVJBgzZdiXs4x0qVm1oPcfT+WnIXurqBsCAaFe5wEUrRl01Vdcxl5lridQkWV ZkGMTLxfroKP2K2IpVOsMjznVPWz+H6tXx+4kH6tVxvRCYC63L/l1McnAuVLd11+fUoD 86L1aQtG8yOhnA59PqWViJzDNuwt33UoHPg+ZiOePXja2s7rqheEfBdV8DITwJ3rZohD 2WNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jijaSweP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id d2-20020a63d642000000b0056fa96b3df2si9062155pgj.208.2023.09.12.21.17.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 21:17:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jijaSweP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id AF55083B184B; Tue, 12 Sep 2023 03:05:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.8 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233789AbjILKFL (ORCPT + 37 others); Tue, 12 Sep 2023 06:05:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233736AbjILKFB (ORCPT ); Tue, 12 Sep 2023 06:05:01 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25CC5E64 for ; Tue, 12 Sep 2023 03:04:57 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-51e28cac164so13935539a12.1 for ; Tue, 12 Sep 2023 03:04:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694513095; x=1695117895; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=dFC/pTqRgOjYtF1eBy169/e4YScgRvybAMb04hqUx/E=; b=jijaSwePPGMw0LmIzsCtG7Td9bdZcZGahR3A/OMOHQiNk/oCeW61htMX9Az64akaPd 0UXFr3V7YtW2unRCyDi98W/JUp3u21dzRhZpK/UJNyB5kCUNhF5NFpYUiklLyRqbAvOm UYri4A9879ecQDw8NcpCHCuZIieNDmoKi42SXgdbofUioPXN2WvH83OrRm5PUcSBzqDB DzTDsgjoioEQIEiOwJhlXpw7W3h1cCJqbfVU9eHwuV4hwdMe3JJJAym1EPyWQgHH8Epz YUx0AOBWUq9i9l5Ob4UyqyEYl7Ia03/77hhv4wN92RnLJ8yZwjD349HN0ETbgs94M4tZ e9Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694513095; x=1695117895; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dFC/pTqRgOjYtF1eBy169/e4YScgRvybAMb04hqUx/E=; b=Rv1JDWB78DzkkRXzzGFC0pLAiw4f4TAtdmy4oVyu+uo1ppdthZBEgeF7OXb50MqPxD /G3W4ZvCbiVleJA10IM9U6Z33VVSgemXJpcbL1KtIvvX4x8x2vPpvTX/gMCYoCYvCEaO xMIwuY9UTxi4sPS0HuEVkzePmoyD4GF+xw4V+9HnLM5OX74S3gk6lJ2kjAOkY0rcEzgC ezaQV9gUKKKAciSt+lfx17OxjvYlpsbu2zKWxBaztsoqMaypb/4MnDg/LYB/J1y4caAh lgnxw88YpOxapOpEDDrreRpPHpRzQvybrhL9yfPexRI/mAUp33vLrg8rbQ/jUa2s1R4U 79DQ== X-Gm-Message-State: AOJu0YzjIcDill1h8OyfKYL0C8ZdBK8fJ1ntKsTxsUXWR7TQ4Z/DysBL bfyHGOhYaFbe7FQ9U8tANjcc2Q== X-Received: by 2002:a17:906:3117:b0:9a2:143e:a070 with SMTP id 23-20020a170906311700b009a2143ea070mr2814335ejx.20.1694513095636; Tue, 12 Sep 2023 03:04:55 -0700 (PDT) Received: from [10.167.154.1] (178235177248.dynamic-4-waw-k-1-1-0.vectranet.pl. [178.235.177.248]) by smtp.gmail.com with ESMTPSA id s3-20020a170906060300b0099ce188be7fsm6592053ejb.3.2023.09.12.03.04.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 03:04:55 -0700 (PDT) From: Konrad Dybcio Date: Tue, 12 Sep 2023 12:04:46 +0200 Subject: [PATCH v4 04/10] drm/msm/a6xx: Add missing regs for A7XX MIME-Version: 1.0 Message-Id: <20230628-topic-a7xx_drmmsm-v4-4-8b3e402795c1@linaro.org> References: <20230628-topic-a7xx_drmmsm-v4-0-8b3e402795c1@linaro.org> In-Reply-To: <20230628-topic-a7xx_drmmsm-v4-0-8b3e402795c1@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio , Neil Armstrong X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1694513085; l=2751; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=ggC5Dp2QsbNqWJaD+04wUKh0iGm16iYbE0EVpFZJ6dY=; b=tfYF8uXLR1C62nhIcO11FEXvyFuZ+37RsdN0U6dB09ySn16LaPhcPlJyVR2qmbyJxGuq4lu/U VxFupprMeHwCT1rGaYAlWpOWzkVa7a+PNcj2OZCJO9IxNjVF7Axv9gB X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 12 Sep 2023 03:05:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776894508740162124 X-GMAIL-MSGID: 1776894508740162124 Add some missing definitions required for A7 support. This may be substituted with a mesa header sync. Tested-by: Neil Armstrong # on SM8550-QRD Tested-by: Dmitry Baryshkov # sm8450 Signed-off-by: Konrad Dybcio --- drivers/gpu/drm/msm/adreno/a6xx.xml.h | 9 +++++++++ drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/drivers/gpu/drm/msm/adreno/a6xx.xml.h b/drivers/gpu/drm/msm/adreno/a6xx.xml.h index 1c051535fd4a..863b5e3b0e67 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx.xml.h +++ b/drivers/gpu/drm/msm/adreno/a6xx.xml.h @@ -1114,6 +1114,12 @@ enum a6xx_tex_type { #define REG_A6XX_CP_MISC_CNTL 0x00000840 #define REG_A6XX_CP_APRIV_CNTL 0x00000844 +#define A6XX_CP_APRIV_CNTL_CDWRITE 0x00000040 +#define A6XX_CP_APRIV_CNTL_CDREAD 0x00000020 +#define A6XX_CP_APRIV_CNTL_RBRPWB 0x00000008 +#define A6XX_CP_APRIV_CNTL_RBPRIVLEVEL 0x00000004 +#define A6XX_CP_APRIV_CNTL_RBFETCH 0x00000002 +#define A6XX_CP_APRIV_CNTL_ICACHE 0x00000001 #define REG_A6XX_CP_PREEMPT_THRESHOLD 0x000008c0 @@ -1939,6 +1945,8 @@ static inline uint32_t REG_A6XX_RBBM_PERFCTR_RBBM_SEL(uint32_t i0) { return 0x00 #define REG_A6XX_RBBM_CLOCK_HYST_TEX_FCHE 0x00000122 +#define REG_A7XX_RBBM_CLOCK_HYST2_VFD 0x0000012f + #define REG_A6XX_RBBM_LPAC_GBIF_CLIENT_QOS_CNTL 0x000005ff #define REG_A6XX_DBGC_CFG_DBGBUS_SEL_A 0x00000600 @@ -8252,5 +8260,6 @@ static inline uint32_t A6XX_CX_DBGC_CFG_DBGBUS_BYTEL_1_BYTEL15(uint32_t val) #define REG_A6XX_CX_MISC_SYSTEM_CACHE_CNTL_1 0x00000002 +#define REG_A7XX_CX_MISC_TCM_RET_CNTL 0x00000039 #endif /* A6XX_XML */ diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h b/drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h index fcd9eb53baf8..5b66efafc901 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h @@ -360,6 +360,12 @@ static inline uint32_t A6XX_GMU_GPU_NAP_CTRL_SID(uint32_t val) #define REG_A6XX_GMU_GENERAL_7 0x000051cc +#define REG_A6XX_GMU_GENERAL_8 0x000051cd + +#define REG_A6XX_GMU_GENERAL_9 0x000051ce + +#define REG_A6XX_GMU_GENERAL_10 0x000051cf + #define REG_A6XX_GMU_ISENSE_CTRL 0x0000515d #define REG_A6XX_GPU_CS_ENABLE_REG 0x00008920 @@ -471,6 +477,8 @@ static inline uint32_t A6XX_GMU_GPU_NAP_CTRL_SID(uint32_t val) #define REG_A6XX_RSCC_SEQ_BUSY_DRV0 0x00000101 +#define REG_A7XX_RSCC_SEQ_MEM_0_DRV0_A740 0x00000154 + #define REG_A6XX_RSCC_SEQ_MEM_0_DRV0 0x00000180 #define REG_A6XX_RSCC_TCS0_DRV0_STATUS 0x00000346