Skip to content

apple-drm: quiesce inactive DCPs on suspend, fix resume crash #510

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

Open
areofyl wants to merge 1 commit into
base: fairydust
Choose a base branch
from
+60 −3
Open

apple-drm: quiesce inactive DCPs on suspend, fix resume crash #510

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
63 changes: 60 additions & 3 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 @@ -38,7 +38,11 @@
#include <drm/drm_vblank.h>
#include <drm/drm_fixed.h>

#include <linux/soc/apple/rtkit.h>

#include "dcp.h"
#include "dcp-internal.h"
#include "connector.h"
#include "plane.h"

#define DRIVER_NAME "apple"
Expand Down Expand Up @@ -627,9 +631,55 @@ MODULE_DEVICE_TABLE(of, of_match);
static int apple_platform_suspend(struct device *dev)
{
struct apple_drm_private *apple = dev_get_drvdata(dev);
int ret;

if (apple) {
ret = drm_mode_config_helper_suspend(&apple->drm);
if (ret)
dev_warn(dev, "drm suspend helper failed: %d, will hotplug on resume\n", ret);
}

return 0;
}

static int apple_platform_suspend_noirq(struct device *dev)
{
struct apple_drm_private *apple = dev_get_drvdata(dev);
struct drm_crtc *crtc;

if (!apple || apple->drm.mode_config.suspend_state)
return 0;

drm_for_each_crtc(crtc, &apple->drm) {
struct apple_crtc *acrtc = to_apple_crtc(crtc);
struct apple_dcp *dcp = platform_get_drvdata(acrtc->dcp);

if (dcp && dcp->connector && !dcp->connector->connected && dcp->rtk) {
dev_info(dev, "quiescing disconnected DCP %d\n", dcp->index);
apple_rtkit_quiesce(dcp->rtk);
}
}

return 0;
}

static int apple_platform_resume_noirq(struct device *dev)
{
struct apple_drm_private *apple = dev_get_drvdata(dev);
struct drm_crtc *crtc;

if (!apple || apple->drm.mode_config.suspend_state)
return 0;

if (apple)
return drm_mode_config_helper_suspend(&apple->drm);
drm_for_each_crtc(crtc, &apple->drm) {
struct apple_crtc *acrtc = to_apple_crtc(crtc);
struct apple_dcp *dcp = platform_get_drvdata(acrtc->dcp);

if (dcp && dcp->connector && !dcp->connector->connected && dcp->rtk) {
dev_info(dev, "re-booting DCP %d after quiesce\n", dcp->index);
apple_rtkit_boot(dcp->rtk);
}
}

return 0;
}
Expand All @@ -638,14 +688,21 @@ static int apple_platform_resume(struct device *dev)
{
struct apple_drm_private *apple = dev_get_drvdata(dev);

if (apple)
if (!apple)
return 0;

if (apple->drm.mode_config.suspend_state)
drm_mode_config_helper_resume(&apple->drm);
else
drm_kms_helper_hotplug_event(&apple->drm);

return 0;
}

static const struct dev_pm_ops apple_platform_pm_ops = {
.suspend = apple_platform_suspend,
.suspend_noirq = apple_platform_suspend_noirq,
.resume_noirq = apple_platform_resume_noirq,
.resume = apple_platform_resume,
};
#endif
Expand Down