* [PATCH 1/6] firmware: qcom: scm: Add qcom_scm_gpu_init_regs_is_available()
2026-11-18 13:08 [PATCH 0/6] drm/msm/adreno: Handle unavailable GPU SCM calls Puranam V G Tejaswi
@ 2026-11-18 13:08 ` Puranam V G Tejaswi
2026-11-18 18:42 ` Akhil P Oommen
2026-11-18 13:08 ` [PATCH 2/6] drm/msm/a6xx: Don't fail GMU resume if the GPU init regs SCM call is absent Puranam V G Tejaswi
` (4 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Puranam V G Tejaswi @ 2026-11-18 13:08 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Clark, Sean Paul,
Akhil P Oommen, Dmitry Baryshkov, Abhinav Kumar, Jessica Zhang,
Marijn Suijten, David Airlie, Simona Vetter, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, dri-devel, freedreno, devicetree, linux-kernel,
Puranam V G Tejaswi
The Adreno driver asks the secure world to initialize some GPU registers
through qcom_scm_gpu_init_regs(), and fails to power up the GPU if this
call fails.
Not every secure world implements this call. When it is missing, the
call fails in the same way as a real error, so the driver cannot tell
the two cases apart.
Add qcom_scm_gpu_init_regs_is_available(), similar to
qcom_scm_set_gpu_smmu_aperture_is_available(), so that the driver can
check whether the secure world supports the call before making it.
Signed-off-by: Puranam V G Tejaswi <puranam.tejaswi@oss.qualcomm.com>
---
drivers/firmware/qcom/qcom_scm.c | 7 +++++++
include/linux/firmware/qcom/qcom_scm.h | 1 +
2 files changed, 8 insertions(+)
diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
index 030e4ba90812..f4f34b7dd0b2 100644
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -1941,6 +1941,13 @@ int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val,
}
EXPORT_SYMBOL_GPL(qcom_scm_lmh_dcvsh);
+bool qcom_scm_gpu_init_regs_is_available(void)
+{
+ return __qcom_scm_is_call_available(__scm->dev, QCOM_SCM_SVC_GPU,
+ QCOM_SCM_SVC_GPU_INIT_REGS);
+}
+EXPORT_SYMBOL_GPL(qcom_scm_gpu_init_regs_is_available);
+
int qcom_scm_gpu_init_regs(u32 gpu_req)
{
struct qcom_scm_desc desc = {
diff --git a/include/linux/firmware/qcom/qcom_scm.h b/include/linux/firmware/qcom/qcom_scm.h
index a0a6bc0229c4..c9e88b2904e3 100644
--- a/include/linux/firmware/qcom/qcom_scm.h
+++ b/include/linux/firmware/qcom/qcom_scm.h
@@ -131,6 +131,7 @@ bool qcom_scm_lmh_dcvsh_available(void);
*/
#define QCOM_SCM_GPU_TSENSE_EN_REQ BIT(3)
+bool qcom_scm_gpu_init_regs_is_available(void);
int qcom_scm_gpu_init_regs(u32 gpu_req);
int qcom_scm_shm_bridge_create(u64 pfn_and_ns_perm_flags,
--
2.34.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/6] firmware: qcom: scm: Add qcom_scm_gpu_init_regs_is_available()
2026-11-18 13:08 ` [PATCH 1/6] firmware: qcom: scm: Add qcom_scm_gpu_init_regs_is_available() Puranam V G Tejaswi
@ 2026-11-18 18:42 ` Akhil P Oommen
0 siblings, 0 replies; 13+ messages in thread
From: Akhil P Oommen @ 2026-11-18 18:42 UTC (permalink / raw)
To: Puranam V G Tejaswi, Bjorn Andersson, Konrad Dybcio, Abel Vesa,
Rob Clark, Sean Paul, Dmitry Baryshkov, Abhinav Kumar,
Jessica Zhang, Marijn Suijten, David Airlie, Simona Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, dri-devel, freedreno, devicetree, linux-kernel
On 11/18/2026 6:38 PM, Puranam V G Tejaswi wrote:
> The Adreno driver asks the secure world to initialize some GPU registers
> through qcom_scm_gpu_init_regs(), and fails to power up the GPU if this
> call fails.
>
> Not every secure world implements this call. When it is missing, the
> call fails in the same way as a real error, so the driver cannot tell
> the two cases apart.
>
> Add qcom_scm_gpu_init_regs_is_available(), similar to
> qcom_scm_set_gpu_smmu_aperture_is_available(), so that the driver can
> check whether the secure world supports the call before making it.
>
> Signed-off-by: Puranam V G Tejaswi <puranam.tejaswi@oss.qualcomm.com>
Reviewed-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
-Akhil> ---
> drivers/firmware/qcom/qcom_scm.c | 7 +++++++
> include/linux/firmware/qcom/qcom_scm.h | 1 +
> 2 files changed, 8 insertions(+)
>
> diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
> index 030e4ba90812..f4f34b7dd0b2 100644
> --- a/drivers/firmware/qcom/qcom_scm.c
> +++ b/drivers/firmware/qcom/qcom_scm.c
> @@ -1941,6 +1941,13 @@ int qcom_scm_lmh_dcvsh(u32 payload_fn, u32 payload_reg, u32 payload_val,
> }
> EXPORT_SYMBOL_GPL(qcom_scm_lmh_dcvsh);
>
> +bool qcom_scm_gpu_init_regs_is_available(void)
> +{
> + return __qcom_scm_is_call_available(__scm->dev, QCOM_SCM_SVC_GPU,
> + QCOM_SCM_SVC_GPU_INIT_REGS);
> +}
> +EXPORT_SYMBOL_GPL(qcom_scm_gpu_init_regs_is_available);
> +
> int qcom_scm_gpu_init_regs(u32 gpu_req)
> {
> struct qcom_scm_desc desc = {
> diff --git a/include/linux/firmware/qcom/qcom_scm.h b/include/linux/firmware/qcom/qcom_scm.h
> index a0a6bc0229c4..c9e88b2904e3 100644
> --- a/include/linux/firmware/qcom/qcom_scm.h
> +++ b/include/linux/firmware/qcom/qcom_scm.h
> @@ -131,6 +131,7 @@ bool qcom_scm_lmh_dcvsh_available(void);
> */
> #define QCOM_SCM_GPU_TSENSE_EN_REQ BIT(3)
>
> +bool qcom_scm_gpu_init_regs_is_available(void);
> int qcom_scm_gpu_init_regs(u32 gpu_req);
>
> int qcom_scm_shm_bridge_create(u64 pfn_and_ns_perm_flags,
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/6] drm/msm/a6xx: Don't fail GMU resume if the GPU init regs SCM call is absent
2026-11-18 13:08 [PATCH 0/6] drm/msm/adreno: Handle unavailable GPU SCM calls Puranam V G Tejaswi
2026-11-18 13:08 ` [PATCH 1/6] firmware: qcom: scm: Add qcom_scm_gpu_init_regs_is_available() Puranam V G Tejaswi
@ 2026-11-18 13:08 ` Puranam V G Tejaswi
2026-11-18 18:44 ` Akhil P Oommen
2026-11-18 13:08 ` [PATCH 3/6] dt-bindings: display/msm: gpu: Document the CX SMMU aperture region Puranam V G Tejaswi
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Puranam V G Tejaswi @ 2026-11-18 13:08 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Clark, Sean Paul,
Akhil P Oommen, Dmitry Baryshkov, Abhinav Kumar, Jessica Zhang,
Marijn Suijten, David Airlie, Simona Vetter, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, dri-devel, freedreno, devicetree, linux-kernel,
Puranam V G Tejaswi
On A750, A753 and A8xx, a6xx_gmu_secure_init() asks the secure world to
program CX_MISC_SW_FUSE_VALUE through qcom_scm_gpu_init_regs(), and
aborts the GMU resume if that call fails.
Some platforms have a secure world that does not implement this call.
The call fails every time and the GPU never powers up. The fuse
register is still protected from the kernel, so the driver cannot
program it directly either.
If the secure world does not support the call, skip it, but still read
the fuse register back. An earlier boot stage may have programmed it,
and the features it enables, such as raytracing, are then reported
correctly. If nothing programmed it, they stay disabled. Log once when
the call is skipped.
Signed-off-by: Puranam V G Tejaswi <puranam.tejaswi@oss.qualcomm.com>
---
drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
index 0fa2d2091f3e..95636dabee38 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
@@ -1249,22 +1249,31 @@ static int a6xx_gmu_secure_init(struct a6xx_gpu *a6xx_gpu)
goto done;
}
- u32 gpu_req = QCOM_SCM_GPU_ALWAYS_EN_REQ | QCOM_SCM_GPU_TSENSE_EN_REQ;
+ /*
+ * Some secure world implementations do not provide this call.
+ * Skip it then. An earlier boot stage may still have
+ * programmed the fuse register, so read it back either way.
+ */
+ if (qcom_scm_gpu_init_regs_is_available()) {
+ u32 gpu_req = QCOM_SCM_GPU_ALWAYS_EN_REQ |
+ QCOM_SCM_GPU_TSENSE_EN_REQ;
- if (adreno_gpu->info->a6xx->clx_tbl)
- gpu_req |= QCOM_SCM_GPU_CLX_EN_REQ;
+ if (adreno_gpu->info->a6xx->clx_tbl)
+ gpu_req |= QCOM_SCM_GPU_CLX_EN_REQ;
- ret = qcom_scm_gpu_init_regs(gpu_req);
- if (ret) {
- dev_warn_once(gpu->dev->dev,
- "SCM call failed\n");
- return ret;
+ ret = qcom_scm_gpu_init_regs(gpu_req);
+ if (ret) {
+ dev_warn_once(gpu->dev->dev, "SCM call failed\n");
+ return ret;
+ }
+ } else {
+ dev_info_once(gpu->dev->dev, "GPU init regs SCM call not available, skipping\n");
}
/*
* On A7XX_GEN3 and newer, raytracing may be disabled by the
* firmware, find out whether that's the case. The scm call
- * above sets the fuse register.
+ * above, or an earlier boot stage, sets the fuse register.
*/
fuse_val = a6xx_cx_misc_read(a6xx_gpu,
REG_A7XX_CX_MISC_SW_FUSE_VALUE);
--
2.34.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 2/6] drm/msm/a6xx: Don't fail GMU resume if the GPU init regs SCM call is absent
2026-11-18 13:08 ` [PATCH 2/6] drm/msm/a6xx: Don't fail GMU resume if the GPU init regs SCM call is absent Puranam V G Tejaswi
@ 2026-11-18 18:44 ` Akhil P Oommen
0 siblings, 0 replies; 13+ messages in thread
From: Akhil P Oommen @ 2026-11-18 18:44 UTC (permalink / raw)
To: Puranam V G Tejaswi, Bjorn Andersson, Konrad Dybcio, Abel Vesa,
Rob Clark, Sean Paul, Dmitry Baryshkov, Abhinav Kumar,
Jessica Zhang, Marijn Suijten, David Airlie, Simona Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, dri-devel, freedreno, devicetree, linux-kernel
On 11/18/2026 6:38 PM, Puranam V G Tejaswi wrote:
> On A750, A753 and A8xx, a6xx_gmu_secure_init() asks the secure world to
> program CX_MISC_SW_FUSE_VALUE through qcom_scm_gpu_init_regs(), and
> aborts the GMU resume if that call fails.
>
> Some platforms have a secure world that does not implement this call.
> The call fails every time and the GPU never powers up. The fuse
> register is still protected from the kernel, so the driver cannot
> program it directly either.
>
> If the secure world does not support the call, skip it, but still read
> the fuse register back. An earlier boot stage may have programmed it,
> and the features it enables, such as raytracing, are then reported
> correctly. If nothing programmed it, they stay disabled. Log once when
> the call is skipped.
>
> Signed-off-by: Puranam V G Tejaswi <puranam.tejaswi@oss.qualcomm.com>
Maybe shorten the subject a bit. Say "Make gpu reg init SCM call optional".
Either way:
Reviewed-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
-Akhil.
> ---
> drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 27 ++++++++++++++++++---------
> 1 file changed, 18 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
> index 0fa2d2091f3e..95636dabee38 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
> @@ -1249,22 +1249,31 @@ static int a6xx_gmu_secure_init(struct a6xx_gpu *a6xx_gpu)
> goto done;
> }
>
> - u32 gpu_req = QCOM_SCM_GPU_ALWAYS_EN_REQ | QCOM_SCM_GPU_TSENSE_EN_REQ;
> + /*
> + * Some secure world implementations do not provide this call.
> + * Skip it then. An earlier boot stage may still have
> + * programmed the fuse register, so read it back either way.
> + */
> + if (qcom_scm_gpu_init_regs_is_available()) {
> + u32 gpu_req = QCOM_SCM_GPU_ALWAYS_EN_REQ |
> + QCOM_SCM_GPU_TSENSE_EN_REQ;
>
> - if (adreno_gpu->info->a6xx->clx_tbl)
> - gpu_req |= QCOM_SCM_GPU_CLX_EN_REQ;
> + if (adreno_gpu->info->a6xx->clx_tbl)
> + gpu_req |= QCOM_SCM_GPU_CLX_EN_REQ;
>
> - ret = qcom_scm_gpu_init_regs(gpu_req);
> - if (ret) {
> - dev_warn_once(gpu->dev->dev,
> - "SCM call failed\n");
> - return ret;
> + ret = qcom_scm_gpu_init_regs(gpu_req);
> + if (ret) {
> + dev_warn_once(gpu->dev->dev, "SCM call failed\n");
> + return ret;
> + }
> + } else {
> + dev_info_once(gpu->dev->dev, "GPU init regs SCM call not available, skipping\n");
> }
>
> /*
> * On A7XX_GEN3 and newer, raytracing may be disabled by the
> * firmware, find out whether that's the case. The scm call
> - * above sets the fuse register.
> + * above, or an earlier boot stage, sets the fuse register.
> */
> fuse_val = a6xx_cx_misc_read(a6xx_gpu,
> REG_A7XX_CX_MISC_SW_FUSE_VALUE);
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/6] dt-bindings: display/msm: gpu: Document the CX SMMU aperture region
2026-11-18 13:08 [PATCH 0/6] drm/msm/adreno: Handle unavailable GPU SCM calls Puranam V G Tejaswi
2026-11-18 13:08 ` [PATCH 1/6] firmware: qcom: scm: Add qcom_scm_gpu_init_regs_is_available() Puranam V G Tejaswi
2026-11-18 13:08 ` [PATCH 2/6] drm/msm/a6xx: Don't fail GMU resume if the GPU init regs SCM call is absent Puranam V G Tejaswi
@ 2026-11-18 13:08 ` Puranam V G Tejaswi
2026-11-18 18:45 ` Akhil P Oommen
2026-11-18 13:08 ` [PATCH 4/6] drm/msm/adreno: Program the SMMU aperture when the secure world can't Puranam V G Tejaswi
` (2 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Puranam V G Tejaswi @ 2026-11-18 13:08 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Clark, Sean Paul,
Akhil P Oommen, Dmitry Baryshkov, Abhinav Kumar, Jessica Zhang,
Marijn Suijten, David Airlie, Simona Vetter, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, dri-devel, freedreno, devicetree, linux-kernel,
Puranam V G Tejaswi
The CX SMMU aperture is a register block in the GPU. It holds the
location of the GPU SMMU context banks that the CP uses for pagetable
switching.
On some GPUs the block lies outside the existing GPU register regions.
Add it as an optional aperture region, so the driver can program it on
platforms where the secure world does not.
Signed-off-by: Puranam V G Tejaswi <puranam.tejaswi@oss.qualcomm.com>
---
Documentation/devicetree/bindings/display/msm/gpu.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/display/msm/gpu.yaml b/Documentation/devicetree/bindings/display/msm/gpu.yaml
index 3c90a09febe7..5e4f3149839e 100644
--- a/Documentation/devicetree/bindings/display/msm/gpu.yaml
+++ b/Documentation/devicetree/bindings/display/msm/gpu.yaml
@@ -54,7 +54,7 @@ properties:
reg:
minItems: 1
- maxItems: 3
+ maxItems: 4
reg-names:
minItems: 1
@@ -62,6 +62,7 @@ properties:
- const: kgsl_3d0_reg_memory
- const: cx_mem
- const: cx_dbgc
+ - const: aperture
interrupts:
maxItems: 1
--
2.34.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 3/6] dt-bindings: display/msm: gpu: Document the CX SMMU aperture region
2026-11-18 13:08 ` [PATCH 3/6] dt-bindings: display/msm: gpu: Document the CX SMMU aperture region Puranam V G Tejaswi
@ 2026-11-18 18:45 ` Akhil P Oommen
0 siblings, 0 replies; 13+ messages in thread
From: Akhil P Oommen @ 2026-11-18 18:45 UTC (permalink / raw)
To: Puranam V G Tejaswi, Bjorn Andersson, Konrad Dybcio, Abel Vesa,
Rob Clark, Sean Paul, Dmitry Baryshkov, Abhinav Kumar,
Jessica Zhang, Marijn Suijten, David Airlie, Simona Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, dri-devel, freedreno, devicetree, linux-kernel
On 11/18/2026 6:38 PM, Puranam V G Tejaswi wrote:
> The CX SMMU aperture is a register block in the GPU. It holds the
> location of the GPU SMMU context banks that the CP uses for pagetable
> switching.
>
> On some GPUs the block lies outside the existing GPU register regions.
> Add it as an optional aperture region, so the driver can program it on
> platforms where the secure world does not.
>
> Signed-off-by: Puranam V G Tejaswi <puranam.tejaswi@oss.qualcomm.com>
Acked-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
-Akhil
> ---
> Documentation/devicetree/bindings/display/msm/gpu.yaml | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/display/msm/gpu.yaml b/Documentation/devicetree/bindings/display/msm/gpu.yaml
> index 3c90a09febe7..5e4f3149839e 100644
> --- a/Documentation/devicetree/bindings/display/msm/gpu.yaml
> +++ b/Documentation/devicetree/bindings/display/msm/gpu.yaml
> @@ -54,7 +54,7 @@ properties:
>
> reg:
> minItems: 1
> - maxItems: 3
> + maxItems: 4
>
> reg-names:
> minItems: 1
> @@ -62,6 +62,7 @@ properties:
> - const: kgsl_3d0_reg_memory
> - const: cx_mem
> - const: cx_dbgc
> + - const: aperture
>
> interrupts:
> maxItems: 1
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/6] drm/msm/adreno: Program the SMMU aperture when the secure world can't
2026-11-18 13:08 [PATCH 0/6] drm/msm/adreno: Handle unavailable GPU SCM calls Puranam V G Tejaswi
` (2 preceding siblings ...)
2026-11-18 13:08 ` [PATCH 3/6] dt-bindings: display/msm: gpu: Document the CX SMMU aperture region Puranam V G Tejaswi
@ 2026-11-18 13:08 ` Puranam V G Tejaswi
2026-11-18 18:48 ` Akhil P Oommen
2026-11-18 13:08 ` [PATCH 5/6] arm64: dts: qcom: nord: Describe the GPU CX SMMU aperture Puranam V G Tejaswi
2026-11-18 13:08 ` [PATCH 6/6] arm64: dts: qcom: shikra: " Puranam V G Tejaswi
5 siblings, 1 reply; 13+ messages in thread
From: Puranam V G Tejaswi @ 2026-11-18 13:08 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Clark, Sean Paul,
Akhil P Oommen, Dmitry Baryshkov, Abhinav Kumar, Jessica Zhang,
Marijn Suijten, David Airlie, Simona Vetter, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, dri-devel, freedreno, devicetree, linux-kernel,
Puranam V G Tejaswi
The CP switches pagetables by writing the GPU SMMU context bank
registers itself. It reaches them through the CX SMMU aperture, a
register block in the GPU, which has to point at context bank 0. The
secure world normally owns this block and programs it when
adreno_hw_init() calls qcom_scm_set_gpu_smmu_aperture().
Some platforms have a secure world that does not implement this. Nothing
programs the aperture on these platforms, so the CP cannot switch
pagetables.
If the SCM call is not supported, program the aperture from
adreno_hw_init() instead. Point the GC aperture at context bank 0 and,
on GPUs with LPAC, the LPAC aperture at context bank 1, the same way
the secure world does. Disable the other apertures. The SCM call is
still used whenever it is supported.
The values depend on where context bank 0 sits in the GPU register
space, which differs between GPUs, so they come from a register list in
the GPU catalog. The aperture region comes from DT. If DT describes the
region but it cannot be mapped, fail probe. Add the lists for A702,
whose entry Shikra's GPU also uses, and for A753.
Signed-off-by: Puranam V G Tejaswi <puranam.tejaswi@oss.qualcomm.com>
---
drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 9 ++++++++
drivers/gpu/drm/msm/adreno/a7xx_catalog.c | 10 +++++++++
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 37 +++++++++++++++++++++++++++++++
drivers/gpu/drm/msm/adreno/adreno_gpu.h | 21 ++++++++++++++++++
4 files changed, 77 insertions(+)
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_catalog.c b/drivers/gpu/drm/msm/adreno/a6xx_catalog.c
index 4ef2bd6e7ad2..fe1902b8de16 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_catalog.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_catalog.c
@@ -736,6 +736,14 @@ static const struct adreno_reglist a702_hwcg[] = {
{}
};
+/* GPU aperture: GC to CB0, other apertures disabled */
+static const struct adreno_reglist a702_aperture_reglist_regs[] = {
+ { 0x00, 0x000a8000 }, /* GC: CB0 */
+ { 0x08, 0x00000000 }, /* CTRL: GC only */
+};
+
+DECLARE_ADRENO_REGPAIR_LIST(a702_aperture_reglist);
+
static const struct adreno_info a6xx_gpus[] = {
{
.chip_ids = ADRENO_CHIP_IDS(0x06010000),
@@ -1198,6 +1206,7 @@ static const struct adreno_info a6xx_gpus[] = {
.quirks = ADRENO_QUIRK_HAS_HW_APRIV,
.funcs = &a6xx_gmuwrapper_funcs,
.zapfw = "a702_zap.mbn",
+ .aperture_reglist = &a702_aperture_reglist,
.a6xx = &(const struct a6xx_info) {
.hwcg = a702_hwcg,
.protect = &a650_protect,
diff --git a/drivers/gpu/drm/msm/adreno/a7xx_catalog.c b/drivers/gpu/drm/msm/adreno/a7xx_catalog.c
index 9465ffa3dd12..43d681aa3c2e 100644
--- a/drivers/gpu/drm/msm/adreno/a7xx_catalog.c
+++ b/drivers/gpu/drm/msm/adreno/a7xx_catalog.c
@@ -279,6 +279,15 @@ static const struct adreno_reglist_pipe a7xx_dyn_pwrup_reglist_regs[] = {
DECLARE_ADRENO_REGLIST_PIPE_LIST(a7xx_dyn_pwrup_reglist);
+/* GPU aperture: GC to CB0, LPAC to CB1, other apertures disabled */
+static const struct adreno_reglist a753_aperture_reglist_regs[] = {
+ { 0x00, 0x000c0000 }, /* GC: CB0 */
+ { 0x04, 0x000c1000 }, /* LPAC: CB1 */
+ { 0x08, 0x00000002 }, /* CTRL: GC and LPAC */
+};
+
+DECLARE_ADRENO_REGPAIR_LIST(a753_aperture_reglist);
+
static const struct adreno_info a7xx_gpus[] = {
{
.chip_ids = ADRENO_CHIP_IDS(0x07030001),
@@ -465,6 +474,7 @@ static const struct adreno_info a7xx_gpus[] = {
ADRENO_QUIRK_PREEMPTION |
ADRENO_QUIRK_IFPC,
.funcs = &a7xx_gpu_funcs,
+ .aperture_reglist = &a753_aperture_reglist,
.a6xx = &(const struct a6xx_info) {
.protect = &a730_protect,
.pwrup_reglist = &a7xx_pwrup_reglist,
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
index 54f337475231..c3c84629c5f4 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
@@ -675,6 +675,13 @@ int adreno_hw_init(struct msm_gpu *gpu)
ret = qcom_scm_set_gpu_smmu_aperture(0);
if (ret)
DRM_DEV_ERROR(gpu->dev->dev, "unable to set SMMU aperture: %d\n", ret);
+ } else if (adreno_gpu->aperture) {
+ const struct adreno_regpair_list *list =
+ adreno_gpu->info->aperture_reglist;
+
+ for (int i = 0; i < list->count; i++)
+ writel(list->regs[i].value,
+ adreno_gpu->aperture + list->regs[i].offset);
}
for (int i = 0; i < gpu->nr_rings; i++) {
@@ -1193,6 +1200,32 @@ int adreno_read_speedbin(struct device *dev, u32 *speedbin)
return nvmem_cell_read_variable_le_u32(dev, "speed_bin", speedbin);
}
+/*
+ * Map the GPU aperture, so that adreno_hw_init() can program it when
+ * the secure world does not.
+ */
+static int adreno_gpu_aperture_init(struct platform_device *pdev,
+ struct adreno_gpu *adreno_gpu)
+{
+ struct resource *res;
+ void __iomem *base;
+
+ if (!adreno_gpu->info->aperture_reglist)
+ return 0;
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "aperture");
+ if (!res)
+ return 0;
+
+ base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
+
+ adreno_gpu->aperture = base;
+
+ return 0;
+}
+
int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
struct adreno_gpu *adreno_gpu,
const struct adreno_gpu_funcs *funcs, int nr_rings)
@@ -1238,6 +1271,10 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
adreno_gpu_config.ioname = "kgsl_3d0_reg_memory";
+ ret = adreno_gpu_aperture_init(pdev, adreno_gpu);
+ if (ret)
+ return ret;
+
adreno_gpu_config.nr_rings = nr_rings;
ret = adreno_get_pwrlevels(dev, gpu);
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
index 2911d440ab17..021802c6830c 100644
--- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
+++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
@@ -88,6 +88,19 @@ struct adreno_reglist {
u32 value;
};
+struct adreno_regpair_list {
+ /** @regs: List of register offset and value pairs **/
+ const struct adreno_reglist *regs;
+ /** @count: Number of registers in the list **/
+ u32 count;
+};
+
+#define DECLARE_ADRENO_REGPAIR_LIST(name) \
+static const struct adreno_regpair_list name = { \
+ .regs = name ## _regs, \
+ .count = ARRAY_SIZE(name ## _regs), \
+}
+
/* Reglist with pipe information */
struct adreno_reglist_pipe {
u32 offset;
@@ -129,6 +142,11 @@ struct adreno_info {
*/
struct adreno_speedbin *speedbins;
u64 preempt_record_size;
+ /**
+ * @aperture_reglist: Optional GPU aperture register values. Used if
+ * the secure world does not program the aperture.
+ */
+ const struct adreno_regpair_list *aperture_reglist;
};
#define ADRENO_CHIP_IDS(tbl...) (uint32_t[]) { tbl, 0 }
@@ -250,6 +268,9 @@ struct adreno_gpu {
bool has_ray_tracing;
+ /* GPU aperture, if the driver may need to program it */
+ void __iomem *aperture;
+
u64 uche_trap_base;
};
#define to_adreno_gpu(x) container_of(x, struct adreno_gpu, base)
--
2.34.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 4/6] drm/msm/adreno: Program the SMMU aperture when the secure world can't
2026-11-18 13:08 ` [PATCH 4/6] drm/msm/adreno: Program the SMMU aperture when the secure world can't Puranam V G Tejaswi
@ 2026-11-18 18:48 ` Akhil P Oommen
0 siblings, 0 replies; 13+ messages in thread
From: Akhil P Oommen @ 2026-11-18 18:48 UTC (permalink / raw)
To: Puranam V G Tejaswi, Bjorn Andersson, Konrad Dybcio, Abel Vesa,
Rob Clark, Sean Paul, Dmitry Baryshkov, Abhinav Kumar,
Jessica Zhang, Marijn Suijten, David Airlie, Simona Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, dri-devel, freedreno, devicetree, linux-kernel
On 11/18/2026 6:38 PM, Puranam V G Tejaswi wrote:
> The CP switches pagetables by writing the GPU SMMU context bank
> registers itself. It reaches them through the CX SMMU aperture, a
> register block in the GPU, which has to point at context bank 0. The
> secure world normally owns this block and programs it when
> adreno_hw_init() calls qcom_scm_set_gpu_smmu_aperture().
>
> Some platforms have a secure world that does not implement this. Nothing
> programs the aperture on these platforms, so the CP cannot switch
> pagetables.
>
> If the SCM call is not supported, program the aperture from
> adreno_hw_init() instead. Point the GC aperture at context bank 0 and,
> on GPUs with LPAC, the LPAC aperture at context bank 1, the same way
> the secure world does. Disable the other apertures. The SCM call is
> still used whenever it is supported.
>
> The values depend on where context bank 0 sits in the GPU register
> space, which differs between GPUs, so they come from a register list in
> the GPU catalog. The aperture region comes from DT. If DT describes the
> region but it cannot be mapped, fail probe. Add the lists for A702,
> whose entry Shikra's GPU also uses, and for A753.
>
> Signed-off-by: Puranam V G Tejaswi <puranam.tejaswi@oss.qualcomm.com>
> ---
> drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 9 ++++++++
> drivers/gpu/drm/msm/adreno/a7xx_catalog.c | 10 +++++++++
> drivers/gpu/drm/msm/adreno/adreno_gpu.c | 37 +++++++++++++++++++++++++++++++
> drivers/gpu/drm/msm/adreno/adreno_gpu.h | 21 ++++++++++++++++++
> 4 files changed, 77 insertions(+)
>
> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_catalog.c b/drivers/gpu/drm/msm/adreno/a6xx_catalog.c
> index 4ef2bd6e7ad2..fe1902b8de16 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_catalog.c
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_catalog.c
> @@ -736,6 +736,14 @@ static const struct adreno_reglist a702_hwcg[] = {
> {}
> };
>
> +/* GPU aperture: GC to CB0, other apertures disabled */
> +static const struct adreno_reglist a702_aperture_reglist_regs[] = {
> + { 0x00, 0x000a8000 }, /* GC: CB0 */
> + { 0x08, 0x00000000 }, /* CTRL: GC only */
These offsets should be documented in the xml file instead of hardcoded values.
Otherwise LGTM.
-Akhil.
> +};
> +
> +DECLARE_ADRENO_REGPAIR_LIST(a702_aperture_reglist);
> +
> static const struct adreno_info a6xx_gpus[] = {
> {
> .chip_ids = ADRENO_CHIP_IDS(0x06010000),
> @@ -1198,6 +1206,7 @@ static const struct adreno_info a6xx_gpus[] = {
> .quirks = ADRENO_QUIRK_HAS_HW_APRIV,
> .funcs = &a6xx_gmuwrapper_funcs,
> .zapfw = "a702_zap.mbn",
> + .aperture_reglist = &a702_aperture_reglist,
> .a6xx = &(const struct a6xx_info) {
> .hwcg = a702_hwcg,
> .protect = &a650_protect,
> diff --git a/drivers/gpu/drm/msm/adreno/a7xx_catalog.c b/drivers/gpu/drm/msm/adreno/a7xx_catalog.c
> index 9465ffa3dd12..43d681aa3c2e 100644
> --- a/drivers/gpu/drm/msm/adreno/a7xx_catalog.c
> +++ b/drivers/gpu/drm/msm/adreno/a7xx_catalog.c
> @@ -279,6 +279,15 @@ static const struct adreno_reglist_pipe a7xx_dyn_pwrup_reglist_regs[] = {
>
> DECLARE_ADRENO_REGLIST_PIPE_LIST(a7xx_dyn_pwrup_reglist);
>
> +/* GPU aperture: GC to CB0, LPAC to CB1, other apertures disabled */
> +static const struct adreno_reglist a753_aperture_reglist_regs[] = {
> + { 0x00, 0x000c0000 }, /* GC: CB0 */
> + { 0x04, 0x000c1000 }, /* LPAC: CB1 */
> + { 0x08, 0x00000002 }, /* CTRL: GC and LPAC */
> +};
> +
> +DECLARE_ADRENO_REGPAIR_LIST(a753_aperture_reglist);
> +
> static const struct adreno_info a7xx_gpus[] = {
> {
> .chip_ids = ADRENO_CHIP_IDS(0x07030001),
> @@ -465,6 +474,7 @@ static const struct adreno_info a7xx_gpus[] = {
> ADRENO_QUIRK_PREEMPTION |
> ADRENO_QUIRK_IFPC,
> .funcs = &a7xx_gpu_funcs,
> + .aperture_reglist = &a753_aperture_reglist,
> .a6xx = &(const struct a6xx_info) {
> .protect = &a730_protect,
> .pwrup_reglist = &a7xx_pwrup_reglist,
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
> index 54f337475231..c3c84629c5f4 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
> @@ -675,6 +675,13 @@ int adreno_hw_init(struct msm_gpu *gpu)
> ret = qcom_scm_set_gpu_smmu_aperture(0);
> if (ret)
> DRM_DEV_ERROR(gpu->dev->dev, "unable to set SMMU aperture: %d\n", ret);
> + } else if (adreno_gpu->aperture) {
> + const struct adreno_regpair_list *list =
> + adreno_gpu->info->aperture_reglist;
> +
> + for (int i = 0; i < list->count; i++)
> + writel(list->regs[i].value,
> + adreno_gpu->aperture + list->regs[i].offset);
> }
>
> for (int i = 0; i < gpu->nr_rings; i++) {
> @@ -1193,6 +1200,32 @@ int adreno_read_speedbin(struct device *dev, u32 *speedbin)
> return nvmem_cell_read_variable_le_u32(dev, "speed_bin", speedbin);
> }
>
> +/*
> + * Map the GPU aperture, so that adreno_hw_init() can program it when
> + * the secure world does not.
> + */
> +static int adreno_gpu_aperture_init(struct platform_device *pdev,
> + struct adreno_gpu *adreno_gpu)
> +{
> + struct resource *res;
> + void __iomem *base;
> +
> + if (!adreno_gpu->info->aperture_reglist)
> + return 0;
> +
> + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "aperture");
> + if (!res)
> + return 0;
> +
> + base = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(base))
> + return PTR_ERR(base);
> +
> + adreno_gpu->aperture = base;
> +
> + return 0;
> +}
> +
> int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
> struct adreno_gpu *adreno_gpu,
> const struct adreno_gpu_funcs *funcs, int nr_rings)
> @@ -1238,6 +1271,10 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
>
> adreno_gpu_config.ioname = "kgsl_3d0_reg_memory";
>
> + ret = adreno_gpu_aperture_init(pdev, adreno_gpu);
> + if (ret)
> + return ret;
> +
> adreno_gpu_config.nr_rings = nr_rings;
>
> ret = adreno_get_pwrlevels(dev, gpu);
> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> index 2911d440ab17..021802c6830c 100644
> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
> @@ -88,6 +88,19 @@ struct adreno_reglist {
> u32 value;
> };
>
> +struct adreno_regpair_list {
> + /** @regs: List of register offset and value pairs **/
> + const struct adreno_reglist *regs;
> + /** @count: Number of registers in the list **/
> + u32 count;
> +};
> +
> +#define DECLARE_ADRENO_REGPAIR_LIST(name) \
> +static const struct adreno_regpair_list name = { \
> + .regs = name ## _regs, \
> + .count = ARRAY_SIZE(name ## _regs), \
> +}
> +
> /* Reglist with pipe information */
> struct adreno_reglist_pipe {
> u32 offset;
> @@ -129,6 +142,11 @@ struct adreno_info {
> */
> struct adreno_speedbin *speedbins;
> u64 preempt_record_size;
> + /**
> + * @aperture_reglist: Optional GPU aperture register values. Used if
> + * the secure world does not program the aperture.
> + */
> + const struct adreno_regpair_list *aperture_reglist;
> };
>
> #define ADRENO_CHIP_IDS(tbl...) (uint32_t[]) { tbl, 0 }
> @@ -250,6 +268,9 @@ struct adreno_gpu {
>
> bool has_ray_tracing;
>
> + /* GPU aperture, if the driver may need to program it */
> + void __iomem *aperture;
> +
> u64 uche_trap_base;
> };
> #define to_adreno_gpu(x) container_of(x, struct adreno_gpu, base)
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 5/6] arm64: dts: qcom: nord: Describe the GPU CX SMMU aperture
2026-11-18 13:08 [PATCH 0/6] drm/msm/adreno: Handle unavailable GPU SCM calls Puranam V G Tejaswi
` (3 preceding siblings ...)
2026-11-18 13:08 ` [PATCH 4/6] drm/msm/adreno: Program the SMMU aperture when the secure world can't Puranam V G Tejaswi
@ 2026-11-18 13:08 ` Puranam V G Tejaswi
2026-11-18 18:48 ` Akhil P Oommen
2026-11-18 13:08 ` [PATCH 6/6] arm64: dts: qcom: shikra: " Puranam V G Tejaswi
5 siblings, 1 reply; 13+ messages in thread
From: Puranam V G Tejaswi @ 2026-11-18 13:08 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Clark, Sean Paul,
Akhil P Oommen, Dmitry Baryshkov, Abhinav Kumar, Jessica Zhang,
Marijn Suijten, David Airlie, Simona Vetter, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, dri-devel, freedreno, devicetree, linux-kernel,
Puranam V G Tejaswi
Add the CX SMMU aperture register region to the A753 GPU node.
Signed-off-by: Puranam V G Tejaswi <puranam.tejaswi@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/nord.dtsi | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/nord.dtsi b/arch/arm64/boot/dts/qcom/nord.dtsi
index 3e29c43ca9ad..cb5ee6b68779 100644
--- a/arch/arm64/boot/dts/qcom/nord.dtsi
+++ b/arch/arm64/boot/dts/qcom/nord.dtsi
@@ -1717,10 +1717,12 @@ gpu_0: gpu@3d00000 {
compatible = "qcom,adreno-43051701", "qcom,adreno";
reg = <0x0 0x03d00000 0x0 0x40000>,
<0x0 0x03d9e000 0x0 0x2000>,
- <0x0 0x03d61000 0x0 0x800>;
+ <0x0 0x03d61000 0x0 0x800>,
+ <0x0 0x03d60000 0x0 0x1000>;
reg-names = "kgsl_3d0_reg_memory",
"cx_mem",
- "cx_dbgc";
+ "cx_dbgc",
+ "aperture";
interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
--
2.34.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 5/6] arm64: dts: qcom: nord: Describe the GPU CX SMMU aperture
2026-11-18 13:08 ` [PATCH 5/6] arm64: dts: qcom: nord: Describe the GPU CX SMMU aperture Puranam V G Tejaswi
@ 2026-11-18 18:48 ` Akhil P Oommen
0 siblings, 0 replies; 13+ messages in thread
From: Akhil P Oommen @ 2026-11-18 18:48 UTC (permalink / raw)
To: Puranam V G Tejaswi, Bjorn Andersson, Konrad Dybcio, Abel Vesa,
Rob Clark, Sean Paul, Dmitry Baryshkov, Abhinav Kumar,
Jessica Zhang, Marijn Suijten, David Airlie, Simona Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, dri-devel, freedreno, devicetree, linux-kernel
On 11/18/2026 6:38 PM, Puranam V G Tejaswi wrote:
> Add the CX SMMU aperture register region to the A753 GPU node.
>
> Signed-off-by: Puranam V G Tejaswi <puranam.tejaswi@oss.qualcomm.com>
Reviewed-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
-Akhil
> ---
> arch/arm64/boot/dts/qcom/nord.dtsi | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/nord.dtsi b/arch/arm64/boot/dts/qcom/nord.dtsi
> index 3e29c43ca9ad..cb5ee6b68779 100644
> --- a/arch/arm64/boot/dts/qcom/nord.dtsi
> +++ b/arch/arm64/boot/dts/qcom/nord.dtsi
> @@ -1717,10 +1717,12 @@ gpu_0: gpu@3d00000 {
> compatible = "qcom,adreno-43051701", "qcom,adreno";
> reg = <0x0 0x03d00000 0x0 0x40000>,
> <0x0 0x03d9e000 0x0 0x2000>,
> - <0x0 0x03d61000 0x0 0x800>;
> + <0x0 0x03d61000 0x0 0x800>,
> + <0x0 0x03d60000 0x0 0x1000>;
> reg-names = "kgsl_3d0_reg_memory",
> "cx_mem",
> - "cx_dbgc";
> + "cx_dbgc",
> + "aperture";
>
> interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 6/6] arm64: dts: qcom: shikra: Describe the GPU CX SMMU aperture
2026-11-18 13:08 [PATCH 0/6] drm/msm/adreno: Handle unavailable GPU SCM calls Puranam V G Tejaswi
` (4 preceding siblings ...)
2026-11-18 13:08 ` [PATCH 5/6] arm64: dts: qcom: nord: Describe the GPU CX SMMU aperture Puranam V G Tejaswi
@ 2026-11-18 13:08 ` Puranam V G Tejaswi
2026-11-18 18:50 ` Akhil P Oommen
5 siblings, 1 reply; 13+ messages in thread
From: Puranam V G Tejaswi @ 2026-11-18 13:08 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Clark, Sean Paul,
Akhil P Oommen, Dmitry Baryshkov, Abhinav Kumar, Jessica Zhang,
Marijn Suijten, David Airlie, Simona Vetter, Maarten Lankhorst,
Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, dri-devel, freedreno, devicetree, linux-kernel,
Puranam V G Tejaswi
Add the CX SMMU aperture register region to the GPU node.
Signed-off-by: Puranam V G Tejaswi <puranam.tejaswi@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/shikra.dtsi | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/shikra.dtsi b/arch/arm64/boot/dts/qcom/shikra.dtsi
index 0a95ad5a5582..ebbe5e23d173 100644
--- a/arch/arm64/boot/dts/qcom/shikra.dtsi
+++ b/arch/arm64/boot/dts/qcom/shikra.dtsi
@@ -2647,10 +2647,12 @@ gpu: gpu@5900000 {
compatible = "qcom,adreno-07000400", "qcom,adreno";
reg = <0x0 0x05900000 0x0 0x40000>,
<0x0 0x0599e000 0x0 0x1000>,
- <0x0 0x05961000 0x0 0x800>;
+ <0x0 0x05961000 0x0 0x800>,
+ <0x0 0x05960000 0x0 0x1000>;
reg-names = "kgsl_3d0_reg_memory",
"cx_mem",
- "cx_dbgc";
+ "cx_dbgc",
+ "aperture";
interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH 0>;
--
2.34.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 6/6] arm64: dts: qcom: shikra: Describe the GPU CX SMMU aperture
2026-11-18 13:08 ` [PATCH 6/6] arm64: dts: qcom: shikra: " Puranam V G Tejaswi
@ 2026-11-18 18:50 ` Akhil P Oommen
0 siblings, 0 replies; 13+ messages in thread
From: Akhil P Oommen @ 2026-11-18 18:50 UTC (permalink / raw)
To: Puranam V G Tejaswi, Bjorn Andersson, Konrad Dybcio, Abel Vesa,
Rob Clark, Sean Paul, Dmitry Baryshkov, Abhinav Kumar,
Jessica Zhang, Marijn Suijten, David Airlie, Simona Vetter,
Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: linux-arm-msm, dri-devel, freedreno, devicetree, linux-kernel
On 11/18/2026 6:38 PM, Puranam V G Tejaswi wrote:
> Add the CX SMMU aperture register region to the GPU node.
>
> Signed-off-by: Puranam V G Tejaswi <puranam.tejaswi@oss.qualcomm.com>
Reviewed-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
-Akhil
> ---
> arch/arm64/boot/dts/qcom/shikra.dtsi | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/shikra.dtsi b/arch/arm64/boot/dts/qcom/shikra.dtsi
> index 0a95ad5a5582..ebbe5e23d173 100644
> --- a/arch/arm64/boot/dts/qcom/shikra.dtsi
> +++ b/arch/arm64/boot/dts/qcom/shikra.dtsi
> @@ -2647,10 +2647,12 @@ gpu: gpu@5900000 {
> compatible = "qcom,adreno-07000400", "qcom,adreno";
> reg = <0x0 0x05900000 0x0 0x40000>,
> <0x0 0x0599e000 0x0 0x1000>,
> - <0x0 0x05961000 0x0 0x800>;
> + <0x0 0x05961000 0x0 0x800>,
> + <0x0 0x05960000 0x0 0x1000>;
> reg-names = "kgsl_3d0_reg_memory",
> "cx_mem",
> - "cx_dbgc";
> + "cx_dbgc",
> + "aperture";
>
> interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH 0>;
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread