diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2018-09-26 11:24:04 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2018-09-26 11:24:04 +0300 |
| commit | 2863b00941bc3062ea3299ed4057acfd9e52c335 (patch) | |
| tree | bf378837a55e57e4189e9877170fd2b0d288f587 /drivers/gpu/drm/exynos/exynos7_drm_decon.c | |
| parent | fc3fed5d297b51f9e2c7d4f969c95c0d6e50ca57 (diff) | |
| parent | 36c9c3c91128e2b892c9be0dd9ee9bd82cbe82ad (diff) | |
Merge drm/drm-next into drm-intel-next-queued
Catch up in general, and get DP_EXTENDED_RECEIVER_CAP_FIELD_PRESENT
specifically.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos7_drm_decon.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos7_drm_decon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index 3931d5e33fe0..88cbd000eb09 100644 --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c @@ -832,6 +832,8 @@ static int exynos7_decon_resume(struct device *dev) static const struct dev_pm_ops exynos7_decon_pm_ops = { SET_RUNTIME_PM_OPS(exynos7_decon_suspend, exynos7_decon_resume, NULL) + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) }; struct platform_driver decon_driver = { |