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

Commit 84e5a795 authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Dave Airlie
Browse files

drm/sti: remove extra mode fixup 



Commit 652353e6 ("drm/sti: set CRTC
modesetting parameters") added a hack to avoid warnings related to
setting mode with atomic API. With the previous patch, the hack should
no longer be necessary.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent b201e743

drivers/gpu/drm/sti/sti_crtc.c

+0 −10
Original line number Diff line number Diff line
@@ -51,15 +51,6 @@ static void sti_crtc_disabling(struct drm_crtc *crtc) 
	mixer->status = STI_MIXER_DISABLING;

}



static bool sti_crtc_mode_fixup(struct drm_crtc *crtc,

				const struct drm_display_mode *mode,

				struct drm_display_mode *adjusted_mode)

{

	/* accept the provided drm_display_mode, do not fix it up */

	drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);

	return true;

}



static int

sti_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode)

{
@@ -230,7 +221,6 @@ static void sti_crtc_atomic_flush(struct drm_crtc *crtc, 
static const struct drm_crtc_helper_funcs sti_crtc_helper_funcs = {

	.enable = sti_crtc_enable,

	.disable = sti_crtc_disabling,

	.mode_fixup = sti_crtc_mode_fixup,

	.mode_set = drm_helper_crtc_mode_set,

	.mode_set_nofb = sti_crtc_mode_set_nofb,

	.mode_set_base = drm_helper_crtc_mode_set_base,