Commit 11f95489 authored by Inki Dae's avatar Inki Dae
Browse files

drm/exynos: change callback names 



This patch changes Exynos specific 'disable' and 'enable'
callback names to 'atomic_disable/enable' for the consistency.

Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent d7ca2d19

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+5 −5
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ static void decon_swreset(struct decon_context *ctx) 
	       ctx->addr + DECON_CRCCTRL);

}



static void decon_enable(struct exynos_drm_crtc *crtc)

static void decon_atomic_enable(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;
@@ -523,7 +523,7 @@ static void decon_enable(struct exynos_drm_crtc *crtc) 
	decon_commit(ctx->crtc);

}



static void decon_disable(struct exynos_drm_crtc *crtc)

static void decon_atomic_disable(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;

	int i;
@@ -599,8 +599,8 @@ static enum drm_mode_status decon_mode_valid(struct exynos_drm_crtc *crtc, 
}



static const struct exynos_drm_crtc_ops decon_crtc_ops = {

	.enable			= decon_enable,

	.disable		= decon_disable,

	.atomic_enable		= decon_atomic_enable,

	.atomic_disable		= decon_atomic_disable,

	.enable_vblank		= decon_enable_vblank,

	.disable_vblank		= decon_disable_vblank,

	.atomic_begin		= decon_atomic_begin,
@@ -651,7 +651,7 @@ static void decon_unbind(struct device *dev, struct device *master, void *data) 
{

	struct decon_context *ctx = dev_get_drvdata(dev);



	decon_disable(ctx->crtc);

	decon_atomic_disable(ctx->crtc);



	/* detach this sub driver from iommu mapping if supported. */

	exynos_drm_unregister_dma(ctx->drm_dev, ctx->dev);

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+5 −5
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static void decon_init(struct decon_context *ctx) 
		writel(VIDCON1_VCLK_HOLD, ctx->regs + VIDCON1(0));

}



static void decon_enable(struct exynos_drm_crtc *crtc)

static void decon_atomic_enable(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;
@@ -546,7 +546,7 @@ static void decon_enable(struct exynos_drm_crtc *crtc) 
	ctx->suspended = false;

}



static void decon_disable(struct exynos_drm_crtc *crtc)

static void decon_atomic_disable(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;

	int i;
@@ -568,8 +568,8 @@ static void decon_disable(struct exynos_drm_crtc *crtc) 
}



static const struct exynos_drm_crtc_ops decon_crtc_ops = {

	.enable = decon_enable,

	.disable = decon_disable,

	.atomic_enable = decon_atomic_enable,

	.atomic_disable = decon_atomic_disable,

	.enable_vblank = decon_enable_vblank,

	.disable_vblank = decon_disable_vblank,

	.atomic_begin = decon_atomic_begin,
@@ -653,7 +653,7 @@ static void decon_unbind(struct device *dev, struct device *master, 
{

	struct decon_context *ctx = dev_get_drvdata(dev);



	decon_disable(ctx->crtc);

	decon_atomic_disable(ctx->crtc);



	if (ctx->encoder)

		exynos_dpi_remove(ctx->encoder);

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+4 −4
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ static void exynos_drm_crtc_atomic_enable(struct drm_crtc *crtc, 
{

	struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);



	if (exynos_crtc->ops->enable)

		exynos_crtc->ops->enable(exynos_crtc);

	if (exynos_crtc->ops->atomic_enable)

		exynos_crtc->ops->atomic_enable(exynos_crtc);



	drm_crtc_vblank_on(crtc);

}
@@ -36,8 +36,8 @@ static void exynos_drm_crtc_atomic_disable(struct drm_crtc *crtc, 


	drm_crtc_vblank_off(crtc);



	if (exynos_crtc->ops->disable)

		exynos_crtc->ops->disable(exynos_crtc);

	if (exynos_crtc->ops->atomic_disable)

		exynos_crtc->ops->atomic_disable(exynos_crtc);



	if (crtc->state->event && !crtc->state->active) {

		spin_lock_irq(&crtc->dev->event_lock);

drivers/gpu/drm/exynos/exynos_drm_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ struct exynos_drm_plane_config { 
/*

 * Exynos drm crtc ops

 *

 * @enable: enable the device

 * @disable: disable the device

 * @atomic_enable: enable the device

 * @atomic_disable: disable the device

 * @enable_vblank: specific driver callback for enabling vblank interrupt.

 * @disable_vblank: specific driver callback for disabling vblank interrupt.

 * @mode_valid: specific driver callback for mode validation
@@ -133,8 +133,8 @@ struct exynos_drm_plane_config { 
 */

struct exynos_drm_crtc;

struct exynos_drm_crtc_ops {

	void (*enable)(struct exynos_drm_crtc *crtc);

	void (*disable)(struct exynos_drm_crtc *crtc);

	void (*atomic_enable)(struct exynos_drm_crtc *crtc);

	void (*atomic_disable)(struct exynos_drm_crtc *crtc);

	int (*enable_vblank)(struct exynos_drm_crtc *crtc);

	void (*disable_vblank)(struct exynos_drm_crtc *crtc);

	enum drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc,

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+5 −5
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ static void fimd_disable_plane(struct exynos_drm_crtc *crtc, 
		fimd_enable_shadow_channel_path(ctx, win, false);

}



static void fimd_enable(struct exynos_drm_crtc *crtc)

static void fimd_atomic_enable(struct exynos_drm_crtc *crtc)

{

	struct fimd_context *ctx = crtc->ctx;
@@ -912,7 +912,7 @@ static void fimd_enable(struct exynos_drm_crtc *crtc) 
	fimd_commit(ctx->crtc);

}



static void fimd_disable(struct exynos_drm_crtc *crtc)

static void fimd_atomic_disable(struct exynos_drm_crtc *crtc)

{

	struct fimd_context *ctx = crtc->ctx;

	int i;
@@ -1006,8 +1006,8 @@ static void fimd_dp_clock_enable(struct exynos_drm_clk *clk, bool enable) 
}



static const struct exynos_drm_crtc_ops fimd_crtc_ops = {

	.enable = fimd_enable,

	.disable = fimd_disable,

	.atomic_enable = fimd_atomic_enable,

	.atomic_disable = fimd_atomic_disable,

	.enable_vblank = fimd_enable_vblank,

	.disable_vblank = fimd_disable_vblank,

	.atomic_begin = fimd_atomic_begin,
@@ -1098,7 +1098,7 @@ static void fimd_unbind(struct device *dev, struct device *master, 
{

	struct fimd_context *ctx = dev_get_drvdata(dev);



	fimd_disable(ctx->crtc);

	fimd_atomic_disable(ctx->crtc);



	exynos_drm_unregister_dma(ctx->drm_dev, ctx->dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE