Skip to content

drm/fb-helper: Restore drm_fb_helper_lastclose() for out-of-tree modules - #2222

Merged
opsiff merged 1 commit into
deepin-community:linux-6.18.yfrom
opsiff:linux-6.18.y-2026-10-23-fix-loonggpu-dkms
Oct 23, 2026
Merged

opsiff merged 1 commit into
deepin-community:linux-6.18.yfrom
opsiff:linux-6.18.y-2026-10-23-fix-loonggpu-dkms

Conversation

@opsiff

@opsiff opsiff commented Oct 23, 2026 •

Copy link
Copy Markdown
Member

6.18.55 Commit ("drm/client: Pass force parameter to client restore", backported from v6.19) inlined drm_fb_helper_lastclose() into the client restore path and removed the exported symbol. Out-of-tree drivers that still call the old helper therefore fail to build:

loonggpu/loonggpu_kms.c:625:9: error: implicit declaration of function 'drm_fb_helper_lastclose'; did you mean 'drm_fb_helper_alloc_fbi'? [-Werror=implicit-function-declaration]

The loonggpu DKMS driver, for example, keeps the call for kernels older than v6.12 and reaches it through loonggpu_driver_lastclose_kms().

Add drm_fb_helper_lastclose() back as an exported compatibility wrapper around drm_fb_helper_restore_fbdev_mode_unlocked(), passing force = false as the removed helper did. No functional change for in-tree code.

Summary by Sourcery

Bug Fixes:

  • Restore the exported drm_fb_helper_lastclose() compatibility API so out-of-tree DRM modules continue to build and restore fbdev state as before.

6.18.55 Commit ("drm/client: Pass force parameter to client restore",
backported from v6.19) inlined drm_fb_helper_lastclose() into the client
restore path and removed the exported symbol. Out-of-tree drivers that
still call the old helper therefore fail to build:

  loonggpu/loonggpu_kms.c:625:9: error: implicit declaration of function 'drm_fb_helper_lastclose'; did you mean 'drm_fb_helper_alloc_fbi'? [-Werror=implicit-function-declaration]

The loonggpu DKMS driver, for example, keeps the call for kernels older
than v6.12 and reaches it through loonggpu_driver_lastclose_kms().

Add drm_fb_helper_lastclose() back as an exported compatibility wrapper
around drm_fb_helper_restore_fbdev_mode_unlocked(), passing force = false
as the removed helper did. No functional change for in-tree code.

Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
@sourcery-ai

sourcery-ai Bot commented Oct 23, 2026 •

Copy link
Copy Markdown

Reviewer's Guide

Reintroduces the exported drm_fb_helper_lastclose() interface as a compatibility wrapper around drm_fb_helper_restore_fbdev_mode_unlocked(), allowing out-of-tree drivers that retain the legacy call to build without changing in-tree behavior.

Sequence diagram for the restored fbdev lastclose compatibility helper

sequenceDiagram
    participant Driver as OutOfTreeDriver
    participant Helper as drm_fb_helper_lastclose
    participant Restore as drm_fb_helper_restore_fbdev_mode_unlocked
    participant FB as FBDevConfiguration

    Driver->>Helper: drm_fb_helper_lastclose(dev)
    Helper->>Restore: drm_fb_helper_restore_fbdev_mode_unlocked(dev->fb_helper, false)
    Restore->>FB: Restore fbdev mode
    Restore-->>Helper: Return
    Helper-->>Driver: Return
Loading

File-Level Changes

Change Details Files
Restore the removed fbdev last-close compatibility API for external modules.
  • Add drm_fb_helper_lastclose() as a wrapper around fbdev mode restoration with force disabled, matching the former behavior.
  • Export the compatibility symbol for loadable out-of-tree drivers.
  • Declare the helper for fbdev-helper builds and provide a no-op stub when fbdev support is disabled.
drivers/gpu/drm/drm_fb_helper.c
include/drm/drm_fb_helper.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

@opsiff
opsiff merged commit 5dbf2e3 into deepin-community:linux-6.18.y Oct 23, 2026
6 of 8 checks passed
@deepin-ci-robot

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

@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 ✨

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.

2 participants