Skip to content

Commit

Permalink
drm/sti: restore mode_fixup callback
Browse files Browse the repository at this point in the history
Commit 8a2fa38 removed the mode_fixup because it was empty,
but 652353e 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: 8a2fa38 ("drm/sti: removed optional dummy crtc mode_fixup function.")
Fixes: 652353e ("drm/sti: set CRTC modesetting parameters")
Fixes: cf48106 ("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>
  • Loading branch information
Arnd Bergmann authored and Dave Airlie committed Mar 17, 2016
1 parent cf48106 commit e608787
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions drivers/gpu/drm/sti/sti_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ 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,
Expand Down

0 comments on commit e608787

Please sign in to comment.