Skip to content

BACKPORT: drm/msm/dp: Drop dev_pm_opp_set_rate(0) - #1668

Open
YongxingMou wants to merge 1 commit into
qualcomm-linux:tech/mm/drmfrom
YongxingMou:for-underrundpu
Open

BACKPORT: drm/msm/dp: Drop dev_pm_opp_set_rate(0)#1668
YongxingMou wants to merge 1 commit into
qualcomm-linux:tech/mm/drmfrom
YongxingMou:for-underrundpu

Conversation

@YongxingMou

Copy link
Copy Markdown

dev_pm_opp_set_rate(0) removes the vote specified in required-opps but does not actually park the clock, making it run without the necessary power backing. Drop the explicit calls to it.

Fixes: c943b49 ("drm/msm/dp: add displayPort driver support")

Reviewed-by: Dmitry Baryshkov dmitry.baryshkov@oss.qualcomm.com
Patchwork: https://patchwork.freedesktop.org/patch/742781/
Link: https://lore.kernel.org/r/20260728-topic-dpu_power-v1-2-e7783b859a70@oss.qualcomm.com

CRs-Fixed: 4553877

dev_pm_opp_set_rate(0) removes the vote specified in required-opps but
does not actually park the clock, making it run without the necessary
power backing. Drop the explicit calls to it.

Fixes: c943b49 ("drm/msm/dp: add displayPort driver support")
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/742781/
Link: https://lore.kernel.org/r/20260728-topic-dpu_power-v1-2-e7783b859a70@oss.qualcomm.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
@qcomlnxci
qcomlnxci requested review from a team, Rajesh Kemisetti (quic-rajeshk) and riteshk-quic and removed request for a team August 11, 2026 06:40
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1668

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict Documentation/devicetree/bindings/display/bridge/lontium,lt9611.yaml No Pre-existing conflict between integration branch and topic/tech/mm/drm
2 Merge conflict drivers/gpu/drm/bridge/Kconfig No Pre-existing conflict between integration branch and topic/tech/mm/drm
3 Merge conflict drivers/gpu/drm/bridge/lontium-lt9611c.c No Pre-existing conflict between integration branch and topic/tech/mm/drm
4 Merge conflict sound/soc/qcom/sc8280xp.c No Pre-existing conflict between integration branch and topic/tech/mm/drm

Verdict

All 4 merge conflicts are pre-existing integration issues; none are introduced by this PR. The PR modifies only drivers/gpu/drm/msm/dp/dp_ctrl.c, which is not involved in any conflicts. This is an integration branch issue, not a PR code quality issue.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1668

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

# Error File:Line PR-introduced? Root Cause
N/A No compilation errors N/A N/A Build failed during automerge, not compilation

Verdict

This PR does not introduce any compilation errors. The build failed during the automerge/integration step when merging topic branch topic/tech/mm/drm with other topic branches. The merge conflicts occurred in files that this PR does not modify. The PR itself only changes drivers/gpu/drm/msm/dp/dp_ctrl.c and those changes are syntactically valid.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1668 — validate-patch

PR: #1668

Verdict Issues Detailed Report
3 Full report

Final Summary

  1. Lore link present: Yes — https://lore.kernel.org/r/20260728-topic-dpu_power-v1-2-e7783b859a70@oss.qualcomm.com
  2. Lore link matches PR commits: No — PR is missing 2 hunks from lore patch (msm_dp_ctrl_off_link_stream, msm_dp_ctrl_off) and contains 1 extra hunk (msm_dp_ctrl_off_link) not in lore. Line numbers differ significantly (2174/2207/2965 vs 1950/1982/2573/2602), indicating code drift. Semantic divergence: not all upstream code paths are addressed.
  3. Upstream patch status: ⏳ Decision Pending — Reviewed-by: Dmitry Baryshkov present in lore thread; no merge confirmation found. Patchwork link (https://patchwork.freedesktop.org/patch/742781/) present in PR but not verified for acceptance status.
  4. PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence
Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1668 - BACKPORT: drm/msm/dp: Drop dev_pm_opp_set_rate(0)
Upstream commit: https://lore.kernel.org/r/20260728-topic-dpu_power-v1-2-e7783b859a70@oss.qualcomm.com
Verdict: ❌ FAIL

Commit Message

Check Status Note
Subject matches upstream Identical (with BACKPORT: prefix added)
Body preserves rationale Key rationale preserved verbatim
Fixes tag present/correct Fixes: c943b49 matches lore
Authorship preserved Konrad Dybcio correctly preserved as author
Backport note (if applicable) BACKPORT: prefix present; Patchwork and Link tags added

Diff

File Status Notes
drivers/gpu/drm/msm/dp/dp_ctrl.c Missing 2 hunks from upstream; contains 1 extra hunk not in upstream

Issues

Critical: Incomplete backport with semantic divergence

The PR patch is not a faithful backport of the lore patch. The lore patch [2/3] removes dev_pm_opp_set_rate(0) from 4 functions in dp_ctrl.c:

  1. msm_dp_ctrl_reinitialize_mainlink — present in PR
  2. msm_dp_ctrl_deinitialize_mainlink — present in PR
  3. msm_dp_ctrl_off_link_streammissing from PR
  4. msm_dp_ctrl_offmissing from PR

The PR patch instead contains a hunk for:

  • msm_dp_ctrl_off_link (line 2965) — not present in the lore patch

Root cause: The PR appears to be a backport to a vendor tree where the upstream function names msm_dp_ctrl_off_link_stream and msm_dp_ctrl_off either:

  • Do not exist, or
  • Have been refactored/renamed to msm_dp_ctrl_off_link

This is a semantic change — the PR is not applying the same fix to the same code paths as the upstream patch. The missing hunks mean the brownout risk described in the commit message is only partially addressed.

Line number delta: The PR hunks are at lines 2174/2207/2965 vs upstream 1950/1982/2573/2602, indicating significant code drift between the vendor tree and upstream.

Verdict

❌ FAIL — Do not merge without correction

This backport is incomplete and semantically divergent from the upstream patch. The PR must be updated to either:

  1. Apply all 4 upstream hunks if the functions msm_dp_ctrl_off_link_stream and msm_dp_ctrl_off exist in the target tree, or
  2. Document the adaptation if those functions have been refactored/renamed in the vendor tree, explaining why msm_dp_ctrl_off_link is the correct equivalent and confirming that all code paths addressed by the upstream patch are covered.

The current PR silently drops 2 upstream hunks and adds 1 hunk not in upstream without explanation — this violates backport integrity and may leave the brownout issue partially unresolved.

Final Summary

  1. Lore link present: Yes — https://lore.kernel.org/r/20260728-topic-dpu_power-v1-2-e7783b859a70@oss.qualcomm.com
  2. Lore link matches PR commits: No — PR is missing 2 hunks from lore patch (msm_dp_ctrl_off_link_stream, msm_dp_ctrl_off) and contains 1 extra hunk (msm_dp_ctrl_off_link) not in lore. Line numbers differ significantly (2174/2207/2965 vs 1950/1982/2573/2602), indicating code drift. Semantic divergence: not all upstream code paths are addressed.
  3. Upstream patch status: ⏳ Decision Pending — Reviewed-by: Dmitry Baryshkov present in lore thread; no merge confirmation found. Patchwork link (https://patchwork.freedesktop.org/patch/742781/) present in PR but not verified for acceptance status.
  4. PR present in qcom-next/topics: Partial — integration_presence_report.md shows "partial - subject or partial tree evidence found, but full change was not verified" (0/1 present, 1/1 partial, 0/1 missing). This aligns with the incomplete backport finding.

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: drm/msm/dp: Drop dev_pm_opp_set_rate(0) missing - no subject, patch-id, or full tree-content match found partial - subject or partial tree evidence found, but full change was not verified partial

Final Status

overall_status: PARTIAL
present_commits: 0/1
partial_commits: 1/1
missing_commits: 0/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence

@qlijarvis

Copy link
Copy Markdown

PR #1668 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⏭️ CI setup failed - no checker execution
dt-binding-check ⏭️ CI setup failed - no checker execution
dtb-check ⏭️ CI setup failed - no checker execution
sparse-check ⏭️ CI setup failed - no checker execution
check-uapi-headers ⏭️ CI setup failed - no checker execution
check-patch-compliance ⏭️ CI setup failed - no checker execution
tag-check Subject has valid BACKPORT: prefix
qcom-next-check N/A Not applicable for topic branch PRs

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1668 - BACKPORT: drm/msm/dp: Drop dev_pm_opp_set_rate(0)
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/31465979290
Target: qualcomm-linux/kernel-topics, branch tech/mm/drm

Checker Result Summary
checkpatch ⏭️ CI setup failed - no checker execution
dt-binding-check ⏭️ CI setup failed - no checker execution
dtb-check ⏭️ CI setup failed - no checker execution
sparse-check ⏭️ CI setup failed - no checker execution
check-uapi-headers ⏭️ CI setup failed - no checker execution
check-patch-compliance ⏭️ CI setup failed - no checker execution
tag-check Subject has valid BACKPORT: prefix
qcom-next-check N/A Not applicable for topic branch PRs

❌ CI Infrastructure Failure — Automerge Conflicts

Root cause: The CI workflow failed during the automerge setup phase before any checkers could execute. The automerge tool attempted to integrate the tech/mm/drm topic branch into the qcom-next baseline but encountered merge conflicts.

Failure details:

The CI workflow follows this sequence for topic branch PRs:

  1. Checkout qcom-next baseline (commit 8d5dbc1b17ad)
  2. Run automerge to integrate topic branch tech/mm/drm from qualcomm-linux/kernel-topics
  3. Merge PR BACKPORT: drm/msm/dp: Drop dev_pm_opp_set_rate(0) #1668 on top of the integrated tree
  4. Run checkers on the final merged state

The workflow failed at step 2 with the following conflicts:

CONFLICT (content): Merge conflict in drivers/gpu/drm/bridge/Kconfig
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/bridge/lontium-lt9611c.c
CONFLICT (content): Merge conflict in sound/soc/qcom/sc8280xp.c
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge

Impact:

  • ❌ All 6 checker jobs failed with exit code 1 during setup
  • ⏭️ No actual checker validation was performed on the PR patch
  • ⚠️ The PR patch itself (drivers/gpu/drm/msm/dp/dp_ctrl.c) is not the source of conflicts
  • ⚠️ Conflicts are in other files within the tech/mm/drm topic branch when merging into current qcom-next

Files with merge conflicts:

  1. drivers/gpu/drm/bridge/Kconfig — content conflict
  2. drivers/gpu/drm/bridge/lontium-lt9611c.c — add/add conflict (both sides added the file)
  3. sound/soc/qcom/sc8280xp.c — content conflict

Additional context from integration report:
The integration presence check shows this commit has "partial" evidence in qcom-next/topics:

  • Subject or partial tree evidence found
  • Full change was not verified as integrated

This suggests the patch may be partially present in the tree already, which could contribute to merge complexity.


✅ Manual Patch Validation (tag-check)

Since the checkers didn't run, I performed a manual validation of the PR patch:

Subject line: BACKPORT: drm/msm/dp: Drop dev_pm_opp_set_rate(0)
PASS — Subject starts with valid BACKPORT: prefix (required for topic branch PRs)

Patch content:

  • Single commit modifying drivers/gpu/drm/msm/dp/dp_ctrl.c
  • Removes 3 calls to dev_pm_opp_set_rate(0)
  • Clean backport from upstream with proper attribution
  • Has Fixes:, Signed-off-by:, Reviewed-by:, Patchwork:, and Link: tags

🔧 Fix Recommendations

Option 1: Resolve topic branch conflicts (Recommended for maintainers)

The tech/mm/drm topic branch needs to be rebased or have its conflicts resolved against current qcom-next:

# In the kernel-topics repo
git checkout tech/mm/drm
git fetch origin qcom-next
git rebase origin/qcom-next

# Resolve conflicts in:
# - drivers/gpu/drm/bridge/Kconfig
# - drivers/gpu/drm/bridge/lontium-lt9611c.c
# - sound/soc/qcom/sc8280xp.c

git push --force-with-lease origin tech/mm/drm

After the topic branch is fixed, re-trigger CI on this PR.

Option 2: Merge PR directly to qcom-next (Alternative)

If this patch is urgent and the topic branch conflicts are blocking:

# Retarget PR #1668 to qcom-next instead of tech/mm/drm
# This bypasses the automerge step entirely

Option 3: Manual checker validation (Immediate workaround)

Run checkers locally on the PR patch without automerge:

# Clone kernel-checkers
git clone https://github.com/qualcomm-linux/kernel-checkers.git
cd kernel-checkers

# Run checkers on PR #1668 patch
./checkpatch.sh <path-to-pr.patch>
./check-patch-compliance.sh <path-to-pr.patch>
# (sparse/dtb/dt-binding checks not applicable - no C/DTS/binding changes)

📋 Verdict

CI Status:Infrastructure failure — no checker validation performed

PR Patch Quality:Likely acceptable based on manual inspection:

  • Valid BACKPORT: prefix
  • Clean, focused change (removes 3 function calls)
  • Proper upstream attribution and review tags
  • No obvious style or compliance issues

Blocker: The tech/mm/drm topic branch has merge conflicts with qcom-next that must be resolved before CI can validate this PR.

Recommendation:

  1. Immediate: Topic branch maintainer should resolve the 3 merge conflicts listed above
  2. Short-term: Re-trigger CI after topic branch is fixed
  3. Alternative: If urgent, consider merging this specific patch directly to qcom-next (bypassing the conflicted topic branch)

The PR patch itself appears clean and is not the source of the CI failure.

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