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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,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 6B850C4743C for ; Mon, 21 Jun 2021 13:20:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 33D4360725 for ; Mon, 21 Jun 2021 13:20:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33D4360725 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF9F86E0AB; Mon, 21 Jun 2021 13:20:34 +0000 (UTC) Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id C54CD6E0AB for ; Mon, 21 Jun 2021 13:20:32 +0000 (UTC) Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D25024C2C; Mon, 21 Jun 2021 15:20:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1624281631; bh=rpSPCH2O2iPbwfLU/+6Ycrf9BPLi5UNoR00Y0COaFbY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=t8e2jit2hyTdSdbe7sfl7esWOIqEnd2R724r4RaWZSx4Gu+b/NCsGxVZzW3l+GPIo opqwURa1qz5Cmq2dio/CmjKtbyOGscsFriZgN9F9GEXjsgH22QuyqiVAl+Lp8xG8DQ aZky9zXjxVpPIifD2EATcI/1mm6azYwQmqQn3P0k= Date: Mon, 21 Jun 2021 16:20:04 +0300 From: Laurent Pinchart To: Marek Vasut Subject: Re: [PATCH] drm: mxsfb: Use bus_format from the nearest bridge if present Message-ID: References: <20210620224918.189469-1-marex@denx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210620224918.189469-1-marex@denx.de> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ch@denx.de, Emil Velikov , Daniel Abrecht , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Marek, Thank you for the patch. On Mon, Jun 21, 2021 at 12:49:18AM +0200, Marek Vasut wrote: > In case there is a bridge connected to the LCDIF, use bus_format > from the bridge, otherwise behave as before and use bus_format > from the connector. This way, even if there are multiple bridges > in the display pipeline, the LCDIF will use the correct format. > > Signed-off-by: Marek Vasut > Cc: Daniel Abrecht > Cc: Emil Velikov > Cc: Laurent Pinchart > Cc: Lucas Stach > Cc: Stefan Agner > --- > drivers/gpu/drm/mxsfb/mxsfb_kms.c | 33 +++++++++++++++++++++++-------- > 1 file changed, 25 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > index 5bcc06c1ac0b..98d8ba0bae84 100644 > --- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c > +++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > @@ -47,16 +47,13 @@ static u32 set_hsync_pulse_width(struct mxsfb_drm_private *mxsfb, u32 val) > * Setup the MXSFB registers for decoding the pixels out of the framebuffer and > * outputting them on the bus. > */ > -static void mxsfb_set_formats(struct mxsfb_drm_private *mxsfb) > +static void mxsfb_set_formats(struct mxsfb_drm_private *mxsfb, > + const u32 bus_format) > { > struct drm_device *drm = mxsfb->drm; > const u32 format = mxsfb->crtc.primary->state->fb->format->format; > - u32 bus_format = MEDIA_BUS_FMT_RGB888_1X24; > u32 ctrl, ctrl1; > > - if (mxsfb->connector->display_info.num_bus_formats) > - bus_format = mxsfb->connector->display_info.bus_formats[0]; > - > DRM_DEV_DEBUG_DRIVER(drm->dev, "Using bus_format: 0x%08X\n", > bus_format); > > @@ -222,7 +219,8 @@ static dma_addr_t mxsfb_get_fb_paddr(struct drm_plane *plane) > return gem->paddr; > } > > -static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb) > +static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb, > + const u32 bus_format) > { > struct drm_device *drm = mxsfb->crtc.dev; > struct drm_display_mode *m = &mxsfb->crtc.state->adjusted_mode; > @@ -247,7 +245,7 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb) > if (mxsfb->devdata->has_overlay) > writel(0, mxsfb->base + LCDC_AS_CTRL); > > - mxsfb_set_formats(mxsfb); > + mxsfb_set_formats(mxsfb, bus_format); > > clk_set_rate(mxsfb->clk, m->crtc_clock * 1000); > > @@ -345,7 +343,9 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc, > struct drm_atomic_state *state) > { > struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev); > + struct drm_bridge_state *bridge_state; > struct drm_device *drm = mxsfb->drm; > + u32 bus_format = 0; > dma_addr_t paddr; > > pm_runtime_get_sync(drm->dev); > @@ -353,7 +353,24 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc, > > drm_crtc_vblank_on(crtc); > > - mxsfb_crtc_mode_set_nofb(mxsfb); > + /* If there is a bridge attached to the LCDIF, use its bus format */ > + if (mxsfb->bridge && state) { I *think* state will always be non-null here. > + bridge_state = > + drm_atomic_get_new_bridge_state(state, > + mxsfb->bridge); > + if (bridge_state) This should be guaranteed to be non-null too. > + bus_format = bridge_state->input_bus_cfg.format; > + } > + > + /* If there is no bridge, use bus format from connector */ > + if (!bus_format && mxsfb->connector->display_info.num_bus_formats) > + bus_format = mxsfb->connector->display_info.bus_formats[0]; > + > + /* If all else fails, default to RGB888_1X24 */ > + if (!bus_format) > + bus_format = MEDIA_BUS_FMT_RGB888_1X24; /* And if that fails too... */ if (!bus_format) panic("Gone farming tomatoes in Portugal"); :-) Reviewed-by: Laurent Pinchart > + > + mxsfb_crtc_mode_set_nofb(mxsfb, bus_format); > > /* Write cur_buf as well to avoid an initial corrupt frame */ > paddr = mxsfb_get_fb_paddr(crtc->primary); -- Regards, Laurent Pinchart