From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50B10C43381 for ; Thu, 7 Mar 2019 13:29:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 201CD20835 for ; Thu, 7 Mar 2019 13:29:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iHzvrCNB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 201CD20835 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hYyZ+C98SP/nrgKtlVlsDa8H3lFVpRAUZcc/J4eEcPE=; b=iHzvrCNBa/B0Ej oig/VxjeLzps32uIBJ0NHs4WPNn2tC8O1EthWW6Nqt6/RhW89uVNcNSO1d6plVy6VbzPm/weiM5h6 n7Uf+twAlkU8rewR74p2YNVV/cOLTVVExgfHLUzFTb8B+Y18bhdgZhzwhR+z2OCx992Cuy3lacPt/ C+IcCbfy5kX8wSRD43fG97vtXz5XnjbMeBl1iIQo6JvHDb9kT/QUEss6RnHIQdF5+L0HqjAXyXXGb MnCR5q3r2PCFlymvuuG7hICPeHzieAIPjuugOsjcow7pGxneYnkQkNbUvB0uGwYRKBfB+L9aWDg0e MiIdI9DD1zdiuL6e7aDQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1t5l-0007vO-TQ; Thu, 07 Mar 2019 13:29:45 +0000 Received: from relay11.mail.gandi.net ([217.70.178.231]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1t5i-0007ux-9d for linux-arm-kernel@lists.infradead.org; Thu, 07 Mar 2019 13:29:44 +0000 Received: from aptenodytes (aaubervilliers-681-1-31-179.w90-88.abo.wanadoo.fr [90.88.150.179]) (Authenticated sender: paul.kocialkowski@bootlin.com) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 7D2C4100004; Thu, 7 Mar 2019 13:29:38 +0000 (UTC) Message-ID: <4e2df5e00e8231d841e6b85e4f73d8cfd1fe24b7.camel@bootlin.com> Subject: Re: [PATCH 1/4] drm/sun4i: Move the panel pointer from the TCON to the encoders From: Paul Kocialkowski To: Maxime Ripard , Chen-Yu Tsai Date: Thu, 07 Mar 2019 14:29:38 +0100 In-Reply-To: <13288b6b8f27b614a6c9aef348923c34b2803ad4.1551191081.git-series.maxime.ripard@bootlin.com> References: <13288b6b8f27b614a6c9aef348923c34b2803ad4.1551191081.git-series.maxime.ripard@bootlin.com> Organization: Bootlin User-Agent: Evolution 3.30.5 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190307_052942_658473_32DEB099 X-CRM114-Status: GOOD ( 19.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sean Paul , Maarten Lankhorst , linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On Tue, 2019-02-26 at 15:25 +0100, Maxime Ripard wrote: > The TCON driver used to need the panel pointer in order to configure the > tcon according to the various parameters of the panel. However, this has > evolved over time (especially to support bridges), and therefore the panel > pointer isn't needed anymore by the TCON driver. > > Move that pointer to the LVDS and RGB encoders drivers. > > Signed-off-by: Maxime Ripard That definitely makes good sense to me! Reviewed-by: Paul Kocialkowski Cheers, Paul > --- > drivers/gpu/drm/sun4i/sun4i_lvds.c | 29 ++++++++++++----------------- > drivers/gpu/drm/sun4i/sun4i_rgb.c | 27 ++++++++++++--------------- > drivers/gpu/drm/sun4i/sun4i_tcon.h | 2 -- > 3 files changed, 24 insertions(+), 34 deletions(-) > > diff --git a/drivers/gpu/drm/sun4i/sun4i_lvds.c b/drivers/gpu/drm/sun4i/sun4i_lvds.c > index e7eb0d1e17be..5696f55db5cd 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_lvds.c > +++ b/drivers/gpu/drm/sun4i/sun4i_lvds.c > @@ -20,7 +20,7 @@ struct sun4i_lvds { > struct drm_connector connector; > struct drm_encoder encoder; > > - struct sun4i_tcon *tcon; > + struct drm_panel *panel; > }; > > static inline struct sun4i_lvds * > @@ -41,9 +41,8 @@ static int sun4i_lvds_get_modes(struct drm_connector *connector) > { > struct sun4i_lvds *lvds = > drm_connector_to_sun4i_lvds(connector); > - struct sun4i_tcon *tcon = lvds->tcon; > > - return drm_panel_get_modes(tcon->panel); > + return drm_panel_get_modes(lvds->panel); > } > > static struct drm_connector_helper_funcs sun4i_lvds_con_helper_funcs = { > @@ -54,9 +53,8 @@ static void > sun4i_lvds_connector_destroy(struct drm_connector *connector) > { > struct sun4i_lvds *lvds = drm_connector_to_sun4i_lvds(connector); > - struct sun4i_tcon *tcon = lvds->tcon; > > - drm_panel_detach(tcon->panel); > + drm_panel_detach(lvds->panel); > drm_connector_cleanup(connector); > } > > @@ -71,26 +69,24 @@ static const struct drm_connector_funcs sun4i_lvds_con_funcs = { > static void sun4i_lvds_encoder_enable(struct drm_encoder *encoder) > { > struct sun4i_lvds *lvds = drm_encoder_to_sun4i_lvds(encoder); > - struct sun4i_tcon *tcon = lvds->tcon; > > DRM_DEBUG_DRIVER("Enabling LVDS output\n"); > > - if (tcon->panel) { > - drm_panel_prepare(tcon->panel); > - drm_panel_enable(tcon->panel); > + if (lvds->panel) { > + drm_panel_prepare(lvds->panel); > + drm_panel_enable(lvds->panel); > } > } > > static void sun4i_lvds_encoder_disable(struct drm_encoder *encoder) > { > struct sun4i_lvds *lvds = drm_encoder_to_sun4i_lvds(encoder); > - struct sun4i_tcon *tcon = lvds->tcon; > > DRM_DEBUG_DRIVER("Disabling LVDS output\n"); > > - if (tcon->panel) { > - drm_panel_disable(tcon->panel); > - drm_panel_unprepare(tcon->panel); > + if (lvds->panel) { > + drm_panel_disable(lvds->panel); > + drm_panel_unprepare(lvds->panel); > } > } > > @@ -113,11 +109,10 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon) > lvds = devm_kzalloc(drm->dev, sizeof(*lvds), GFP_KERNEL); > if (!lvds) > return -ENOMEM; > - lvds->tcon = tcon; > encoder = &lvds->encoder; > > ret = drm_of_find_panel_or_bridge(tcon->dev->of_node, 1, 0, > - &tcon->panel, &bridge); > + &lvds->panel, &bridge); > if (ret) { > dev_info(drm->dev, "No panel or bridge found... LVDS output disabled\n"); > return 0; > @@ -138,7 +133,7 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon) > /* The LVDS encoder can only work with the TCON channel 0 */ > lvds->encoder.possible_crtcs = drm_crtc_mask(&tcon->crtc->crtc); > > - if (tcon->panel) { > + if (lvds->panel) { > drm_connector_helper_add(&lvds->connector, > &sun4i_lvds_con_helper_funcs); > ret = drm_connector_init(drm, &lvds->connector, > @@ -152,7 +147,7 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon) > drm_connector_attach_encoder(&lvds->connector, > &lvds->encoder); > > - ret = drm_panel_attach(tcon->panel, &lvds->connector); > + ret = drm_panel_attach(lvds->panel, &lvds->connector); > if (ret) { > dev_err(drm->dev, "Couldn't attach our panel\n"); > goto err_cleanup_connector; > diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c > index f4a22689eb54..d181ee399b03 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c > +++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c > @@ -27,6 +27,7 @@ struct sun4i_rgb { > struct drm_encoder encoder; > > struct sun4i_tcon *tcon; > + struct drm_panel *panel; > }; > > static inline struct sun4i_rgb * > @@ -47,9 +48,8 @@ static int sun4i_rgb_get_modes(struct drm_connector *connector) > { > struct sun4i_rgb *rgb = > drm_connector_to_sun4i_rgb(connector); > - struct sun4i_tcon *tcon = rgb->tcon; > > - return drm_panel_get_modes(tcon->panel); > + return drm_panel_get_modes(rgb->panel); > } > > static enum drm_mode_status sun4i_rgb_mode_valid(struct drm_encoder *crtc, > @@ -114,9 +114,8 @@ static void > sun4i_rgb_connector_destroy(struct drm_connector *connector) > { > struct sun4i_rgb *rgb = drm_connector_to_sun4i_rgb(connector); > - struct sun4i_tcon *tcon = rgb->tcon; > > - drm_panel_detach(tcon->panel); > + drm_panel_detach(rgb->panel); > drm_connector_cleanup(connector); > } > > @@ -131,26 +130,24 @@ static const struct drm_connector_funcs sun4i_rgb_con_funcs = { > static void sun4i_rgb_encoder_enable(struct drm_encoder *encoder) > { > struct sun4i_rgb *rgb = drm_encoder_to_sun4i_rgb(encoder); > - struct sun4i_tcon *tcon = rgb->tcon; > > DRM_DEBUG_DRIVER("Enabling RGB output\n"); > > - if (tcon->panel) { > - drm_panel_prepare(tcon->panel); > - drm_panel_enable(tcon->panel); > + if (rgb->panel) { > + drm_panel_prepare(rgb->panel); > + drm_panel_enable(rgb->panel); > } > } > > static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder) > { > struct sun4i_rgb *rgb = drm_encoder_to_sun4i_rgb(encoder); > - struct sun4i_tcon *tcon = rgb->tcon; > > DRM_DEBUG_DRIVER("Disabling RGB output\n"); > > - if (tcon->panel) { > - drm_panel_disable(tcon->panel); > - drm_panel_unprepare(tcon->panel); > + if (rgb->panel) { > + drm_panel_disable(rgb->panel); > + drm_panel_unprepare(rgb->panel); > } > } > > @@ -183,7 +180,7 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon) > encoder = &rgb->encoder; > > ret = drm_of_find_panel_or_bridge(tcon->dev->of_node, 1, 0, > - &tcon->panel, &bridge); > + &rgb->panel, &bridge); > if (ret) { > dev_info(drm->dev, "No panel or bridge found... RGB output disabled\n"); > return 0; > @@ -204,7 +201,7 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon) > /* The RGB encoder can only work with the TCON channel 0 */ > rgb->encoder.possible_crtcs = drm_crtc_mask(&tcon->crtc->crtc); > > - if (tcon->panel) { > + if (rgb->panel) { > drm_connector_helper_add(&rgb->connector, > &sun4i_rgb_con_helper_funcs); > ret = drm_connector_init(drm, &rgb->connector, > @@ -218,7 +215,7 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon) > drm_connector_attach_encoder(&rgb->connector, > &rgb->encoder); > > - ret = drm_panel_attach(tcon->panel, &rgb->connector); > + ret = drm_panel_attach(rgb->panel, &rgb->connector); > if (ret) { > dev_err(drm->dev, "Couldn't attach our panel\n"); > goto err_cleanup_connector; > diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.h b/drivers/gpu/drm/sun4i/sun4i_tcon.h > index b5214d71610f..84cfb1952ff7 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_tcon.h > +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h > @@ -257,8 +257,6 @@ struct sun4i_tcon { > struct reset_control *lcd_rst; > struct reset_control *lvds_rst; > > - struct drm_panel *panel; > - > /* Platform adjustments */ > const struct sun4i_tcon_quirks *quirks; > -- Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel