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

drm/exynos: remove extra call to hdmi_commit() 



hdmi_commit() was getting called twice by exynos encoder core, once inside
the .enable() call and another time by .commit() itself.

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

drivers/gpu/drm/exynos/exynos_hdmi.c

+1 −12
Original line number Diff line number Diff line
@@ -1711,16 +1711,6 @@ static void hdmi_mode_set(struct exynos_drm_encoder *encoder, 
	hdata->cea_video_id = drm_match_cea_mode(mode);

}



static void hdmi_commit(struct exynos_drm_encoder *encoder)

{

	struct hdmi_context *hdata = encoder_to_hdmi(encoder);



	if (!hdata->powered)

		return;



	hdmi_conf_apply(hdata);

}



static void hdmi_enable(struct exynos_drm_encoder *encoder)

{

	struct hdmi_context *hdata = encoder_to_hdmi(encoder);
@@ -1744,7 +1734,7 @@ static void hdmi_enable(struct exynos_drm_encoder *encoder) 
	clk_prepare_enable(res->sclk_hdmi);



	hdmiphy_poweron(hdata);

	hdmi_commit(encoder);

	hdmi_conf_apply(hdata);

}



static void hdmi_disable(struct exynos_drm_encoder *encoder)
@@ -1798,7 +1788,6 @@ static struct exynos_drm_encoder_ops hdmi_encoder_ops = { 
	.mode_set	= hdmi_mode_set,

	.enable		= hdmi_enable,

	.disable	= hdmi_disable,

	.commit		= hdmi_commit,

};



static void hdmi_hotplug_work_func(struct work_struct *work)