From patchwork Thu Mar 17 09:02:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8608401 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 61CBD9F6E1 for ; Thu, 17 Mar 2016 09:03:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D3922026F for ; Thu, 17 Mar 2016 09:03:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9D4F020279 for ; Thu, 17 Mar 2016 09:03:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AFDC06EA81; Thu, 17 Mar 2016 09:03:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id BC10D6EA81 for ; Thu, 17 Mar 2016 09:02:57 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0Lh6mt-1a3nPe0eCl-00oWJ9; Thu, 17 Mar 2016 10:02:45 +0100 From: Arnd Bergmann To: Benjamin Gaignard , Vincent Abriou , David Airlie Subject: [PATCH] drm/sti: restore mode_fixup callback Date: Thu, 17 Mar 2016 10:02:10 +0100 Message-Id: <1458205359-2704461-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:E48lqNk6XnRt8FWFZ2pzl6ng/Z0fJLj/rnSOonoRys7b9a7nPBZ Zuap0uyXXovnOUaiUJS0bymy2DMLbMrtsYqTmoOPGuKnP59Ofbk2NP8ubLNi1q7Vq4bPQQO ZJ4TT69Zsbz2Q/1kc7d0jIPSf2NxMlAQ9ddsPBDobO3omu4Ght3CnXdZnoY0WZnLA/Y/3wM PXN90DIxavPpItLXvAneQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:LjAa7ztGB4Q=:fuYq8XwlRfVBIVYwxGxHiY mwuBMWWOdVvJ3oLiYr/4ZV3rd2LhD1PYa4Y2cp8hdfGi0F9xBh8REBe68j1I9YbbsJhz5rEbX e3Y0JMHqDzkHBcrdprx4dPZtZGgEaLDcIb+c4p01Rhk4zXHfpyM2/ZV/HF6GOVuHrD+gZm91L njzlZqwKh/ysjLxVDcAw5TcOvMcl+mtiGrPe1ftyWugMG3IDWhrWJbxjk/tfh+uHtA4UbM+B0 sZQKbRByrPPU/3lYXKtGphKS4x9r1qCZQJORHveTjIZie0tndnFadOoHQYbjBavfWsiUAyekt aZFxqIuR7VWHYBLZHDBWpvVKsqvNeaBQhOyGgWbX4+2XD0Eb4aQ9EXZPEaGVprTBXG7Ew9hjP 0ZLjEe64QTQ0CJFuanB5Je3c2qOh8nICdl0YaLAf3c5JaKnnWgOMQr3Um9Q5CMFkNWyhSKvOs 5JygONMoieRTtWAg69CgiOMRUPOlvx2vBHmvZ3JFPAshA3PwAJOhUv6+aCCMst/nLTg+A4GcZ GjXXgIWquBMZhHfZJ92Grc9FiNtq8nZ1oSGgPn4c2soTv5zQPRr+KwNvFhiGZFrw4O109jKxF fa05L6Jg+wI4Mzmzv2Ixh/MFa1yWSW4f20WPSjDeVUTuZblOrBCfVdr6Hco6YzHkkJVT0tohM iiIwWAC7mXCA9kZRAOKP+JpA1rQW0F38rfI08zhTwFLed/pGzhndBOEQMDWgbawG+e4g= Cc: Arnd Bergmann , Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Thierry Reding X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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") Acked-by: Vincent ABRIOU --- 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,