+Cc dri-devel ML, Hi,
On 01/31/2015 06:45 AM, Gustavo Padovan wrote: > From: Prathyush K <prathyush.k at samsung.com> > > When VPLL clock of less than 140 MHz was used and all the three > clocks - hdmiphy, hdmi, sclk_hdmi are disabled, the system hangs > during S2R when HDMI is connected. Since we want to use a vpll > clock of 70.5 MHz, we cannot disable these 3 clocks before suspending. > This patch moves the clk enable/disable of hdmi and sclk_hdmi > outside of the pm ops. Now system suspends and resumes with HDMI > connected with VPLL set at 70.5 MHz. > I think commit messages should be updated because it is different with prior posting codes. Thanks. > Signed-off-by: Prathyush K <prathyush.k at samsung.com> > Signed-off-by: Andrew Bresticker <abrestic at chromium.org> > Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk> > --- > drivers/gpu/drm/exynos/exynos_hdmi.c | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c > b/drivers/gpu/drm/exynos/exynos_hdmi.c > index 6aa0d65..0be6921 100644 > --- a/drivers/gpu/drm/exynos/exynos_hdmi.c > +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c > @@ -2254,6 +2254,20 @@ static int hdmi_resources_init(struct hdmi_context > *hdata) > } else > res->reg_hdmi_en = NULL; > > + /* > + * For these two clocks exynos5420 fails to suspend if VPLL clock of > + * 70.5 MHz is used and these clocks are disabled before suspend. So > + * enable them here. > + * Note that this will keep the clocks enabled for the entire > + * lifetime of the driver and waste energy when it is suspended. > + * However it prevents the system crash until a better solution is > + * found > + */ > + if (of_machine_is_compatible("samsung,exynos5420")) { I'm not sure it's ok to use SoC compatible in driver and doesn't exynos5800 also have same issue? How about just use driver_data? Thanks. > + clk_prepare_enable(res->sclk_hdmi); > + clk_prepare_enable(res->hdmi); > + } > + > return ret; > fail: > DRM_ERROR("HDMI resource init - failed\n"); > @@ -2516,6 +2530,11 @@ static int hdmi_remove(struct platform_device *pdev) > if (hdata->res.reg_hdmi_en) > regulator_disable(hdata->res.reg_hdmi_en); > > + if (of_machine_is_compatible("samsung,exynos5420")) { > + clk_disable_unprepare(hdata->res.sclk_hdmi); > + clk_disable_unprepare(hdata->res.hdmi); > + } > + > if (hdata->hdmiphy_port) > put_device(&hdata->hdmiphy_port->dev); > put_device(&hdata->ddc_adpt->dev); >