mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-12 22:26:41 +07:00
drm/tilcdc changes for Linux v4.20
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJbshtvAAoJEJA2s1DX1hlBMCEQAK7/OHMBycD7FWkYlPpa0DeD GmoyQLxJvDAZrscXKby2Z7mhwB/bYd+axNRFNnpu3V1DAGlRuMu39V4isYkRdIa8 Udx8uBOcoXeClYFtg3vBLZo+pEhHCyepJexHRLceCPW13gJ5dxRLcD0ApDDMSk4N G3sDowkTCnOhYvFk9i33CpVIL4CPUUcvtZH50jvNbm+kbzeDK10THrA05mH73KgQ lLv57l6TQ0Oznbe4NpsBsKoSLwZRGlsjW7tTfBGmk12M0D+x8Ty8uq5DIgd4xWda Sz0G87V+LLDFvc+hvu4xwMZgUfTHgnUreG4oPgLy8si1i+4dEmqVZMCS3vRSAV4f M9l8f3chQyeDpF4MUj+0jNkRyfX0K0MHeoUJ+a9j1RzFvPqj3uvF84tIQc/PE6z4 kXGuN56cwiTlbCX7H9/FkgAvaRp8lmRYDoLZmsAA9vYHL5H6FN8zjeiDz3Ts8BLI EhlD42eMvZmuodJo065ZK6VcS/1hRgcVPZEGBwk6yEZjxuRpTF0jQ/AGDBUEMGBV zMrTif77pe9OCfDSJdCh+o4nppGuILxuXgIilEwArjrT+SS3gHX69u56+e3036/j sNf1MDQVWVwTDYGbdonPfV19gEL0VMBZLYTJWLu1+YrUUDsfwkUYIsWcQ4rpPXOM 0ylq8STJqsfwljBJKDuG =H0A3 -----END PGP SIGNATURE----- Merge tag 'tilcdc-4.20' of https://github.com/jsarha/linux into drm-next drm/tilcdc changes for Linux v4.20 suspend/resume update. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Jyri Sarha <jsarha@ti.com> Link: https://patchwork.freedesktop.org/patch/msgid/bd8d6b40-d3d6-8e24-9d48-6201b860aceb@ti.com
This commit is contained in:
commit
41050757fd
@ -554,29 +554,23 @@ static struct drm_driver tilcdc_driver = {
|
||||
static int tilcdc_pm_suspend(struct device *dev)
|
||||
{
|
||||
struct drm_device *ddev = dev_get_drvdata(dev);
|
||||
struct tilcdc_drm_private *priv = ddev->dev_private;
|
||||
int ret = 0;
|
||||
|
||||
priv->saved_state = drm_atomic_helper_suspend(ddev);
|
||||
ret = drm_mode_config_helper_suspend(ddev);
|
||||
|
||||
/* Select sleep pin state */
|
||||
pinctrl_pm_select_sleep_state(dev);
|
||||
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int tilcdc_pm_resume(struct device *dev)
|
||||
{
|
||||
struct drm_device *ddev = dev_get_drvdata(dev);
|
||||
struct tilcdc_drm_private *priv = ddev->dev_private;
|
||||
int ret = 0;
|
||||
|
||||
/* Select default pin state */
|
||||
pinctrl_pm_select_default_state(dev);
|
||||
|
||||
if (priv->saved_state)
|
||||
ret = drm_atomic_helper_resume(ddev, priv->saved_state);
|
||||
|
||||
return ret;
|
||||
return drm_mode_config_helper_resume(ddev);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -70,9 +70,6 @@ struct tilcdc_drm_private {
|
||||
const uint32_t *pixelformats;
|
||||
uint32_t num_pixelformats;
|
||||
|
||||
/* The context for pm susped/resume cycle is stored here */
|
||||
struct drm_atomic_state *saved_state;
|
||||
|
||||
#ifdef CONFIG_CPU_FREQ
|
||||
struct notifier_block freq_transition;
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user