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

Commit f2543242 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'exynos-drm-fixes' of... 

Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes

Just fixup to runtime pm usage and some cleanups.

* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  Subject: [PATCH, RESEND] drm: exynos: avoid unused function warning
  drm/exynos: g2d: fix system and runtime pm integration
  drm/exynos: rotator: fix system and runtime pm integration
  drm/exynos: gsc: fix system and runtime pm integration
  drm/exynos: fimc: fix system and runtime pm integration
  exynos-drm: Fix unsupported GEM memory type error message to be clear
parents 09cb5b78 4158dbe1

drivers/gpu/drm/exynos/exynos_drm_fb.c

+3 −3
Original line number Diff line number Diff line
@@ -55,11 +55,11 @@ static int check_fb_gem_memory_type(struct drm_device *drm_dev, 
	flags = exynos_gem->flags;



	/*

	 * without iommu support, not support physically non-continuous memory

	 * for framebuffer.

	 * Physically non-contiguous memory type for framebuffer is not

	 * supported without IOMMU.

	 */

	if (IS_NONCONTIG_BUFFER(flags)) {

		DRM_ERROR("cannot use this gem memory type for fb.\n");

		DRM_ERROR("Non-contiguous GEM memory is not supported.\n");

		return -EINVAL;

	}

drivers/gpu/drm/exynos/exynos_drm_fimc.c

+2 −27
Original line number Diff line number Diff line
@@ -1753,32 +1753,6 @@ static int fimc_clk_ctrl(struct fimc_context *ctx, bool enable) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int fimc_suspend(struct device *dev)

{

	struct fimc_context *ctx = get_fimc_context(dev);



	DRM_DEBUG_KMS("id[%d]\n", ctx->id);



	if (pm_runtime_suspended(dev))

		return 0;



	return fimc_clk_ctrl(ctx, false);

}



static int fimc_resume(struct device *dev)

{

	struct fimc_context *ctx = get_fimc_context(dev);



	DRM_DEBUG_KMS("id[%d]\n", ctx->id);



	if (!pm_runtime_suspended(dev))

		return fimc_clk_ctrl(ctx, true);



	return 0;

}

#endif



static int fimc_runtime_suspend(struct device *dev)

{

	struct fimc_context *ctx = get_fimc_context(dev);
@@ -1799,7 +1773,8 @@ static int fimc_runtime_resume(struct device *dev) 
#endif



static const struct dev_pm_ops fimc_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(fimc_suspend, fimc_resume)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(fimc_runtime_suspend, fimc_runtime_resume, NULL)

};

drivers/gpu/drm/exynos/exynos_drm_g2d.c

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

}



#ifdef CONFIG_PM_SLEEP

static int g2d_suspend(struct device *dev)

#ifdef CONFIG_PM

static int g2d_runtime_suspend(struct device *dev)

{

	struct g2d_data *g2d = dev_get_drvdata(dev);
@@ -1490,25 +1490,6 @@ static int g2d_suspend(struct device *dev) 


	flush_work(&g2d->runqueue_work);



	return 0;

}



static int g2d_resume(struct device *dev)

{

	struct g2d_data *g2d = dev_get_drvdata(dev);



	g2d->suspended = false;

	g2d_exec_runqueue(g2d);



	return 0;

}

#endif



#ifdef CONFIG_PM

static int g2d_runtime_suspend(struct device *dev)

{

	struct g2d_data *g2d = dev_get_drvdata(dev);



	clk_disable_unprepare(g2d->gate_clk);



	return 0;
@@ -1523,12 +1504,16 @@ static int g2d_runtime_resume(struct device *dev) 
	if (ret < 0)

		dev_warn(dev, "failed to enable clock.\n");



	g2d->suspended = false;

	g2d_exec_runqueue(g2d);



	return ret;

}

#endif



static const struct dev_pm_ops g2d_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(g2d_suspend, g2d_resume)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(g2d_runtime_suspend, g2d_runtime_resume, NULL)

};

drivers/gpu/drm/exynos/exynos_drm_gsc.c

+4 −31
Original line number Diff line number Diff line
@@ -1760,34 +1760,7 @@ static int gsc_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int gsc_suspend(struct device *dev)

{

	struct gsc_context *ctx = get_gsc_context(dev);



	DRM_DEBUG_KMS("id[%d]\n", ctx->id);



	if (pm_runtime_suspended(dev))

		return 0;



	return gsc_clk_ctrl(ctx, false);

}



static int gsc_resume(struct device *dev)

{

	struct gsc_context *ctx = get_gsc_context(dev);



	DRM_DEBUG_KMS("id[%d]\n", ctx->id);



	if (!pm_runtime_suspended(dev))

		return gsc_clk_ctrl(ctx, true);



	return 0;

}

#endif



#ifdef CONFIG_PM

static int gsc_runtime_suspend(struct device *dev)

static int __maybe_unused gsc_runtime_suspend(struct device *dev)

{

	struct gsc_context *ctx = get_gsc_context(dev);
@@ -1796,7 +1769,7 @@ static int gsc_runtime_suspend(struct device *dev) 
	return  gsc_clk_ctrl(ctx, false);

}



static int gsc_runtime_resume(struct device *dev)

static int __maybe_unused gsc_runtime_resume(struct device *dev)

{

	struct gsc_context *ctx = get_gsc_context(dev);
@@ -1804,10 +1777,10 @@ static int gsc_runtime_resume(struct device *dev) 


	return  gsc_clk_ctrl(ctx, true);

}

#endif



static const struct dev_pm_ops gsc_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(gsc_suspend, gsc_resume)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(gsc_runtime_suspend, gsc_runtime_resume, NULL)

};

drivers/gpu/drm/exynos/exynos_drm_rotator.c

+2 −24
Original line number Diff line number Diff line
@@ -794,29 +794,6 @@ static int rotator_clk_crtl(struct rot_context *rot, bool enable) 
	return 0;

}





#ifdef CONFIG_PM_SLEEP

static int rotator_suspend(struct device *dev)

{

	struct rot_context *rot = dev_get_drvdata(dev);



	if (pm_runtime_suspended(dev))

		return 0;



	return rotator_clk_crtl(rot, false);

}



static int rotator_resume(struct device *dev)

{

	struct rot_context *rot = dev_get_drvdata(dev);



	if (!pm_runtime_suspended(dev))

		return rotator_clk_crtl(rot, true);



	return 0;

}

#endif



static int rotator_runtime_suspend(struct device *dev)

{

	struct rot_context *rot = dev_get_drvdata(dev);
@@ -833,7 +810,8 @@ static int rotator_runtime_resume(struct device *dev) 
#endif



static const struct dev_pm_ops rotator_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(rotator_suspend, rotator_resume)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(rotator_runtime_suspend, rotator_runtime_resume,

									NULL)

};