Skip to content

drm/apple: tell the PM core no VT switch is needed for system sleep #912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanTheTide merged 1 commit into from
Nov 5, 2026
Merged

drm/apple: tell the PM core no VT switch is needed for system sleep #912

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions drivers/gpu/drm/apple/apple_drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include <drm/drm_probe_helper.h>
#include <drm/drm_vblank.h>
#include <drm/drm_fixed.h>
#include <linux/pm.h>

#include "apple_boot_display.h"
#include "apple_resume.h"
Expand Down Expand Up @@ -1567,18 +1568,29 @@ static int apple_platform_probe(struct platform_device *pdev)
{
struct device *mdev = &pdev->dev;
struct component_match *match = NULL;
int num_dcp;
int num_dcp, ret;

/* add DCP components, handle less than 1 as probe error */
num_dcp = add_dcp_components(mdev, &match);
if (num_dcp < 1)
return -ENODEV;

return component_master_add_with_match(mdev, &apple_drm_ops, match);
ret = component_master_add_with_match(mdev, &apple_drm_ops, match);
if (ret)
return ret;

/*
* The display restores its own state across system sleep, so the PM
* core need not switch to the text console first (which flashes the
* kernel log on screen on every suspend and resume).
*/
pm_vt_switch_required(mdev, false);
return 0;
}

static void apple_platform_remove(struct platform_device *pdev)
{
pm_vt_switch_unregister(&pdev->dev);
component_master_del(&pdev->dev, &apple_drm_ops);
}

Expand Down