From nobody Sun Oct 5 16:20:37 2025 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DED628D8D0 for ; Fri, 1 Aug 2025 18:00:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754071224; cv=none; b=A3vzm2Jji15Cqt/fv2j//N9pNfr4xpZOCakUpcEwbgNgm/lbJ7Z4ng/TOYQELc/ipfLtdkMQhK9gOm6wPJ/dT36vOj36+DGZVuKFzhhoVGg3j1BEgGwqWqfvZcjKL9NoPdUeUww3iuaVCy2F3aBrUohxzIeOAC6wz3Xt8QbS9Y4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754071224; c=relaxed/simple; bh=ZlKkmrc5VgBg7YhDd9UGaHUUv0BCefJviYgw3wueiDI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PIIpRG8LjVhIpgYNCuJzGGzF8sVVYYIavvQILdUpTaaVdWVpKht0APicG7TzIJJtsrljGnEsXsahGmTZreG+S07tEx8GBlZRFmKIxPnJR3eDJcxCfXcBHHvkAKYXHoW2DGRJ5JrwZbko/hw8GFEuTnl0R6nYt94WFC1N7P3q/e8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=d6czJdrb; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="d6czJdrb" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 571HfQZr030687 for ; Fri, 1 Aug 2025 18:00:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=hi1vgMO0Vv7 J21nNKfYLDG2T1ayUhJgydMOm04m2eGY=; b=d6czJdrbXACfHnZPn6JhECTGRA3 mTXLVnmT7RJABZleG2bEQfdlPuaRDGH9xFvd23aQ85qz26JZRjUUs/+DVD8+RuTB 99ovOLDtgKNVhmiTQCe2a8VWClrKwdwAfwbQ6Du0iwWKnrJJ5j1JxzGX69lt/PMx Q15/Y7/zPHnzaVeMh5vVvZeEuzK8jlAo9TRMJAC4lOIZYuUSRGzxOoX++LqVyJaz UBh3EWzgyRXPPZRadC/Nb0uYIzIb29MTguRlN10ecV145yDOlhVusKV0yjjC4SHr i7NGWY7k0PZM45NhUfvzAQolgeUdmr2epa23em2vtJQGtX67fERg62TCyLA== Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 484nyudfmg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 01 Aug 2025 18:00:21 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-b0e0c573531so1896099a12.3 for ; Fri, 01 Aug 2025 11:00:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754071221; x=1754676021; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hi1vgMO0Vv7J21nNKfYLDG2T1ayUhJgydMOm04m2eGY=; b=DxYaAdA7sREVh+yvFFYmxLWIZlzVj9SbgKMg0uUA7LVyK/JramJgoaTj58oYkNf9mI koBrU1BRkwUwuzjf5gULC8jxCKHzikyqrkMBXQ6lY5PDtoaJ1A4ls268O/Ywr37DEhEn ZCe/LNf67nV09TZkCPPdUVzYbQ7CTOyU7XmaDhTiiVA56LNWecn3ySR/+nUoUc19LiAu UZelxh39UW8oFzfvlN5AmfyUms3gh/0cX4uORQ8Yrt3P5zSWjT98eRNLq+5QzVrbwnr+ gCy6tJAU3itq/PhWdxccjJJXHeLKi9ecP8YeNaoHmL7DmQgDkh4OvFdWbOG2KJIaUvnG 3nrg== X-Forwarded-Encrypted: i=1; AJvYcCX8I9F+1+Cf3wVIfz7Qhdt9Cr9kZvYEfNMv7BH537n1Ppv945eOX5dAkkSvcwy47hooX9KHdGfhQnMwtCk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1TpBBAPb49m4S2aNj+nQ0RpNbuUXl1bZDigh5fGZiBU8VO2jr ++kC+1ldEwItzcf93arC64sf2FjU2c2Yg9zYQ9or5hkuer2JI7Hdr/t32MouBfnRQuBD9Tq0TrT V63xUe5xMPUNF1CedXgQ9eG9G5nzg67NqoMrSyMww7flWfa1aK21WDujlzBYGwVnXJskGd0rAor g= X-Gm-Gg: ASbGncshsd8FknrI3E1aDy3B/F1P1K/rlSU/shQaQH+7IdwLWo4srxEcC38/U7+dZiJ jqHKHzVCuOBnVJ+pj9p+IWNcv/lIhkxG9zD/hPgD/lfjMGV9Eqqgn5dqJqmbVJDhqkVqZ3zvawy Wi5P5C4HejbqSdgZBMP2Zoqou4RjeNtlROn26z5QiUfzHjmtAHJ5gimdm+lkfvl5OTMp2tzXRdP GRzoxjigkdl170/d6FTtlnEraUPsetiiShREV6yQ+ariJNAzM3HFXROxeUZufcOz9pB7uEYMfDa 3UymdAYfSZeNSrmtAaer8Zum1m+n9fMZVVhoSfdOYYBObFUD+sg= X-Received: by 2002:a05:6a20:7486:b0:22d:fd6:95e0 with SMTP id adf61e73a8af0-23df8fa1de7mr868838637.11.1754071220367; Fri, 01 Aug 2025 11:00:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6mgJb3hkI3FjCFdZoHfiotilqYID1iNK88urHoLYa/fSW4RsyuIEp7AhFOrCT6Y4ZIAhoow== X-Received: by 2002:a05:6a20:7486:b0:22d:fd6:95e0 with SMTP id adf61e73a8af0-23df8fa1de7mr868773637.11.1754071219906; Fri, 01 Aug 2025 11:00:19 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:5b3e:de60:4fda:e7b1]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b422baedf5csm4238296a12.47.2025.08.01.11.00.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Aug 2025 11:00:19 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Akhil P Oommen , Connor Abbott , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 4/7] drm/msm: Constify snapshot tables Date: Fri, 1 Aug 2025 11:00:01 -0700 Message-ID: <20250801180009.345662-5-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250801180009.345662-1-robin.clark@oss.qualcomm.com> References: <20250801180009.345662-1-robin.clark@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: OolGnUlQ20ntxg0qZE_B6Ygze-0QEGVU X-Proofpoint-ORIG-GUID: OolGnUlQ20ntxg0qZE_B6Ygze-0QEGVU X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODAxMDEzOCBTYWx0ZWRfXyEo+Xidzqqu6 gBM9vwIFOIOMvgI92aZlA/oA31PKQLO+6LPVOVKV4tlcgn6vKCidLNQOl2TRkdPQkqqz7D5vGl8 wmCi3dMXjt+Wo7jwscrPQcg7Niu0xyroLkiqXrQMvuPEmOLwmSUz8D23WYSIXTabgBsijUfenA5 Ub7pl6IVD9f8hSQMUkl8ejR2jg3wkSYlmkXI4+322/GBz8cskoWl3i+CKyXUBkfWFMc2FzDZ6ib Wg6/qFYR0mWjZC87NW7TRrbEPzhVsQ7IfHm740Hb/N0qKPuhLmXiKJkQPCZsBtZQPcnuvRF1Xbi niV63Wu6ig8FWfnAXukYtxexe9wLEhJXRNoNJpKopIQ07k3e2h7axZyXO0RJuMvpSudVRvnZRp3 +bD/9m0XXvGZaaisEs54RJkla6K2q0UuuFz4tFZHoWFXyX80OIb0zZM1mMh4VEvm1ynlHkYu X-Authority-Analysis: v=2.4 cv=CLoqXQrD c=1 sm=1 tr=0 ts=688d00b5 cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=xqWC_Br6kY4A:10 a=2OwXVqhp2XgA:10 a=EUspDBNiAAAA:8 a=3YnKlkqyfxy5QV46dWoA:9 a=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-01_06,2025-08-01_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 malwarescore=0 bulkscore=0 clxscore=1015 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2508010138 Content-Type: text/plain; charset="utf-8" A bit of divergence from the downstream driver from which these headers were imported. But no need for these tables not to be const. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h | 8 ++++---- drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h | 8 ++++---- drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/= msm/adreno/a6xx_gpu_state.c index 5204b28fd7f9..173c14f215a7 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -11,7 +11,7 @@ static const unsigned int *gen7_0_0_external_core_regs[] __always_unused; static const unsigned int *gen7_2_0_external_core_regs[] __always_unused; static const unsigned int *gen7_9_0_external_core_regs[] __always_unused; -static struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] __alway= s_unused; +static const struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] _= _always_unused; static const u32 gen7_9_0_cx_debugbus_blocks[] __always_unused; =20 #include "adreno_gen7_0_0_snapshot.h" diff --git a/drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h b/driver= s/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h index cb66ece6606b..afcc7498983f 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gen7_0_0_snapshot.h @@ -81,7 +81,7 @@ static const u32 gen7_0_0_debugbus_blocks[] =3D { A7XX_DBGBUS_USPTP_7, }; =20 -static struct gen7_shader_block gen7_0_0_shader_blocks[] =3D { +static const struct gen7_shader_block gen7_0_0_shader_blocks[] =3D { {A7XX_TP0_TMO_DATA, 0x200, 4, 2, A7XX_PIPE_BR, A7XX_USPTP= }, {A7XX_TP0_SMO_DATA, 0x80, 4, 2, A7XX_PIPE_BR, A7XX_USPTP= }, {A7XX_TP0_MIPMAP_BASE_DATA, 0x3c0, 4, 2, A7XX_PIPE_BR, A7XX_USPTP= }, @@ -695,7 +695,7 @@ static const struct gen7_sel_reg gen7_0_0_rb_rbp_sel = =3D { .val =3D 0x9, }; =20 -static struct gen7_cluster_registers gen7_0_0_clusters[] =3D { +static const struct gen7_cluster_registers gen7_0_0_clusters[] =3D { { A7XX_CLUSTER_NONE, A7XX_PIPE_BR, STATE_NON_CONTEXT, gen7_0_0_noncontext_pipe_br_registers, }, { A7XX_CLUSTER_NONE, A7XX_PIPE_BV, STATE_NON_CONTEXT, @@ -764,7 +764,7 @@ static struct gen7_cluster_registers gen7_0_0_clusters[= ] =3D { gen7_0_0_vpc_cluster_vpc_ps_pipe_bv_registers, }, }; =20 -static struct gen7_sptp_cluster_registers gen7_0_0_sptp_clusters[] =3D { +static const struct gen7_sptp_cluster_registers gen7_0_0_sptp_clusters[] = =3D { { A7XX_CLUSTER_NONE, A7XX_SP_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_HLSQ_STATE, gen7_0_0_sp_noncontext_pipe_br_hlsq_state_registers, 0xae00 }, { A7XX_CLUSTER_NONE, A7XX_SP_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_SP_TOP, @@ -914,7 +914,7 @@ static const u32 gen7_0_0_dpm_registers[] =3D { }; static_assert(IS_ALIGNED(sizeof(gen7_0_0_dpm_registers), 8)); =20 -static struct gen7_reg_list gen7_0_0_reg_list[] =3D { +static const struct gen7_reg_list gen7_0_0_reg_list[] =3D { { gen7_0_0_gpu_registers, NULL }, { gen7_0_0_cx_misc_registers, NULL }, { gen7_0_0_dpm_registers, NULL }, diff --git a/drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h b/driver= s/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h index 6f8ad50f32ce..6569f12bf12f 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gen7_2_0_snapshot.h @@ -95,7 +95,7 @@ static const u32 gen7_2_0_debugbus_blocks[] =3D { A7XX_DBGBUS_CCHE_2, }; =20 -static struct gen7_shader_block gen7_2_0_shader_blocks[] =3D { +static const struct gen7_shader_block gen7_2_0_shader_blocks[] =3D { {A7XX_TP0_TMO_DATA, 0x200, 6, 2, A7XX_PIPE_BR, A7XX_USPTP= }, {A7XX_TP0_SMO_DATA, 0x80, 6, 2, A7XX_PIPE_BR, A7XX_USPTP= }, {A7XX_TP0_MIPMAP_BASE_DATA, 0x3c0, 6, 2, A7XX_PIPE_BR, A7XX_USPTP= }, @@ -489,7 +489,7 @@ static const struct gen7_sel_reg gen7_2_0_rb_rbp_sel = =3D { .val =3D 0x9, }; =20 -static struct gen7_cluster_registers gen7_2_0_clusters[] =3D { +static const struct gen7_cluster_registers gen7_2_0_clusters[] =3D { { A7XX_CLUSTER_NONE, A7XX_PIPE_BR, STATE_NON_CONTEXT, gen7_2_0_noncontext_pipe_br_registers, }, { A7XX_CLUSTER_NONE, A7XX_PIPE_BV, STATE_NON_CONTEXT, @@ -558,7 +558,7 @@ static struct gen7_cluster_registers gen7_2_0_clusters[= ] =3D { gen7_0_0_vpc_cluster_vpc_ps_pipe_bv_registers, }, }; =20 -static struct gen7_sptp_cluster_registers gen7_2_0_sptp_clusters[] =3D { +static const struct gen7_sptp_cluster_registers gen7_2_0_sptp_clusters[] = =3D { { A7XX_CLUSTER_NONE, A7XX_SP_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_HLSQ_STATE, gen7_0_0_sp_noncontext_pipe_br_hlsq_state_registers, 0xae00 }, { A7XX_CLUSTER_NONE, A7XX_SP_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_SP_TOP, @@ -737,7 +737,7 @@ static const u32 gen7_2_0_dpm_registers[] =3D { }; static_assert(IS_ALIGNED(sizeof(gen7_2_0_dpm_registers), 8)); =20 -static struct gen7_reg_list gen7_2_0_reg_list[] =3D { +static const struct gen7_reg_list gen7_2_0_reg_list[] =3D { { gen7_2_0_gpu_registers, NULL }, { gen7_2_0_cx_misc_registers, NULL }, { gen7_2_0_dpm_registers, NULL }, diff --git a/drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h b/driver= s/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h index b1f8bbf1d843..0956dfca1f05 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h @@ -117,7 +117,7 @@ static const u32 gen7_9_0_cx_debugbus_blocks[] =3D { A7XX_DBGBUS_GBIF_CX, }; =20 -static struct gen7_shader_block gen7_9_0_shader_blocks[] =3D { +static const struct gen7_shader_block gen7_9_0_shader_blocks[] =3D { { A7XX_TP0_TMO_DATA, 0x0200, 6, 2, A7XX_PIPE_BR, A7XX_USPTP }, { A7XX_TP0_SMO_DATA, 0x0080, 6, 2, A7XX_PIPE_BR, A7XX_USPTP }, { A7XX_TP0_MIPMAP_BASE_DATA, 0x03C0, 6, 2, A7XX_PIPE_BR, A7XX_USPTP }, @@ -1116,7 +1116,7 @@ static const struct gen7_sel_reg gen7_9_0_rb_rbp_sel = =3D { .val =3D 0x9, }; =20 -static struct gen7_cluster_registers gen7_9_0_clusters[] =3D { +static const struct gen7_cluster_registers gen7_9_0_clusters[] =3D { { A7XX_CLUSTER_NONE, A7XX_PIPE_BR, STATE_NON_CONTEXT, gen7_9_0_non_context_pipe_br_registers, }, { A7XX_CLUSTER_NONE, A7XX_PIPE_BV, STATE_NON_CONTEXT, @@ -1185,7 +1185,7 @@ static struct gen7_cluster_registers gen7_9_0_cluster= s[] =3D { gen7_9_0_vpc_pipe_bv_cluster_vpc_ps_registers, }, }; =20 -static struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] =3D { +static const struct gen7_sptp_cluster_registers gen7_9_0_sptp_clusters[] = =3D { { A7XX_CLUSTER_NONE, A7XX_SP_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_HLSQ_STATE, gen7_9_0_non_context_sp_pipe_br_hlsq_state_registers, 0xae00}, { A7XX_CLUSTER_NONE, A7XX_SP_NCTX_REG, A7XX_PIPE_BR, 0, A7XX_SP_TOP, @@ -1294,7 +1294,7 @@ static struct gen7_sptp_cluster_registers gen7_9_0_sp= tp_clusters[] =3D { gen7_9_0_tpl1_pipe_br_cluster_sp_ps_usptp_registers, 0xb000}, }; =20 -static struct a6xx_indexed_registers gen7_9_0_cp_indexed_reg_list[] =3D { +static const struct a6xx_indexed_registers gen7_9_0_cp_indexed_reg_list[] = =3D { { "CP_SQE_STAT", REG_A6XX_CP_SQE_STAT_ADDR, REG_A6XX_CP_SQE_STAT_DATA, 0x00040}, { "CP_DRAW_STATE", REG_A6XX_CP_DRAW_STATE_ADDR, @@ -1337,7 +1337,7 @@ static struct a6xx_indexed_registers gen7_9_0_cp_inde= xed_reg_list[] =3D { REG_A7XX_CP_AQE_STAT_DATA_1, 0x00040}, }; =20 -static struct gen7_reg_list gen7_9_0_reg_list[] =3D { +static const struct gen7_reg_list gen7_9_0_reg_list[] =3D { { gen7_9_0_gpu_registers, NULL}, { gen7_9_0_cx_misc_registers, NULL}, { gen7_9_0_cx_dbgc_registers, NULL}, --=20 2.50.1