Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/sti: remove extra mode fixup

Commit 652353e6e561c2aeeac62df183f721f6f9b5b45f ("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: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>

authored by

Tomi Valkeinen and committed by
Dave Airlie
84e5a795 b201e743

-10
-10
drivers/gpu/drm/sti/sti_crtc.c
··· 51 51 mixer->status = STI_MIXER_DISABLING; 52 52 } 53 53 54 - static bool sti_crtc_mode_fixup(struct drm_crtc *crtc, 55 - const struct drm_display_mode *mode, 56 - struct drm_display_mode *adjusted_mode) 57 - { 58 - /* accept the provided drm_display_mode, do not fix it up */ 59 - drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V); 60 - return true; 61 - } 62 - 63 54 static int 64 55 sti_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode) 65 56 { ··· 221 230 static const struct drm_crtc_helper_funcs sti_crtc_helper_funcs = { 222 231 .enable = sti_crtc_enable, 223 232 .disable = sti_crtc_disabling, 224 - .mode_fixup = sti_crtc_mode_fixup, 225 233 .mode_set = drm_helper_crtc_mode_set, 226 234 .mode_set_nofb = sti_crtc_mode_set_nofb, 227 235 .mode_set_base = drm_helper_crtc_mode_set_base,