From patchwork Fri Jan 23 16:18:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 5695891 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 21618C058D for ; Fri, 23 Jan 2015 16:18:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 41D82201F4 for ; Fri, 23 Jan 2015 16:18:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FABD200FE for ; Fri, 23 Jan 2015 16:18:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755458AbbAWQSb (ORCPT ); Fri, 23 Jan 2015 11:18:31 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:50130 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752780AbbAWQSb (ORCPT ); Fri, 23 Jan 2015 11:18:31 -0500 Received: from paszta.hi.pengutronix.de ([2001:67c:670:100:96de:80ff:fec2:9969] helo=paszta) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YEgwE-0001Y1-RV; Fri, 23 Jan 2015 17:18:26 +0100 Message-ID: <1422029904.3017.37.camel@pengutronix.de> Subject: Re: [PATCH v2 0/7] imx-drm: ipuv3-crtc: Implement mode_fixup From: Philipp Zabel To: Fabio Estevam Cc: Liu Ying , Fabio Estevam , "linux-fbdev@vger.kernel.org" , Steve Longerbeam , linux-kernel , DRI mailing list , Denis Carikli , Tomi Valkeinen , Steve Longerbeam , Russell King , Jean-Christophe Plagniol-Villard Date: Fri, 23 Jan 2015 17:18:24 +0100 In-Reply-To: References: <1418954426-21909-1-git-send-email-steve_longerbeam@mentor.com> <1420655248.3191.73.camel@pengutronix.de> <20150123025643.GA11412@victor> X-Mailer: Evolution 3.12.9-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:96de:80ff:fec2:9969 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-fbdev@vger.kernel.org Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Am Freitag, den 23.01.2015, 13:06 -0200 schrieb Fabio Estevam: > On Fri, Jan 23, 2015 at 12:56 AM, Liu Ying wrote: > > Hi, > > > > It looks that the below commit makes my Hannstar XGA LVDS panel stop working > > on the i.MX6DL SabreSD board. Any idea? > > Yes, with eb10d6355532def3a ("mx-drm: encoder prepare/mode_set must > use adjusted mode") applied > the DI clock is 0: My bad, the problem is we are misusing encoder_prepare to enable the display interface clock needed for the following crtc mode set. What we really want is to use is adjusted_mode given to encoder_funcs->mode_set, before the clock is enabled by crtc_funcs->commit. How about this patch: -----8<----- Tested-by: Fabio Estevam diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index abceb3d..99fe4bb 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -193,22 +193,8 @@ static void imx_ldb_encoder_prepare(struct drm_encoder *encoder) { struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder); struct imx_ldb *ldb = imx_ldb_ch->ldb; - struct drm_display_mode *mode = &encoder->crtc->hwmode; u32 pixel_fmt; - unsigned long serial_clk; - unsigned long di_clk = mode->clock * 1000; - int mux = imx_ldb_get_mux_id(imx_ldb_ch); - if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) { - /* dual channel LVDS mode */ - serial_clk = 3500UL * mode->clock; - imx_ldb_set_clock(ldb, mux, 0, serial_clk, di_clk); - imx_ldb_set_clock(ldb, mux, 1, serial_clk, di_clk); - } else { - serial_clk = 7000UL * mode->clock; - imx_ldb_set_clock(ldb, mux, imx_ldb_ch->chno, serial_clk, - di_clk); - } switch (imx_ldb_ch->chno) { case 0: @@ -281,6 +267,9 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder, struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder); struct imx_ldb *ldb = imx_ldb_ch->ldb; int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; + unsigned long serial_clk; + unsigned long di_clk = mode->clock * 1000; + int mux = imx_ldb_get_mux_id(imx_ldb_ch); if (mode->clock > 170000) { dev_warn(ldb->dev, @@ -291,6 +280,16 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder, "%s: mode exceeds 85 MHz pixel clock\n", __func__); } + if (dual) { + serial_clk = 3500UL * mode->clock; + imx_ldb_set_clock(ldb, mux, 0, serial_clk, di_clk); + imx_ldb_set_clock(ldb, mux, 1, serial_clk, di_clk); + } else { + serial_clk = 7000UL * mode->clock; + imx_ldb_set_clock(ldb, mux, imx_ldb_ch->chno, serial_clk, + di_clk); + } + /* FIXME - assumes straight connections DI0 --> CH0, DI1 --> CH1 */ if (imx_ldb_ch == &ldb->channel[0]) { if (mode->flags & DRM_MODE_FLAG_NVSYNC)