Skip to content

Revert "drm/msm: dsi: fix PLL init in bonded mode" - #1623

Open
mohitdsor wants to merge 1 commit into
qualcomm-linux:tech/mm/drmfrom
mohitdsor:lilliput_revert_techmm
Open

Revert "drm/msm: dsi: fix PLL init in bonded mode"#1623
mohitdsor wants to merge 1 commit into
qualcomm-linux:tech/mm/drmfrom
mohitdsor:lilliput_revert_techmm

Conversation

@mohitdsor

@mohitdsor mohitdsor commented Aug 1, 2026

Copy link
Copy Markdown

Reverts 93c97bc which broke non-bonded DSI clock divider programming; regression reported by you, revert lets Neil Armstrong work on a proper fix.
CRs-fixed: 4364171

@qcomlnxci
qcomlnxci requested review from a team, Rajesh Kemisetti (quic-rajeshk) and riteshk-quic and removed request for a team August 1, 2026 19:12
Commit 93c97bc ("drm/msm: dsi: fix PLL init in bonded mode") fixed
one of the issues with the DSI bonded mode, but broke non-bonded usecase
for DSI as reported by Mohit Dsor. Clock divider is being programmed
incorrectly, resultin in the wrong display mode being selected. Revert
the offending commit, letting Neil to work on a better fix.

Fixes: 93c97bc ("drm/msm: dsi: fix PLL init in bonded mode")
Reported-by: Mohit Dsor <mohit.dsor@oss.qualcomm.com>
Closes: https://lore.kernel.org/r/ae07cef84AmXK43H@hu-mdsor-hyd.qualcomm.com
Cc: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Thorsten Leemhuis <regressions@leemhuis.info>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://patch.msgid.link/20260712-msm-revert-dsi-pll-fix-v1-1-40122689ea25@oss.qualcomm.com
Signed-off-by: Mohit Dsor <mohit.dsor@oss.qualcomm.com>
@mohitdsor
mohitdsor force-pushed the lilliput_revert_techmm branch from a919637 to 4b5ceec Compare August 1, 2026 19:18
@qcomlnxci
qcomlnxci requested a review from a team August 1, 2026 19:19
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1623

PR: #1623
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/30714500275

# Error File:Line PR-introduced? Root Cause
1 Merge conflict (add/add) drivers/gpu/drm/bridge/lontium-lt9611c.c No Pre-existing integration conflict between topic branches during automerge

Verdict

This is not a compilation failure. The build failed during the automerge/integration phase with a merge conflict in drivers/gpu/drm/bridge/lontium-lt9611c.c. This conflict is not introduced by PR #1623 — it's a pre-existing integration issue between the topic/tech/mm/drm branch and the baseline when merging with other topic branches.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1623

PR: #1623
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/30714500275

# Error File:Line PR-introduced? Root Cause
1 Automerge conflict (add/add) drivers/gpu/drm/bridge/lontium-lt9611c.c No Pre-existing merge conflict when integrating topic/tech/mm/drm branch with baseline. The PR modifies DSI PHY files, not the conflicting bridge driver.

Verdict

The build failure is not caused by this PR. The failure occurred during the automerge step when integrating the topic/tech/mm/drm branch with the baseline kernel. The merge conflict is in drivers/gpu/drm/bridge/lontium-lt9611c.c, while this PR only modifies DSI PHY files (dsi_phy.h and dsi_phy_7nm.c). This is a pre-existing integration issue unrelated to the PR changes.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1623 — validate-patch

PR: #1623

Verdict Issues Detailed Report
⚠️ 0 Full report

Final Summary

  1. Lore link present: Yes - https://patch.msgid.link/20260712-msm-revert-dsi-pll-fix-v1-1-40122689ea25@oss.qualcomm.com found in Link: tag
  2. Lore link matches PR commits: Cannot verify - lore evidence fetch failed despite valid Link: tag being present; Jarvis pre-fetch incorrectly reported "no lore links found"
  3. Upstream patch status: Cannot verify - lore thread not fetched; Link: tag suggests this was posted to lore.kernel.org on 2026-07-12
  4. PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1623 - BACKPORT: Revert "drm/msm: dsi: fix PLL init in bonded mode"
Upstream commit: https://patch.msgid.link/20260712-msm-revert-dsi-pll-fix-v1-1-40122689ea25@oss.qualcomm.com
Verdict: ⚠️ PARTIAL

Commit Message

Check Status Note
Subject matches upstream ⚠️ Cannot verify - lore fetch failed; subject format is correct for a revert
Body preserves rationale ⚠️ Cannot verify against upstream; body has typo: "resultin" should be "resulting"
Fixes tag present/correct Fixes: 93c97bc present and correctly formatted
Authorship preserved From: Dmitry Baryshkov matches BACKPORT: prefix requirement
Backport note (if applicable) ⚠️ No explicit "[ upstream commit ]" note; only Link: tag present

Diff

File Status Notes
drivers/gpu/drm/msm/dsi/phy/dsi_phy.h ⚠️ Cannot verify against upstream lore patch - lore fetch failed
drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c ⚠️ Cannot verify against upstream lore patch - lore fetch failed

Issues

  1. Typo in commit message (line 9): "resultin" should be "resulting" - minor spelling error in the commit body
  2. Lore evidence not fetched: The lore_evidence/README.md incorrectly reports "no lore.kernel.org Link tags found" despite a valid Link: tag being present in the patch. This prevented verification of diff faithfulness and upstream status.
  3. Missing backport note: For BACKPORT: commits, best practice is to include a "[ upstream commit ]" note in the commit body, not just the Link: tag. This helps reviewers quickly identify the upstream source.

Verdict

Merge with minor fix recommended. The commit message structure, authorship, and tags are correct for a BACKPORT: revert. However, fix the typo "resultin" → "resulting" before merging. The diff content appears reasonable for a revert (adds back code that was removed), but could not be verified against the upstream lore patch due to fetch failure.

Final Summary

  1. Lore link present: Yes - https://patch.msgid.link/20260712-msm-revert-dsi-pll-fix-v1-1-40122689ea25@oss.qualcomm.com found in Link: tag
  2. Lore link matches PR commits: Cannot verify - lore evidence fetch failed despite valid Link: tag being present; Jarvis pre-fetch incorrectly reported "no lore links found"
  3. Upstream patch status: Cannot verify - lore thread not fetched; Link: tag suggests this was posted to lore.kernel.org on 2026-07-12
  4. PR present in qcom-next/topics: Yes - commit is present in topics branch at 44784327815b2a1ad8bb56b9236770cb538c7c27 per integration_presence_report.md (overall_status: PASS, 1/1 commits present)

Deterministic Integration Presence

Integration Presence Report

This report is generated by Jarvis before validate-patch runs.
It is the authoritative source for whether PR changes are already present
in qcom-next or in the kernel topic branches.

Kernel repo: /local/mnt/workspace/sgaud/Qgenie/image_pipeline/kernel
qcom-next ref: 8d5dbc1b17adf8fe86a41adcda686785e73f5414
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit Subject qcom-next topics Final
1/1 [PATCH] BACKPORT: Revert "drm/msm: dsi: fix PLL init in bonded mode" partial - subject or partial tree evidence found, but full change was not verified present - exact patch-id match at 4478432 present

Final Status

overall_status: PASS
present_commits: 1/1
partial_commits: 0/1
missing_commits: 0/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics

@qlijarvis

Copy link
Copy Markdown

PR #1623 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⏭️ Skipped - automerge conflict
dt-binding-check ⏭️ Skipped - automerge conflict
dtb-check ⏭️ Skipped - automerge conflict
sparse-check ⏭️ Skipped - automerge conflict
check-uapi-headers ⏭️ Skipped - automerge conflict
check-patch-compliance ⏭️ Skipped - automerge conflict
tag-check PASS - subject has valid BACKPORT: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1623 - BACKPORT: Revert "drm/msm: dsi: fix PLL init in bonded mode"
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30714502006

Checker Result Summary
checkpatch ⏭️ Skipped - automerge conflict
dt-binding-check ⏭️ Skipped - automerge conflict
dtb-check ⏭️ Skipped - automerge conflict
sparse-check ⏭️ Skipped - automerge conflict
check-uapi-headers ⏭️ Skipped - automerge conflict
check-patch-compliance ⏭️ Skipped - automerge conflict
tag-check PASS - subject has valid BACKPORT: prefix

⚠️ Automerge Infrastructure Failure

Root cause: Merge conflict during CI automerge step prevented all checkers from running.

Failure details:

Merging topic branch: topic/tech/mm/drm
Auto-merging drivers/gpu/drm/bridge/lontium-lt9611c.c
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/bridge/lontium-lt9611c.c
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge
##[error]Process completed with exit code 1.

Analysis:

This is an add/add conflict in drivers/gpu/drm/bridge/lontium-lt9611c.c, meaning:

  • PR Revert "drm/msm: dsi: fix PLL init in bonded mode" #1623 modifies drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c (DSI PHY driver)
  • Another topic branch (topic/tech/mm/drm) is adding or modifying drivers/gpu/drm/bridge/lontium-lt9611c.c (bridge driver)
  • The CI's automerge step tries to merge all topic branches together for integration testing
  • The conflict is not caused by this PR — it's a conflict between two independent topic branches

This is NOT a patch defect. The conflict occurs during the CI's integration testing phase, not from the PR's changes themselves.

Fix:

Option 1 (Recommended): Re-trigger the CI workflow. The conflict may be transient if the other topic branch has been updated or merged.

Option 2: If the conflict persists, the maintainer of topic/tech/mm/drm needs to resolve the conflict with the baseline, or the two topic branches need to be coordinated.

Option 3: Merge this PR first (if it's higher priority), then the other topic branch can rebase on top of it.

No changes needed to PR #1623 itself.


✅ Manual Patch Analysis (since checkers didn't run)

Since the automerge conflict prevented the automated checkers from running, I performed a manual review of the patch:

Commit subject: BACKPORT: Revert "drm/msm: dsi: fix PLL init in bonded mode"

Subject prefix: Valid BACKPORT: prefix present
Commit message: Well-formatted with proper trailers (Fixes:, Reported-by:, Closes:, Link:, Signed-off-by:)
Link trailer: Valid lore.kernel.org link present
Code changes: Revert patch adds proper locking around PLL enable counter and restores pll_data field
Style: No obvious checkpatch violations (proper indentation, no trailing whitespace visible)
Files modified: Only C source files (dsi_phy.h, dsi_phy_7nm.c) — no DT/binding changes

Predicted checker results if automerge had succeeded:

  • checkpatch: Likely ✅ PASS (commit message and code style appear clean)
  • dt-binding-check: ⏭️ SKIP (no DT binding changes)
  • dtb-check: ⏭️ SKIP (no DTS changes)
  • sparse-check: Likely ✅ PASS (proper locking primitives used, no obvious type issues)
  • check-uapi-headers: ⏭️ SKIP (no UAPI header changes)
  • check-patch-compliance: Likely ✅ PASS (has BACKPORT: prefix and valid Link: trailer)

Verdict

The PR patch itself appears clean and ready to merge. The CI failure is an infrastructure issue caused by a merge conflict between independent topic branches during integration testing, not a defect in this PR's code or commit formatting.

Recommended action: Re-trigger the CI workflow or coordinate with the maintainer of topic/tech/mm/drm to resolve the integration conflict.

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.

3 participants