Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccf034a9 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Inki Dae
Browse files

drm/exynos: add pm_runtime to Mixer 



Let pm_runtime handle the enabling/disabling of the device with proper
refcnt instead of rely on specific flags to track the enabled state.

Changelog v2:
- revive MXR_BIT_POWERED flag to keep current dpms mode.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent f28464c3

drivers/gpu/drm/exynos/exynos_mixer.c

+64 −42
Original line number Original line Diff line number Diff line
@@ -1020,43 +1020,12 @@ static void mixer_enable(struct exynos_drm_crtc *crtc) 
{

{

	struct mixer_context *ctx = crtc->ctx;

	struct mixer_context *ctx = crtc->ctx;

	struct mixer_resources *res = &ctx->mixer_res;

	struct mixer_resources *res = &ctx->mixer_res;

	int ret;





	if (test_bit(MXR_BIT_POWERED, &ctx->flags))

	if (test_bit(MXR_BIT_POWERED, &ctx->flags))

		return;

		return;





	pm_runtime_get_sync(ctx->dev);

	pm_runtime_get_sync(ctx->dev);





	ret = clk_prepare_enable(res->mixer);

	if (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the mixer clk [%d]\n", ret);

		return;

	}

	ret = clk_prepare_enable(res->hdmi);

	if (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the hdmi clk [%d]\n", ret);

		return;

	}

	if (ctx->vp_enabled) {

		ret = clk_prepare_enable(res->vp);

		if (ret < 0) {

			DRM_ERROR("Failed to prepare_enable the vp clk [%d]\n",

				  ret);

			return;

		}

		if (ctx->has_sclk) {

			ret = clk_prepare_enable(res->sclk_mixer);

			if (ret < 0) {

				DRM_ERROR("Failed to prepare_enable the " \

					   "sclk_mixer clk [%d]\n",

					  ret);

				return;

			}

		}

	}



	set_bit(MXR_BIT_POWERED, &ctx->flags);



	mixer_reg_writemask(res, MXR_STATUS, ~0, MXR_STATUS_SOFT_RESET);

	mixer_reg_writemask(res, MXR_STATUS, ~0, MXR_STATUS_SOFT_RESET);





	if (test_bit(MXR_BIT_VSYNC, &ctx->flags)) {

	if (test_bit(MXR_BIT_VSYNC, &ctx->flags)) {
@@ -1064,12 +1033,13 @@ static void mixer_enable(struct exynos_drm_crtc *crtc) 
		mixer_reg_writemask(res, MXR_INT_EN, ~0, MXR_INT_EN_VSYNC);

		mixer_reg_writemask(res, MXR_INT_EN, ~0, MXR_INT_EN_VSYNC);

	}

	}

	mixer_win_reset(ctx);

	mixer_win_reset(ctx);



	set_bit(MXR_BIT_POWERED, &ctx->flags);

}

}





static void mixer_disable(struct exynos_drm_crtc *crtc)

static void mixer_disable(struct exynos_drm_crtc *crtc)

{

{

	struct mixer_context *ctx = crtc->ctx;

	struct mixer_context *ctx = crtc->ctx;

	struct mixer_resources *res = &ctx->mixer_res;

	int i;

	int i;





	if (!test_bit(MXR_BIT_POWERED, &ctx->flags))

	if (!test_bit(MXR_BIT_POWERED, &ctx->flags))
@@ -1081,17 +1051,9 @@ static void mixer_disable(struct exynos_drm_crtc *crtc) 
	for (i = 0; i < MIXER_WIN_NR; i++)

	for (i = 0; i < MIXER_WIN_NR; i++)

		mixer_disable_plane(crtc, &ctx->planes[i]);

		mixer_disable_plane(crtc, &ctx->planes[i]);





	clear_bit(MXR_BIT_POWERED, &ctx->flags);

	pm_runtime_put(ctx->dev);



	clk_disable_unprepare(res->hdmi);

	clk_disable_unprepare(res->mixer);

	if (ctx->vp_enabled) {

		clk_disable_unprepare(res->vp);

		if (ctx->has_sclk)

			clk_disable_unprepare(res->sclk_mixer);

	}





	pm_runtime_put_sync(ctx->dev);

	clear_bit(MXR_BIT_POWERED, &ctx->flags);

}

}





/* Only valid for Mixer version 16.0.33.0 */

/* Only valid for Mixer version 16.0.33.0 */
@@ -1293,10 +1255,70 @@ static int mixer_remove(struct platform_device *pdev) 
	return 0;

	return 0;

}

}





#ifdef CONFIG_PM_SLEEP

static int exynos_mixer_suspend(struct device *dev)

{

	struct mixer_context *ctx = dev_get_drvdata(dev);

	struct mixer_resources *res = &ctx->mixer_res;



	clk_disable_unprepare(res->hdmi);

	clk_disable_unprepare(res->mixer);

	if (ctx->vp_enabled) {

		clk_disable_unprepare(res->vp);

		if (ctx->has_sclk)

			clk_disable_unprepare(res->sclk_mixer);

	}



	return 0;

}



static int exynos_mixer_resume(struct device *dev)

{

	struct mixer_context *ctx = dev_get_drvdata(dev);

	struct mixer_resources *res = &ctx->mixer_res;

	int ret;



	ret = clk_prepare_enable(res->mixer);

	if (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the mixer clk [%d]\n", ret);

		return ret;

	}

	ret = clk_prepare_enable(res->hdmi);

	if (ret < 0) {

		DRM_ERROR("Failed to prepare_enable the hdmi clk [%d]\n", ret);

		return ret;

	}

	if (ctx->vp_enabled) {

		ret = clk_prepare_enable(res->vp);

		if (ret < 0) {

			DRM_ERROR("Failed to prepare_enable the vp clk [%d]\n",

				  ret);

			return ret;

		}

		if (ctx->has_sclk) {

			ret = clk_prepare_enable(res->sclk_mixer);

			if (ret < 0) {

				DRM_ERROR("Failed to prepare_enable the " \

					   "sclk_mixer clk [%d]\n",

					  ret);

				return ret;

			}

		}

	}



	return 0;

}

#endif



static const struct dev_pm_ops exynos_mixer_pm_ops = {

	SET_RUNTIME_PM_OPS(exynos_mixer_suspend, exynos_mixer_resume, NULL)

};



struct platform_driver mixer_driver = {

struct platform_driver mixer_driver = {

	.driver = {

	.driver = {

		.name = "exynos-mixer",

		.name = "exynos-mixer",

		.owner = THIS_MODULE,

		.owner = THIS_MODULE,

		.pm = &exynos_mixer_pm_ops,

		.of_match_table = mixer_match_types,

		.of_match_table = mixer_match_types,

	},

	},

	.probe = mixer_probe,

	.probe = mixer_probe,