Skip to content

[Deepin-Kernel-SIG] [linux 6.18.y] [Upstream] Update kernel base to 6.18.49-xe - #2157

Merged
opsiff merged 3 commits into
deepin-community:linux-6.18.yfrom
opsiff:linux-6.18.y-2026-09-17-backport
Sep 17, 2026
Merged

[Deepin-Kernel-SIG] [linux 6.18.y] [Upstream] Update kernel base to 6.18.49-xe#2157
opsiff merged 3 commits into
deepin-community:linux-6.18.yfrom
opsiff:linux-6.18.y-2026-09-17-backport

Conversation

@opsiff

@opsiff opsiff commented Sep 17, 2026 •
edited by sourcery-ai Bot
Loading

Copy link
Copy Markdown
Member

#2152

Summary by Sourcery

Move GuC UM fault queues into a dedicated, DMA-contiguous buffer to improve reset handling and meet platform address requirements.

Bug Fixes:

  • Preserve GuC UM fault-ring descriptors across GT resets by moving UM queues into a dedicated buffer object.

Enhancements:

  • Ensure UM fault queues use contiguous DMA address space where required by GAM and initialize their GuC addresses from the dedicated allocation.

@Yogayaojia @opsiff
drm/xe/guc_ads: allocate UM queues in a separate BO
f7d2554 
commit 99b0181 upstream.

Move the UM queues into a dedicated BO (ads->um_queue_bo) and avoid
CPU memset operations on it, which eliminates the CPU as a potential
cacheline-polluting agent and helps maintain consistency between GAM
writes and GuC reads.

We also need to ensure the base_dpa for the queue is contiguous on hw
where this is used instead of a GGTT address. Another good reason to
split this out to a separate BO.

Fixes: 9c57bc0 ("drm/xe/lnl: Drop force_probe requirement")
Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: <stable@vger.kernel.org> # v6.12+
Signed-off-by: Jia Yao <jia.yao@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patch.msgid.link/20260804165057.129529-2-jia.yao@intel.com
(cherry picked from commit 99b0181)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit af2d3f6f29b07a2519a437ac3cb044d2619205a7)
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
@Yogayaojia @opsiff
drm/xe/guc_ads: allocate UM queues in VRAM on dGFX
bc16dea 
commit f342810 upstream.

On iGPU, the UM queue BO is allocated in system memory. On dGFX, the BO
was previously created in system memory and later reallocated in
xe_guc_realloc_post_hwconfig().  Allocate the UM queue BO directly in
VRAM on dGFX, where it is ultimately required.

Fixes: 9c57bc0 ("drm/xe/lnl: Drop force_probe requirement")
Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: <stable@vger.kernel.org> # v6.12+
Signed-off-by: Jia Yao <jia.yao@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patch.msgid.link/20260804165057.129529-3-jia.yao@intel.com
(cherry picked from commit f342810)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit a65b52f6cdc92acefa0a496499cad02a87275757)
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
@Yogayaojia @opsiff
drm/xe/guc_ads: use uncached mapping for UM queue BO
13387b3 
commit 8d5134a upstream.

On Pre-Xe3p platform, the GAM write the UM queue through DPA using UC.
if GuC reads the queue via GGTT (WB), stale data may be observed
when the cacheline has been polluted by another agent.

To match the GAM's UC writes, configure the GuC mapping as UC as well.

Fixes: 9c57bc0 ("drm/xe/lnl: Drop force_probe requirement")
Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: <stable@vger.kernel.org> # v6.12+
Signed-off-by: Jia Yao <jia.yao@intel.com>
Reviewed by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patch.msgid.link/20260804165057.129529-4-jia.yao@intel.com
(cherry picked from commit 8d5134a)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 8be5f23ae94902814a147adcb58669ebe4c65012)
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
@sourcery-ai

sourcery-ai Bot commented Sep 17, 2026 •
edited
Loading

Copy link
Copy Markdown

Reviewer's Guide

The PR updates the XE GuC ADS memory layout by allocating USM fault queues in a dedicated pinned buffer, preserving queue descriptors across GT resets and ensuring GAM-required DMA contiguity. It adds BO scatter-gather validation and adjusts queue base programming and ADS sizing accordingly.

File-Level Changes

Change Details Files
Move GuC UM fault queues into a dedicated pinned BO and validate required DMA contiguity.
  • Add a separate USM queue allocation, using power-of-two sizing on iGPU systems to improve physical contiguity and VRAM allocation on dGPU systems.
  • Reject non-contiguous system-memory allocations on platforms where GAM requires contiguous DPA.
  • Track the dedicated BO separately and program GGTT/DPA queue bases from it instead of embedding queues in the ADS BO.
  • Update ADS layout and initialization sizing/offset calculations to remove UM queues from the main ADS allocation.
 drivers/gpu/drm/xe/xe_guc_ads.c
drivers/gpu/drm/xe/xe_guc_ads_types.h
Add a reusable scatter-gather contiguity check for XE buffer objects.
  • Include DRM PRIME helpers and expose an inline check for whether the first requested byte range has contiguous DMA addresses.
 drivers/gpu/drm/xe/xe_bo.h
Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@deepin-ci-robot

deepin-ci-robot commented Sep 17, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from opsiff. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Avenger-285714
Avenger-285714 requested review from Avenger-285714 and MingcongBai and a balanced review from Copilot September 17, 2026 06:13
sourcery-ai[bot]
sourcery-ai Bot reviewed Sep 17, 2026
View reviewed changes

@sourcery-ai sourcery-ai Bot 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.

Hey - I've reviewed your changes and they look great!

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

Copilot AI reviewed Sep 17, 2026
View reviewed changes

Copilot AI 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.

🟢 Approval recommended

The changes consistently apply the referenced upstream fixes without identified regressions.

Pull request overview

Moves GuC UM fault queues into a dedicated contiguous, uncached BO to preserve descriptors across GT resets.

Changes:

  • Allocates UM queues separately, using VRAM on dGFX.
  • Validates DMA-address contiguity for system memory.
  • Initializes GuC queue addresses from the new BO.
File summaries
File Description
drivers/gpu/drm/xe/xe_guc_ads.c Implements dedicated UM queue allocation and addressing.
drivers/gpu/drm/xe/xe_guc_ads_types.h Tracks the dedicated UM queue BO.
drivers/gpu/drm/xe/xe_bo.h Adds a DMA-contiguity helper.
Review details
  • Files reviewed: 3/3 changed files
  • Comments generated: 0
  • Review effort level: Balanced

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@opsiff
opsiff merged commit cafb270 into deepin-community:linux-6.18.y Sep 17, 2026
7 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sourcery-ai sourcery-ai[bot] sourcery-ai[bot] left review comments
Copilot code review Copilot
Copilot review effort, defaults to Balanced
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@Ink-Paper Ink-Paper Awaiting requested review from Ink-Paper
@winnscode winnscode Awaiting requested review from winnscode
@MingcongBai MingcongBai Awaiting requested review from MingcongBai
@Avenger-285714 Avenger-285714 Awaiting requested review from Avenger-285714

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@opsiff @deepin-ci-robot @Yogayaojia