Skip to content

shikra: Enable GPU (dt bindings + driver support)#694

Merged
sgaud-quic merged 3 commits into
qualcomm-linux:qcom-6.18.yfrom
asherawa:qcom-6.18.y
Jun 18, 2026
Merged

shikra: Enable GPU (dt bindings + driver support)#694
sgaud-quic merged 3 commits into
qualcomm-linux:qcom-6.18.yfrom
asherawa:qcom-6.18.y

Conversation

@asherawa

@asherawa asherawa commented Jun 11, 2026

Copy link
Copy Markdown

Add support for the Shikra Adreno A704 GPU in the Linux kernel by extending the existing A702-based MSM Adreno support. The change adds the A704 DT compatible and chip ID so the DRM/MSM driver can recognize and initialize the GPU using the shared A702 configuration. Also adds binding documentation for the Shikra Adreno SMMU instance, including the required clock configuration.

qli-2.0 GA Critical Fix

CRs-Fixed: 4569893

@asherawa asherawa requested review from a team, rrnayak, sgaud-quic and yijiyang June 11, 2026 04:30
@quic-ksanadhy

Copy link
Copy Markdown
  1. Add GA Critical Tag.
  2. Add lore links.

@quic-ksanadhy

Copy link
Copy Markdown

@asherawa

Copy link
Copy Markdown
Author

@asherawa

Copy link
Copy Markdown
Author
  1. Add GA Critical Tag.
  2. Add lore links.

Added, for the last commit, posting the patch upstream in progress, will add soon

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

@shashim-quic shashim-quic left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dt-bindings: arm-smmu: Add adreno-smmu compatible for Shikra SoC

add appropriate prefix (FROMLIST etc.)

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4569893 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4569893
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

4 similar comments
@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4569893 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4569893
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4569893 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4569893
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4569893 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4569893
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4569893 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4569893
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

asherawa and others added 3 commits June 15, 2026 12:52
Adreno A704 GPU found Shikra SoC is an IP reuse of A702 GPU with very
minimal changes.

Link: https://lore.kernel.org/lkml/20260609-shikra-gpu-v1-1-9d0e09cab115@oss.qualcomm.com/
Signed-off-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Signed-off-by: Aditya Sherawat <asherawa@qti.qualcomm.com>
Adreno A704 GPU found in Shikra is an IP reuse of A702 GPU with very
minimal changes. The only KMD facing difference is the chipid and the
zap firmware which is specified via devicetree.

Just add the new chipid to enable support for A704 GPU in Shikra.

Link: https://lore.kernel.org/lkml/20260609-shikra-gpu-v1-2-9d0e09cab115@oss.qualcomm.com/
Signed-off-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Aditya Sherawat <asherawa@qti.qualcomm.com>
Add specific compatible strings to document the GPU SMMU present
in the Shikra SoC.

Link: https://lore.kernel.org/lkml/20260615-shikra-gpu-v2-3-2f2d1347c3fb@oss.qualcomm.com/
Signed-off-by: Bibek Kumar Patro <bibek.patro@oss.qualcomm.com>
Signed-off-by: Akhil P Oommen <akhilpo@oss.qualcomm.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: CR Not Eligible for Merge

CR 4569893 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4569893
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

@qcomlnxci qcomlnxci requested a review from a team June 15, 2026 07:28
@qlijarvis

Copy link
Copy Markdown

PR #694 — validate-patch

PR: #694

Verdict Issues Detailed Report
⚠️ 1 Full report

Final Summary

  1. Lore link present: Yes — all three patches include lore.kernel.org Link tags pointing to upstream submissions

  2. Lore link matches PR commits: Cannot verify — lore links reference future dates (June 2026) and are not accessible for content comparison. Based on metadata analysis: patches 1 & 2 are from shikra-gpu-v1 series, patch 3 is from shikra-gpu-v2 series (different but related). Subject lines, authors, and reviewers are consistent with typical upstream submission patterns.

  3. Upstream patch status: Cannot verify — patches are marked FROMLIST (posted upstream, not yet merged). The lore links are not accessible to confirm current merge status in mainline or linux-next.

  4. PR present in qcom-next: Not checked — no kernel tree available in this environment to verify integration status.

Recommendation: Add Aditya Sherawat's Signed-off-by to patch 3, optionally fix grammar in patch 1, then merge.

Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #694 - Shikra GPU support (3 patches)
Upstream commits:

Verdict: ⚠️ PARTIAL


Patch 1/3: dt-bindings: display/msm/gpu: Add support for A704 GPU

Commit Message

Check Status Note
Subject format FROMLIST prefix correct; subsystem path proper
Body grammar ⚠️ Missing "in" → "found Shikra SoC" should be "found in Shikra SoC"
Body preserves rationale Explains A704 is IP reuse of A702
Link tag present lore.kernel.org link included
Authorship preserved Original author (Akhil P Oommen) in first Signed-off-by
Reviewed-by tag Krzysztof Kozlowski review preserved
Chain of custody Aditya Sherawat added final Signed-off-by

Diff

File Status Notes
Documentation/devicetree/bindings/display/msm/gpu.yaml:362 Adds qcom,adreno-07000400 in correct position

Issues

  • Grammar: commit body missing "in" between "found" and "Shikra"

Patch 2/3: drm/msm/adreno: Add support for A704 GPU

Commit Message

Check Status Note
Subject format FROMLIST prefix correct; subsystem path proper
Body preserves rationale Clear technical explanation of chipid addition
Link tag present lore.kernel.org link included
Authorship preserved Original author (Akhil P Oommen) in first Signed-off-by
Reviewed-by tag Konrad Dybcio review preserved
Chain of custody Aditya Sherawat added final Signed-off-by

Diff

File Status Notes
drivers/gpu/drm/msm/adreno/a6xx_catalog.c:1436 Adds 0x07000400 chipid alongside 0x07000200

Issues

  • None

Patch 3/3: dt-bindings: arm-smmu: Document GPU SMMU for Shikra SoC

Commit Message

Check Status Note
Subject format FROMLIST prefix correct; subsystem path acceptable
Body preserves rationale Clear explanation of compatible string addition
Link tag present lore.kernel.org link included (different series: v2)
Authorship preserved Original author (Bibek Kumar Patro) in first Signed-off-by
Co-author sign-off Akhil P Oommen second Signed-off-by preserved
Reviewed-by tag Krzysztof Kozlowski review preserved
Chain of custody Missing Aditya Sherawat Signed-off-by

Diff

File Status Notes
Documentation/devicetree/bindings/iommu/arm,smmu.yaml:550 Adds qcom,shikra-smmu-500 in alphabetical order

Issues

  • Critical: Patch 3 is missing the PR submitter's (Aditya Sherawat) Signed-off-by tag, breaking the chain of custody required by DCO

Issues

Patch 1:

  • Minor grammar error in commit body: "found Shikra SoC" → should be "found in Shikra SoC"

Patch 3:

  • Critical DCO violation: Aditya Sherawat is submitting this patch via PR but has not added their Signed-off-by tag. Per kernel DCO requirements (Developer Certificate of Origin), anyone who handles/submits a patch must sign off on it. Patches 1 and 2 correctly include Aditya's sign-off, but patch 3 does not.

Verdict

Patches 1 & 2: Merge with minor grammar fix to patch 1 body (or accept as-is since it's a trivial typo that doesn't affect technical content).

Patch 3: Must add Aditya Sherawat's Signed-off-by before merging to comply with kernel DCO requirements.


Final Summary

  1. Lore link present: Yes — all three patches include lore.kernel.org Link tags pointing to upstream submissions

  2. Lore link matches PR commits: Cannot verify — lore links reference future dates (June 2026) and are not accessible for content comparison. Based on metadata analysis: patches 1 & 2 are from shikra-gpu-v1 series, patch 3 is from shikra-gpu-v2 series (different but related). Subject lines, authors, and reviewers are consistent with typical upstream submission patterns.

  3. Upstream patch status: Cannot verify — patches are marked FROMLIST (posted upstream, not yet merged). The lore links are not accessible to confirm current merge status in mainline or linux-next.

  4. PR present in qcom-next: Not checked — no kernel tree available in this environment to verify integration status.

Recommendation: Add Aditya Sherawat's Signed-off-by to patch 3, optionally fix grammar in patch 1, then merge.

@qlijarvis

Copy link
Copy Markdown

PR #694 — checker-log-analyzer

PR: #694
Checker run: https://github.com/qualcomm-linux/kernel-config/actions/runs/27530847511

Checker Result Summary
Checker Result Summary
checkpatch All 3 commits passed with no errors or warnings
dt-binding-check Both binding files validated successfully
dtb-check ⏭️ Skipped - no devicetree source changes
sparse-check Passed - no new sparse warnings introduced
check-uapi-headers No UAPI header changes
check-patch-compliance BLOCKER: Commit 3/3 differs from upstream lore link
tag-check N/A Not applicable for qcom-6.18.y branch
qcom-next-check ⏭️ Not applicable - PR targets qcom-6.18.y, not qcom-next

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #694 - Add Shikra GPU support (A704 GPU + SMMU bindings)
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/27530847511

Checker Result Summary
checkpatch All 3 commits passed with no errors or warnings
dt-binding-check Both binding files validated successfully
dtb-check ⏭️ Skipped - no devicetree source changes
sparse-check Passed - no new sparse warnings introduced
check-uapi-headers No UAPI header changes
check-patch-compliance BLOCKER: Commit 3/3 differs from upstream lore link
tag-check N/A Not applicable for qcom-6.18.y branch
qcom-next-check ⏭️ Not applicable - PR targets qcom-6.18.y, not qcom-next

❌ check-patch-compliance

Root cause: The third commit (f17b28a8c149 - "FROMLIST: dt-bindings: arm-smmu: Document GPU SMMU for Shikra SoC") contains changes that differ from the upstream patch referenced in its Link trailer.

Failure details:

2026-06-15T07:44:43.6327878Z Checking commit: FROMLIST: dt-bindings: arm-smmu: Document GPU SMMU for Shikra SoC
2026-06-15T07:44:44.7773589Z Change is different from the one mentioned in Link
2026-06-15T07:44:44.7859333Z ##[error]Process completed with exit code 1.

The commit references:

Link: https://lore.kernel.org/lkml/20260615-shikra-gpu-v2-3-2f2d1347c3fb@oss.qualcomm.com/

But the actual diff in the PR does not match the patch content at that lore URL. This violates the FROMLIST policy, which requires that patches marked as FROMLIST must be byte-for-byte identical to their upstream submission (excluding metadata like Signed-off-by trailers that may be added locally).

Fix:

  1. Verify the upstream patch content by fetching it from lore:

    b4 am 20260615-shikra-gpu-v2-3-2f2d1347c3fb@oss.qualcomm.com
  2. Compare the diff between the PR patch and the upstream patch to identify what differs (could be whitespace, line context, or actual code changes).

  3. Re-apply the correct upstream patch using:

    git reset --hard HEAD~1  # Remove the incorrect commit
    b4 am -o - 20260615-shikra-gpu-v2-3-2f2d1347c3fb@oss.qualcomm.com | git am
  4. Alternative: If the upstream patch has been updated after the PR was created, update the Link trailer to point to the correct version (e.g., v3 instead of v2), or if the change is intentional, remove the FROMLIST prefix and Link trailer entirely and mark it as a local modification.

Reproduce locally:

cd /path/to/kernel
git fetch origin qcom-6.18.y
git checkout qcom-6.18.y
git fetch origin pull/694/head:pr-694
git checkout pr-694

# Run the compliance checker
bash kernel-checkers/check-patch-compliance.sh \
  --kernel-src . \
  --base origin/qcom-6.18.y \
  --head HEAD

Verdict

1 blocker must be fixed before merge: The third commit fails patch compliance verification. The patch content must exactly match the upstream lore submission referenced in the Link trailer, or the Link/FROMLIST prefix must be corrected to reflect the actual upstream state.

@quicAspratap quicAspratap left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff change is already merged in 001de55

@qcomlnxci

Copy link
Copy Markdown

Test Matrix

Test Case lemans-evk monaco-evk qcs615-ride qcs6490-rb3gen2 qcs8300-ride qcs9100-ride-r3 x1e80100-crd
BT_FW_KMD_Service ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
BT_ON_OFF ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
BT_SCAN ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
CPUFreq_Validation ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
CPU_affinity ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
DSP_AudioPD ◻️ ✅ Pass ⚠️ skip ✅ Pass ✅ Pass ⚠️ skip ◻️
Ethernet ◻️ ✅ Pass ⚠️ skip ⚠️ skip ⚠️ skip ⚠️ skip ◻️
Freq_Scaling ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
GIC ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
IPA ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
Interrupts ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
OpenCV ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
PCIe ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
Probe_Failure_Check ◻️ ❌ Fail ✅ Pass ❌ Fail ❌ Fail ❌ Fail ◻️
RMNET ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
UFS_Validation ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
USBHost ◻️ ❌ Fail ❌ Fail ❌ Fail ❌ Fail ❌ Fail ◻️
WiFi_Firmware_Driver ◻️ ❌ Fail ❌ Fail ✅ Pass ✅ Pass ✅ Pass ◻️
WiFi_OnOff ◻️ ❌ Fail ⚠️ skip ✅ Pass ✅ Pass ✅ Pass ◻️
adsp_remoteproc ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ❌ Fail ◻️
cdsp_remoteproc ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ❌ Fail ◻️
gpdsp_remoteproc ◻️ ✅ Pass ⚠️ skip ⚠️ skip ✅ Pass ❌ Fail ◻️
hotplug ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
irq ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
kaslr ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
pinctrl ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
qcom_hwrng ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
remoteproc ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ❌ Fail ◻️
rngtest ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
shmbridge ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
smmu ◻️ ✅ Pass ❌ Fail ✅ Pass ✅ Pass ❌ Fail ◻️
watchdog ◻️ ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
wpss_remoteproc ◻️ ✅ Pass ⚠️ skip ✅ Pass ✅ Pass ✅ Pass ◻️

@qcomlnxci

Copy link
Copy Markdown

Test Matrix

Test Case lemans-evk monaco-evk qcs615-ride qcs6490-rb3gen2 qcs8300-ride qcs9100-ride-r3 x1e80100-crd
BT_FW_KMD_Service ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
BT_ON_OFF ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
BT_SCAN ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
CPUFreq_Validation ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
CPU_affinity ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
DSP_AudioPD ✅ Pass ✅ Pass ⚠️ skip ✅ Pass ✅ Pass ⚠️ skip ◻️
Ethernet ⚠️ skip ✅ Pass ⚠️ skip ⚠️ skip ⚠️ skip ⚠️ skip ◻️
Freq_Scaling ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
GIC ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
IPA ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
Interrupts ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
OpenCV ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
PCIe ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
Probe_Failure_Check ❌ Fail ❌ Fail ✅ Pass ❌ Fail ❌ Fail ❌ Fail ◻️
RMNET ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
UFS_Validation ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
USBHost ❌ Fail ❌ Fail ❌ Fail ❌ Fail ❌ Fail ❌ Fail ◻️
WiFi_Firmware_Driver ❌ Fail ❌ Fail ❌ Fail ✅ Pass ✅ Pass ✅ Pass ◻️
WiFi_OnOff ✅ Pass ❌ Fail ⚠️ skip ✅ Pass ✅ Pass ✅ Pass ◻️
adsp_remoteproc ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ❌ Fail ◻️
cdsp_remoteproc ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ❌ Fail ◻️
gpdsp_remoteproc ✅ Pass ✅ Pass ⚠️ skip ⚠️ skip ✅ Pass ❌ Fail ◻️
hotplug ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
irq ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
kaslr ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
pinctrl ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
qcom_hwrng ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
remoteproc ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ❌ Fail ◻️
rngtest ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
shmbridge ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
smmu ❌ Fail ✅ Pass ❌ Fail ✅ Pass ✅ Pass ❌ Fail ◻️
watchdog ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ✅ Pass ◻️
wpss_remoteproc ✅ Pass ✅ Pass ⚠️ skip ✅ Pass ✅ Pass ✅ Pass ◻️

@asherawa asherawa requested a review from shashim-quic June 17, 2026 12:53
@sgaud-quic sgaud-quic merged commit 8f10758 into qualcomm-linux:qcom-6.18.y Jun 18, 2026
6 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants