From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vincent ABRIOU Subject: Re: [PATCH] drm/sti: restore mode_fixup callback Date: Thu, 17 Mar 2016 13:32:45 +0100 Message-ID: <56EAA3ED.1010105@st.com> References: <1458205359-2704461-1-git-send-email-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 307086E1B4 for ; Thu, 17 Mar 2016 12:33:01 +0000 (UTC) In-Reply-To: <1458205359-2704461-1-git-send-email-arnd@arndb.de> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Arnd Bergmann , Benjamin Gaignard , David Airlie Cc: Daniel Vetter , Thierry Reding , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" List-Id: dri-devel@lists.freedesktop.org VGhhbmsgeW91IEFybmQgZm9yIGhpZ2hsaWdodGluZyB0aGlzLgoKQWNrZWQtYnk6IFZpbmNlbnQg QUJSSU9VIDx2aW5jZW50LmFicmlvdUBzdC5jb20+CgpPbiAwMy8xNy8yMDE2IDEwOjAyIEFNLCBB cm5kIEJlcmdtYW5uIHdyb3RlOgo+IENvbW1pdCA4YTJmYTM4ZmRkZDMgcmVtb3ZlZCB0aGUgbW9k ZV9maXh1cCBiZWNhdXNlIGl0IHdhcyBlbXB0eSwKPiBidXQgNjUyMzUzZTZlNTYxIG1vZGlmaWVk IGl0IHRvIGNhbGwgZHJtX21vZGVfc2V0X2NydGNpbmZvKCkKPiBpbnN0ZWFkLgo+Cj4gQm90aCBj b21taXRzIGFyZSBjb3JyZWN0LCBidXQgdGhlIG1lcmdlIG9mIHRoZSB0d28ga2VwdCB0aGUgbm9u ZW1wdHkKPiB2ZXJzaW9uIHdpdGhvdXQgdGhlIHJlZmVyZW5jZSB0byBpdCwgYXMgc2hvd24gYnkg dGhlIGdjYyB3YXJuaW5nOgo+Cj4gICBkcm0vc3RpL3N0aV9jcnRjLmM6NTQ6MTM6IGVycm9yOiAn c3RpX2NydGNfbW9kZV9maXh1cCcgZGVmaW5lZCBidXQgbm90IHVzZWQKPgo+IFRoaXMgcmVzdG9y ZXMgdGhlIGNhbGxiYWNrIHBvaW50ZXIgdG8gZml4IHRoZSBtZXJnZS4KPgo+IFNpZ25lZC1vZmYt Ynk6IEFybmQgQmVyZ21hbm4gPGFybmRAYXJuZGIuZGU+Cj4gUmV2ZXJ0czogOGEyZmEzOGZkZGQz ICgiZHJtL3N0aTogcmVtb3ZlZCBvcHRpb25hbCBkdW1teSBjcnRjIG1vZGVfZml4dXAgZnVuY3Rp b24uIikKPiBGaXhlczogNjUyMzUzZTZlNTYxICgiZHJtL3N0aTogc2V0IENSVEMgbW9kZXNldHRp bmcgcGFyYW1ldGVycyIpCj4gRml4ZXM6IGNmNDgxMDY4Y2RkNCAoIk1lcmdlIGJyYW5jaCAnMjAx Ni0wMi0yNi1zdC1kcm0tbmV4dCcgb2YgaHR0cDovL2dpdC5saW5hcm8ub3JnL3Blb3BsZS9iZW5q YW1pbi5nYWlnbmFyZC9rZXJuZWwgaW50byBkcm0tbmV4dCIpCj4gLS0tCj4gICBkcml2ZXJzL2dw dS9kcm0vc3RpL3N0aV9jcnRjLmMgfCAxICsKPiAgIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlv bigrKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9zdGkvc3RpX2NydGMuYyBiL2Ry aXZlcnMvZ3B1L2RybS9zdGkvc3RpX2NydGMuYwo+IGluZGV4IGZhNDdmNjNiNTMxNi4uNTA1NjIw YzdjMmM4IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9zdGkvc3RpX2NydGMuYwo+ICsr KyBiL2RyaXZlcnMvZ3B1L2RybS9zdGkvc3RpX2NydGMuYwo+IEBAIC0yMzAsNiArMjMwLDcgQEAg c3RhdGljIHZvaWQgc3RpX2NydGNfYXRvbWljX2ZsdXNoKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK PiAgIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2NydGNfaGVscGVyX2Z1bmNzIHN0aV9jcnRjX2hl bHBlcl9mdW5jcyA9IHsKPiAgIAkuZW5hYmxlID0gc3RpX2NydGNfZW5hYmxlLAo+ICAgCS5kaXNh YmxlID0gc3RpX2NydGNfZGlzYWJsaW5nLAo+ICsJLm1vZGVfZml4dXAgPSBzdGlfY3J0Y19tb2Rl X2ZpeHVwLAo+ICAgCS5tb2RlX3NldCA9IGRybV9oZWxwZXJfY3J0Y19tb2RlX3NldCwKPiAgIAku bW9kZV9zZXRfbm9mYiA9IHN0aV9jcnRjX21vZGVfc2V0X25vZmIsCj4gICAJLm1vZGVfc2V0X2Jh c2UgPSBkcm1faGVscGVyX2NydGNfbW9kZV9zZXRfYmFzZSwKPgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK 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, >