From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752244AbdAaT3F (ORCPT ); Tue, 31 Jan 2017 14:29:05 -0500 Received: from mail-yb0-f173.google.com ([209.85.213.173]:36819 "EHLO mail-yb0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751698AbdAaT26 (ORCPT ); Tue, 31 Jan 2017 14:28:58 -0500 Date: Tue, 31 Jan 2017 14:21:17 -0500 From: Sean Paul To: John Keeping Cc: Mark Yao , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, Chris Zhong , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v3 21/24] drm/rockchip: dw-mipi-dsi: defer probe if panel is not loaded Message-ID: <20170131192117.GE20076@art_vandelay> References: <20170129132444.25251-1-john@metanate.com> <20170129132444.25251-22-john@metanate.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170129132444.25251-22-john@metanate.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Jan 29, 2017 at 01:24:41PM +0000, John Keeping wrote: > This ensures that the output resolution is known before fbcon loads. > > Signed-off-by: John Keeping > --- > Unchanged in v3 > Unchanged in v2 > > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > index f5b15377ef85..5bad92e2370e 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > @@ -1176,10 +1176,17 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master, > > dsi->dsi_host.ops = &dw_mipi_dsi_host_ops; > dsi->dsi_host.dev = dev; > - return mipi_dsi_host_register(&dsi->dsi_host); > + ret = mipi_dsi_host_register(&dsi->dsi_host); > + if (!ret && !dsi->panel) { > + mipi_dsi_host_unregister(&dsi->dsi_host); > + drm_encoder_cleanup(&dsi->encoder); > + drm_connector_cleanup(&dsi->connector); Move the host registration up before dw_mipi_dsi_register() to avoid having to clean up the encoder and connector? > + ret = -EPROBE_DEFER; > + } > > err_pllref: > - clk_disable_unprepare(dsi->pllref_clk); > + if (ret) I personally think it's cleaner to explicitly goto in the error conditional (or in this case, the defer conditional) and have a return 0; right before the err_* labels. Then you don't need to worry about a) checking ret in all of your cleanups and b) someone adding code above the labels that you don't intend to run. Sean > + clk_disable_unprepare(dsi->pllref_clk); > return ret; > } > > -- > 2.11.0.197.gb556de5.dirty > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Sean Paul, Software Engineer, Google / Chromium OS