diff options
author | Jiri Kosina <jkosina@suse.cz> | 2020-10-15 21:37:01 +0300 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2020-10-15 21:37:01 +0300 |
commit | 62b31a045757eac81fed94b19df47418a0818528 (patch) | |
tree | 285fda56df8304dff6ba929bad65ddfb4e4fd726 /drivers/gpu/drm/omapdrm/dss/dispc.c | |
parent | cc51d171776f3a6acb6828bad0b780a4cacf5423 (diff) | |
parent | c27e08820bc6cb7d483a8d87589bdbbbf10f2306 (diff) | |
download | linux-62b31a045757eac81fed94b19df47418a0818528.tar.xz |
Merge branch 'for-5.10/core' into for-linus
- nonblocking read semantics fix for hid-debug
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/dispc.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dispc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c index 6639ee9b05d3..48593932bddf 100644 --- a/drivers/gpu/drm/omapdrm/dss/dispc.c +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c @@ -4915,6 +4915,7 @@ static int dispc_runtime_resume(struct device *dev) static const struct dev_pm_ops dispc_pm_ops = { .runtime_suspend = dispc_runtime_suspend, .runtime_resume = dispc_runtime_resume, + SET_LATE_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) }; struct platform_driver omap_dispchw_driver = { |