Commit 1bd8a7dc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-next-for-v5.14' of... 

Merge tag 'exynos-drm-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-next

Two cleanups
- These patches make Exynos DRM driver to use pm_runtime_resume_and_get()
  function instead of m_runtime_get_sync() to deal with usage counter.
  pm_runtime_get_sync() increases the usage counter even when it failed,
  which could make callers to forget to decrease the usage counter.
  pm_runtime_resume_and_get() decreases the usage counter regardless of
  whether it failed or not.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210611025939.393282-1-inki.dae@samsung.com
parents 2a7005c8 445d3bed

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+6 −1
Original line number Diff line number Diff line
@@ -513,8 +513,13 @@ static void decon_swreset(struct decon_context *ctx) 
static void decon_atomic_enable(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;

	int ret;



	pm_runtime_get_sync(ctx->dev);

	ret = pm_runtime_resume_and_get(ctx->dev);

	if (ret < 0) {

		DRM_DEV_ERROR(ctx->dev, "failed to enable DECON device.\n");

		return;

	}



	exynos_drm_pipe_clk_enable(crtc, true);

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+6 −1
Original line number Diff line number Diff line
@@ -531,11 +531,16 @@ static void decon_init(struct decon_context *ctx) 
static void decon_atomic_enable(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;

	int ret;



	if (!ctx->suspended)

		return;



	pm_runtime_get_sync(ctx->dev);

	ret = pm_runtime_resume_and_get(ctx->dev);

	if (ret < 0) {

		DRM_DEV_ERROR(ctx->dev, "failed to enable DECON device.\n");

		return;

	}



	decon_init(ctx);

drivers/gpu/drm/exynos/exynos_drm_dsi.c

+6 −1
Original line number Diff line number Diff line
@@ -1383,7 +1383,12 @@ static void exynos_dsi_enable(struct drm_encoder *encoder) 
	if (dsi->state & DSIM_STATE_ENABLED)

		return;



	pm_runtime_get_sync(dsi->dev);

	ret = pm_runtime_resume_and_get(dsi->dev);

	if (ret < 0) {

		dev_err(dsi->dev, "failed to enable DSI device.\n");

		return;

	}



	dsi->state |= DSIM_STATE_ENABLED;



	if (dsi->panel) {

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+7 −1
Original line number Diff line number Diff line
@@ -1085,8 +1085,14 @@ static int fimc_commit(struct exynos_drm_ipp *ipp, 
{

	struct fimc_context *ctx =

			container_of(ipp, struct fimc_context, ipp);

	int ret;



	ret = pm_runtime_resume_and_get(ctx->dev);

	if (ret < 0) {

		dev_err(ctx->dev, "failed to enable FIMC device.\n");

		return ret;

	}



	pm_runtime_get_sync(ctx->dev);

	ctx->task = task;



	fimc_src_set_fmt(ctx, task->src.buf.fourcc, task->src.buf.modifier);

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+20 −5
Original line number Diff line number Diff line
@@ -343,13 +343,18 @@ static void fimd_enable_shadow_channel_path(struct fimd_context *ctx, 
	writel(val, ctx->regs + SHADOWCON);

}



static void fimd_clear_channels(struct exynos_drm_crtc *crtc)

static int fimd_clear_channels(struct exynos_drm_crtc *crtc)

{

	struct fimd_context *ctx = crtc->ctx;

	unsigned int win, ch_enabled = 0;

	int ret;



	/* Hardware is in unknown state, so ensure it gets enabled properly */

	pm_runtime_get_sync(ctx->dev);

	ret = pm_runtime_resume_and_get(ctx->dev);

	if (ret < 0) {

		dev_err(ctx->dev, "failed to enable FIMD device.\n");

		return ret;

	}



	clk_prepare_enable(ctx->bus_clk);

	clk_prepare_enable(ctx->lcd_clk);
@@ -384,6 +389,8 @@ static void fimd_clear_channels(struct exynos_drm_crtc *crtc) 
	clk_disable_unprepare(ctx->bus_clk);



	pm_runtime_put(ctx->dev);



	return 0;

}
@@ -905,7 +912,10 @@ static void fimd_atomic_enable(struct exynos_drm_crtc *crtc) 


	ctx->suspended = false;



	pm_runtime_get_sync(ctx->dev);

	if (pm_runtime_resume_and_get(ctx->dev) < 0) {

		dev_warn(ctx->dev, "failed to enable FIMD device.\n");

		return;

	}



	/* if vblank was enabled status, enable it again. */

	if (test_and_clear_bit(0, &ctx->irq_flags))
@@ -1089,8 +1099,13 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) 
	if (ctx->encoder)

		exynos_dpi_bind(drm_dev, ctx->encoder);



	if (is_drm_iommu_supported(drm_dev))

		fimd_clear_channels(ctx->crtc);

	if (is_drm_iommu_supported(drm_dev)) {

		int ret;



		ret = fimd_clear_channels(ctx->crtc);

		if (ret < 0)

			return ret;

	}



	return exynos_drm_register_dma(drm_dev, dev, &ctx->dma_priv);

}