diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-08-11 11:59:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-08-11 12:00:30 +1000 |
| commit | 15f9d8b8cf668f24c59322020d267500c48d7383 (patch) | |
| tree | 9b182d287ca0566d95b2e223122fe9dcdcf09e91 /drivers/gpu/drm/omapdrm/dss/dss.c | |
| parent | c44264f9f729fd63bd6a81a6ac5cd6cd49af09e5 (diff) | |
| parent | b5ac98cbb8e5e30c34ebc837d1e5a3982d2b5f5c (diff) | |
| download | linux-15f9d8b8cf668f24c59322020d267500c48d7383.tar.gz linux-15f9d8b8cf668f24c59322020d267500c48d7383.tar.bz2 linux-15f9d8b8cf668f24c59322020d267500c48d7383.zip | |
Merge tag 'drm-misc-fixes-2020-08-04' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
* backmerge from drm-fixes at v5.8-rc7
* add orientation quirk for ASUS T103HAF
* drm/omap: force runtime PM suspend on system suspend
* drm/tidss: fix modeset init for DPI panels
* re-added docs for drm_gem_flink_ioctl()
* ttm: fix page-offset calculation within TTM
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804125510.GA29670@linux-uq9g
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/dss.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dss.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c index 4d5739fa4a5d..6ccbc29c4ce4 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c @@ -1614,6 +1614,7 @@ static int dss_runtime_resume(struct device *dev) static const struct dev_pm_ops dss_pm_ops = { .runtime_suspend = dss_runtime_suspend, .runtime_resume = dss_runtime_resume, + SET_LATE_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) }; struct platform_driver omap_dsshw_driver = { |