Skip to content

Enable shikra camx DTB compilation for linux-qcom kernels - #3171

Merged
Ricardo Salveti (ricardosalveti) merged 2 commits into
qualcomm-linux:masterfrom
cjha01:camx-dlkm
Oct 3, 2026
Merged

Ricardo Salveti (ricardosalveti) merged 2 commits into
qualcomm-linux:masterfrom
cjha01:camx-dlkm

Conversation

@cjha01

@cjha01 Chandan Jha (cjha01) commented Sep 16, 2026 •

Copy link
Copy Markdown
Contributor

Downstream camera DTB is not included in the final image
when building linux-qcom, linux-qcom-next, linux-qcom-rt,
or linux-qcom-next-rt kernels for the shikra EVK boards.
This prevents the downstream camera stack from being
enabled at boot, even though the kernel supports it.
 
Include the downstream camera DTBO so it is packaged into
the final image and downstream camera functionality is
available for the shikra EVK boards.
 
Add multi-DTB support for camx overlay to enable downstream
camera for shikra cqs, cqm and iqs evk boards.

@cjha01
Chandan Jha (cjha01) marked this pull request as draft September 16, 2026 15:28
@ricardosalveti Ricardo Salveti (ricardosalveti) changed the title Enable shikra camx DTB compilation for linux-qcomt kernel Enable shikra camx DTB compilation for linux-qcom kernel Sep 16, 2026
@cjha01
Chandan Jha (cjha01) marked this pull request as ready for review September 18, 2026 14:58
@cjha01

Copy link
Copy Markdown
Contributor Author

qli-2.1 pull-request freeze

@cjha01

Copy link
Copy Markdown
Contributor Author

@cjha01

Copy link
Copy Markdown
Contributor Author

backport wrynose

Comment thread conf/machine/shikra-evk.conf
@github-actions

github-actions Bot commented Sep 19, 2026 •

Copy link
Copy Markdown

Test run workflow

Test jobs for commit 8222193

qcom-distro_linux-qcom-6.18
Pass: 234 | Fail: 1 | Total: 253
nodistro
Pass: 10 | Fail: 0 | Total: 10
qcom-distro
Pass: 337 | Fail: 2 | Total: 367

@test-reporting-app

test-reporting-app Bot commented Sep 19, 2026 •

Copy link
Copy Markdown

Test Results

  117 files    717 suites   7h 17m 8s ⏱️
  195 tests   191 ✅  2 💤 2 ❌
4 613 runs  4 564 ✅ 46 💤 3 ❌

For more details on these failures, see this check.

Results for commit 8222193.

♻️ This comment has been updated with latest results.

@cjha01

Copy link
Copy Markdown
Contributor Author

Ricardo Salveti (@ricardosalveti), Dmitry Baryshkov (@lumag), Shikra camera enablement is a key deliverable for the QLI 2.1 milestone, and this change is required to enable camera support.

Since the Shikra DTSO changes have not yet been merged into the qcom-next branch, we have added a conditional check so that the code is compiled only for the QLI 2.x kernel and is excluded from the mainline kernel build.

We hope this approach is acceptable and helps us meet the QLI 2.1 timeline while maintaining mainline compatibility. Could you please review the PR and share your feedback?

@qcomlnxci

Copy link
Copy Markdown

Test Coral run workflow

Test jobs for commit 3907012

  • qcomdistro: multimedia image
    Pass: 9 | Fail: 0 | Total: 9
  • qcomdistro: multimedia image-prop
    Pass: 41 | Fail: 0 | Total: 41

@lumag Dmitry Baryshkov (lumag) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

You haven't read CONTRIBUTING.md, have you?

@cjha01

Copy link
Copy Markdown
Contributor Author

You haven't read CONTRIBUTING.md, have you?
Yes, I understand your concern. Due to project timelines, we were focused on the QLI 2.1 kernel only. I will make sure that future changes are first submitted for the QLI mainline kernel and then extended to QLI 2.x kernel.

@qcomlnxci

Copy link
Copy Markdown

Test Coral run workflow

Test jobs for commit 0ebbb52

  • qcomdistro: multimedia image-prop
    Pass: 25 | Fail: 4 | Total: 29
  • qcomdistro: multimedia image
    Pass: 7 | Fail: 2 | Total: 9

Comment thread conf/machine/shikra-evk.conf Outdated
qcom/shikra-iqs-evk-imx577-camera.dtbo \
"

# These DTs are not upstreamed and currently exist only in linux-qcom kernels

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Drop this comment, we know that LINUX_QCOM_KERNEL_DEVICETREE is for dtbs which are not yet available upstream.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Dropped this comment. Done.

@ricardosalveti

Copy link
Copy Markdown
Contributor

See https://github.com/qualcomm-linux/meta-qcom/blob/master/CONTRIBUTING.md#commit-messages for the commit message pattern we use here.

Comment thread conf/machine/shikra-evk.conf
@qcomlnxci

Copy link
Copy Markdown

Test Coral run workflow

Test jobs for commit 718a898

  • qcomdistro: multimedia image-prop
    Pass: 26 | Fail: 2 | Others: 3 | Total: 31
  • qcomdistro: multimedia image
    Pass: 4 | Fail: 0 | Total: 4

@ricardosalveti

Copy link
Copy Markdown
Contributor

Subject and body still say linux-qcom only, but this now covers linux-qcom and linux-qcom-next. The last paragraph ("Add multi-DTB support…") belongs to the second commit. Also use lowercase enable, as lumag suggested.

Please name shikra in the subject, e.g. fit-dtb-compatible: add shikra camx overlay combos. The body repeats the first commit's text; say what the entries do instead: base compatible plus -camx, with the imx577 overlay dropped, as hamoa does.

@qcomlnxci

Copy link
Copy Markdown

Test Coral run workflow

Test jobs for commit 3ecc1a5

  • qcomdistro: multimedia image-prop
    Pass: 29 | Fail: 0 | Others: 3 | Total: 32
  • qcomdistro: multimedia image
    Pass: 4 | Fail: 0 | Total: 4

@cjha01 Chandan Jha (cjha01) changed the title Enable shikra camx DTB compilation for linux-qcom kernel Enable shikra camx DTB compilation for linux-qcom kernels Sep 30, 2026
@cjha01

Copy link
Copy Markdown
Contributor Author

Subject and body still say linux-qcom only, but this now covers linux-qcom and linux-qcom-next. The last paragraph ("Add multi-DTB support…") belongs to the second commit. Also use lowercase enable, as lumag suggested.

Please name shikra in the subject, e.g. fit-dtb-compatible: add shikra camx overlay combos. The body repeats the first commit's text; say what the entries do instead: base compatible plus -camx, with the imx577 overlay dropped, as hamoa does.

Updated the commit text.

@cjha01

Copy link
Copy Markdown
Contributor Author

Subject and body still say linux-qcom only, but this now covers linux-qcom and linux-qcom-next. The last paragraph ("Add multi-DTB support…") belongs to the second commit. Also use lowercase enable, as lumag suggested.

Please name shikra in the subject, e.g. fit-dtb-compatible: add shikra camx overlay combos. The body repeats the first commit's text; say what the entries do instead: base compatible plus -camx, with the imx577 overlay dropped, as hamoa does.

I have updated the commit message based on the suggestions. Could you please review it once.

@lumag Dmitry Baryshkov (lumag) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please fix your editor settings. Line length is too short.

@cjha01
Chandan Jha (cjha01) force-pushed the camx-dlkm branch 2 times, most recently from 496b774 to 94df16a Compare September 30, 2026 16:42
@cjha01

Copy link
Copy Markdown
Contributor Author

Please fix your editor settings. Line length is too short.

Updated. Please review.

@qcomlnxci

Copy link
Copy Markdown

Test Coral run workflow

Test jobs for commit 496b774

  • qcomdistro: multimedia image-prop
    Pass: 30 | Fail: 2 | Total: 32
  • qcomdistro: multimedia image
    Pass: 4 | Fail: 0 | Total: 4

@qcomlnxci

Copy link
Copy Markdown

Test Coral run workflow

Test jobs for commit 94df16a

  • qcomdistro: multimedia image-prop
    Pass: 32 | Fail: 0 | Total: 32
  • qcomdistro: multimedia image
    Pass: 4 | Fail: 0 | Total: 4

Downstream camera DTB is not included in the final image when
building linux-qcom, linux-qcom-next, linux-qcom-rt, or
linux-qcom-next-rt kernels for the shikra EVK boards. This
prevents the downstream camera stack from being enabled at boot,
even though the kernel supports it.

Include the downstream camera DTBO so it is packaged into the
final image and downstream camera functionality is available for
the shikra cqs, cqm and iqs EVK boards.

Signed-off-by: Chandan Kumar Jha <cjha@qti.qualcomm.com>
Add multi-DTB support for camx overlay to enable downstream
camera for shikra cqs, cqm and iqs EVK boards.

Signed-off-by: Chandan Kumar Jha <cjha@qti.qualcomm.com>
@qcomlnxci

Copy link
Copy Markdown

Test Coral run workflow

Test jobs for commit 8222193

  • qcomdistro: multimedia image
    Pass: 6 | Fail: 0 | Total: 6
  • qcomdistro: multimedia image-prop
    Pass: 32 | Fail: 0 | Total: 32

@cjha01

Copy link
Copy Markdown
Contributor Author

HI Dmitry Baryshkov (@lumag) , @ricardosalvet, Please review the change and approve it if it meets your expectations.

@ricardosalveti

Copy link
Copy Markdown
Contributor

Known issues.

@ricardosalveti
Ricardo Salveti (ricardosalveti) merged commit 9c9c79c into qualcomm-linux:master Oct 3, 2026
209 of 211 checks passed
@quic-yocto-ci

Copy link
Copy Markdown
Contributor

Successfully created backport PR for wrynose:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants