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

Commit 54c40ded authored by Sean Paul's avatar Sean Paul Committed by Inki Dae
Browse files

drm/exynos: Rename display_op power_on to dpms 



This patch renames the display_op power_on to dpms to accurately reflect
what the function does.

The side-effect of this patch is that the new hdmi dpms callback is now
invoked twice in the dpms path. This is safe and will be dealt with when
the exynos_drm shim goes away.

Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Reviewed-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent e5b89916

drivers/gpu/drm/exynos/exynos_drm_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct exynos_drm_overlay { 
 * @get_edid: get edid modes from display driver.

 * @get_panel: get panel object from display driver.

 * @check_mode: check if mode is valid or not.

 * @power_on: display device on or off.

 * @dpms: display device on or off.

 */

struct exynos_drm_display_ops {

	enum exynos_drm_output_type type;
@@ -138,7 +138,7 @@ struct exynos_drm_display_ops { 
			struct drm_connector *connector);

	void *(*get_panel)(struct device *dev);

	int (*check_mode)(struct device *dev, struct drm_display_mode *mode);

	int (*power_on)(struct device *dev, int mode);

	int (*dpms)(struct device *dev, int mode);

};



/*

drivers/gpu/drm/exynos/exynos_drm_encoder.c

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ static void exynos_drm_encoder_dpms(struct drm_encoder *encoder, int mode) 
		return;

	}



	if (display_ops && display_ops->power_on)

		display_ops->power_on(manager->ctx, mode);

	if (display_ops && display_ops->dpms)

		display_ops->dpms(manager->ctx, mode);



	exynos_encoder->dpms = mode;

}

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+0 −8
Original line number Diff line number Diff line
@@ -169,19 +169,11 @@ static int fimd_check_mode(struct device *dev, struct drm_display_mode *mode) 
	return 0;

}



static int fimd_display_power_on(struct device *dev, int mode)

{

	/* TODO */



	return 0;

}



static struct exynos_drm_display_ops fimd_display_ops = {

	.type = EXYNOS_DISPLAY_TYPE_LCD,

	.is_connected = fimd_display_is_connected,

	.get_panel = fimd_get_panel,

	.check_mode = fimd_check_mode,

	.power_on = fimd_display_power_on,

};



static int fimd_mgr_initialize(struct exynos_drm_manager *mgr,

drivers/gpu/drm/exynos/exynos_drm_hdmi.c

+4 −4
Original line number Diff line number Diff line
@@ -159,12 +159,12 @@ static int drm_hdmi_check_mode(struct device *dev, 
	return drm_hdmi_check_mode_ctx(ctx, mode);

}



static int drm_hdmi_power_on(struct device *dev, int mode)

static int drm_hdmi_display_dpms(struct device *dev, int mode)

{

	struct drm_hdmi_context *ctx = to_context(dev);



	if (hdmi_ops && hdmi_ops->power_on)

		return hdmi_ops->power_on(ctx->hdmi_ctx->ctx, mode);

	if (hdmi_ops && hdmi_ops->dpms)

		hdmi_ops->dpms(ctx->hdmi_ctx->ctx, mode);



	return 0;

}
@@ -175,7 +175,7 @@ static struct exynos_drm_display_ops drm_hdmi_display_ops = { 
	.is_connected = drm_hdmi_is_connected,

	.get_edid = drm_hdmi_get_edid,

	.check_mode = drm_hdmi_check_mode,

	.power_on = drm_hdmi_power_on,

	.dpms = drm_hdmi_display_dpms,

};



static int drm_hdmi_enable_vblank(struct exynos_drm_manager *mgr)

drivers/gpu/drm/exynos/exynos_drm_hdmi.h

+1 −2
Original line number Diff line number Diff line
@@ -33,14 +33,13 @@ struct exynos_hdmi_ops { 
	struct edid *(*get_edid)(void *ctx,

			struct drm_connector *connector);

	int (*check_mode)(void *ctx, struct drm_display_mode *mode);

	int (*power_on)(void *ctx, int mode);

	void (*dpms)(void *ctx, int mode);



	/* manager */

	void (*mode_set)(void *ctx, struct drm_display_mode *mode);

	void (*get_max_resol)(void *ctx, unsigned int *width,

				unsigned int *height);

	void (*commit)(void *ctx);

	void (*dpms)(void *ctx, int mode);

};



struct exynos_mixer_ops {