| Message ID | 1458205359-2704461-1-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Thank you Arnd for highlighting this. Acked-by: Vincent ABRIOU <vincent.abriou@st.com> On 03/17/2016 10:02 AM, Arnd Bergmann wrote: > Commit 8a2fa38fddd3 removed the mode_fixup because it was empty, > but 652353e6e561 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: 8a2fa38fddd3 ("drm/sti: removed optional dummy crtc mode_fixup function.") > Fixes: 652353e6e561 ("drm/sti: set CRTC modesetting parameters") > Fixes: cf481068cdd4 ("Merge branch '2016-02-26-st-drm-next' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next") > --- > drivers/gpu/drm/sti/sti_crtc.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c > index fa47f63b5316..505620c7c2c8 100644 > --- a/drivers/gpu/drm/sti/sti_crtc.c > +++ b/drivers/gpu/drm/sti/sti_crtc.c > @@ -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, >
diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c index fa47f63b5316..505620c7c2c8 100644 --- a/drivers/gpu/drm/sti/sti_crtc.c +++ b/drivers/gpu/drm/sti/sti_crtc.c @@ -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,
Commit 8a2fa38fddd3 removed the mode_fixup because it was empty, but 652353e6e561 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: 8a2fa38fddd3 ("drm/sti: removed optional dummy crtc mode_fixup function.") Fixes: 652353e6e561 ("drm/sti: set CRTC modesetting parameters") Fixes: cf481068cdd4 ("Merge branch '2016-02-26-st-drm-next' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next") --- drivers/gpu/drm/sti/sti_crtc.c | 1 + 1 file changed, 1 insertion(+)