Commit 0f15d785 authored by Hsin-Yi Wang's avatar Hsin-Yi Wang Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Ensure bridge disable happends before suspend 



Make sure bridge_disable will be called before suspend by calling
drm_mode_config_helper_suspend() in .prepare callback.

Signed-off-by: default avatarHsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20220629190545.478113-1-hsinyi@chromium.org/


Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 2545e12d

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+8 −8
Original line number Diff line number Diff line
@@ -826,8 +826,7 @@ static int mtk_drm_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int mtk_drm_sys_suspend(struct device *dev)

static int mtk_drm_sys_prepare(struct device *dev)

{

	struct mtk_drm_private *private = dev_get_drvdata(dev);

	struct drm_device *drm = private->drm;
@@ -838,20 +837,21 @@ static int mtk_drm_sys_suspend(struct device *dev) 
	return ret;

}



static int mtk_drm_sys_resume(struct device *dev)

static void mtk_drm_sys_complete(struct device *dev)

{

	struct mtk_drm_private *private = dev_get_drvdata(dev);

	struct drm_device *drm = private->drm;

	int ret;



	ret = drm_mode_config_helper_resume(drm);



	return ret;

	if (ret)

		dev_err(dev, "Failed to resume\n");

}

#endif



static SIMPLE_DEV_PM_OPS(mtk_drm_pm_ops, mtk_drm_sys_suspend,

			 mtk_drm_sys_resume);

static const struct dev_pm_ops mtk_drm_pm_ops = {

	.prepare = mtk_drm_sys_prepare,

	.complete = mtk_drm_sys_complete,

};



static struct platform_driver mtk_drm_platform_driver = {

	.probe	= mtk_drm_probe,