]> git.baikalelectronics.ru Git - kernel.git/commit
drm/sti: restore mode_fixup callback
authorArnd Bergmann <arnd@arndb.de>
Thu, 17 Mar 2016 09:02:10 +0000 (10:02 +0100)
committerDave Airlie <airlied@redhat.com>
Thu, 17 Mar 2016 21:15:57 +0000 (07:15 +1000)
commite2ec4b2db3332d82fc2a693341e5469409fd44f9
treef47a918ed0e122212d19cd8d5f63d26798a41ddf
parente46744fd1e3679e524bcbf2f8910eb6edb340d48
drm/sti: restore mode_fixup callback

Commit d83eafc414df removed the mode_fixup because it was empty,
but 7a11851bae30 modified it to call drm_mode_set_crtcinfo()
instead.

Both commits are correct, but the merge of the two kept the nonempty
version without the reference to it, as shown by the gcc warning:

 drm/sti/sti_crtc.c:54:13: error: 'sti_crtc_mode_fixup' defined but not used

This restores the callback pointer to fix the merge.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reverts: d83eafc414df ("drm/sti: removed optional dummy crtc mode_fixup function.")
Fixes: 7a11851bae30 ("drm/sti: set CRTC modesetting parameters")
Fixes: e46744fd1e36 ("Merge branch '2016-02-26-st-drm-next' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next")
Acked-by: Vincent ABRIOU <vincent.abriou@st.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/sti/sti_crtc.c