From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935873AbcCQMdK (ORCPT ); Thu, 17 Mar 2016 08:33:10 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:60752 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933709AbcCQMdI convert rfc822-to-8bit (ORCPT ); Thu, 17 Mar 2016 08:33:08 -0400 From: Vincent ABRIOU To: Arnd Bergmann , Benjamin Gaignard , David Airlie CC: Daniel Vetter , Thierry Reding , =?Windows-1252?Q?Ville_Syrj=E4l=E4?= , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" Date: Thu, 17 Mar 2016 13:32:45 +0100 Subject: Re: [PATCH] drm/sti: restore mode_fixup callback Thread-Topic: [PATCH] drm/sti: restore mode_fixup callback Thread-Index: AdGASRuu+ydAZb1OQNGx/PCgFMHBdg== Message-ID: <56EAA3ED.1010105@st.com> References: <1458205359-2704461-1-git-send-email-arnd@arndb.de> In-Reply-To: <1458205359-2704461-1-git-send-email-arnd@arndb.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 acceptlanguage: en-US Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-03-17_04:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thank you Arnd for highlighting this. Acked-by: Vincent ABRIOU 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 > 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, >