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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6E9D4C636D4 for ; Fri, 17 Feb 2023 08:10:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uc9EWMWtUQs8KdyQsxQUkKoa+JmSY1H3G9Gmc2ZzG7o=; b=NPGs9SoQNnBpTy r2qoK+1EfpsPrDFbOeU9pxgqaI7FjKt5VN3Wic/XCLpUnf6mDuO7aMT15tgAD8LUrLNNyS1p4UQkc 5y7Q7uReG4D0nbTTR9amW9tnxsxV5xkDWgjvuV1T9uBOaXeiOTz1XpkatuB+wxDd3iycpcNvu7vwl bjngxqEooTX8Mahff5OrVvXVyUgdQE0mq+veh+yQt1gkRAswblFTaegHGu9+wwMQxeZbOz1rHwPUh Ln1ImMClubrWngl3MSj2MH1Nq/1lpQ5iGbmdQ5yd0c/Aynqx3144fTI4/BUSJv//LLlbFMAwQ08y8 AGRtQC6L1yY9vzZg3K9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pSvo5-00DFCc-Dn; Fri, 17 Feb 2023 08:09:26 +0000 Received: from mx1.tq-group.com ([93.104.207.81]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pSvnx-00DF7y-PB for linux-arm-kernel@lists.infradead.org; Fri, 17 Feb 2023 08:09:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1676621358; x=1708157358; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=C4LlNQesVn7hKoWLdoFsmmchC0zOflI6zSTV9xpIKZk=; b=Nu+mS4rJLbE0buoDzb5pqvn0pXjMTOgNi7mjUuDow/8RnR3rSPsQS+h+ kKIF4H2EUEtt8CjkGXCPQn0bJ6HHpMnOSisXNpCOg7HtELQ+StPOahHxx hhzhaXL+kLqFsxIPmD8IHMR5fAUE57w2W+zjFwscmSFbwgI4S/pjOdbXR GdoUT1ZrsFXNUu0dF0oj/eizX6cKMaO4/CkqfcuyBpT0Vfham9yAewfhi UszjUafkNuCEg87922xQ6rmHdT4vfx1FxmQ/G+de8YjhrGnenNU+CtQWt xhlAHXVKQCv03lTbBYrut20C1oQ6JVP9A5+GYsxLBcIK45hD9H4UPS9aP g==; X-IronPort-AV: E=Sophos;i="5.97,304,1669071600"; d="scan'208";a="29147775" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 17 Feb 2023 09:09:10 +0100 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Fri, 17 Feb 2023 09:09:10 +0100 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Fri, 17 Feb 2023 09:09:10 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1676621350; x=1708157350; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=C4LlNQesVn7hKoWLdoFsmmchC0zOflI6zSTV9xpIKZk=; b=k8pujjmm4MnBKYb0h4f2k233qdOqQ290tsHMW31FdqMdvWEcsIa1NsDl D+UP65xmV4NcH5b1Awv0kbksbV1WLxG1wcniWJk2/Umf1zu1YHnmOxAW2 jaq8MD50yUfTFoNVVRNEvO6BmRaGqPvBX2aevqhbIYDecjIMGvKa43FNq ot5wu+wNOQzdy5MU6jIJxtlkWT7c8934+Q1m4wE8bPS53wcLq8Vcbbupj reiHBk+tKH96nW7QKchJW/1eeL0AJ/uaImHUTxW1zw4tHCGVJzrp8rr0x SCnOQcbhfO8ZCXTrUikpGZbNSXdSGOe0sNXpWhnc7GdBau0TO6BSk1R1A g==; X-IronPort-AV: E=Sophos;i="5.97,304,1669071600"; d="scan'208";a="29147774" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 17 Feb 2023 09:09:10 +0100 Received: from steina-w.localnet (unknown [10.123.53.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 762D0280056; Fri, 17 Feb 2023 09:09:09 +0100 (CET) From: Alexander Stein To: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Liu Ying Cc: marex@denx.de, stefan@agner.ch, airlied@gmail.com, daniel@ffwll.ch, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, krzysztof.kozlowski@linaro.org, LW@karo-electronics.de Subject: Re: [PATCH v4 3/6] drm: lcdif: Determine bus format and flags in ->atomic_check() Date: Fri, 17 Feb 2023 09:09:07 +0100 Message-ID: <5651056.DvuYhMxLoT@steina-w> Organization: TQ-Systems GmbH In-Reply-To: <20230217065407.2259731-4-victor.liu@nxp.com> References: <20230217065407.2259731-1-victor.liu@nxp.com> <20230217065407.2259731-4-victor.liu@nxp.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230217_000918_261048_F8148D02 X-CRM114-Status: GOOD ( 29.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Liu, thanks for the update. Am Freitag, 17. Februar 2023, 07:54:04 CET schrieb Liu Ying: > Instead of determining LCDIF output bus format and bus flags in > ->atomic_enable(), do that in ->atomic_check(). This is a > preparation for the upcoming patch to check consistent bus format > and bus flags across all first downstream bridges in ->atomic_check(). > New lcdif_crtc_state structure is introduced to cache bus format > and bus flags states in ->atomic_check() so that they can be read > in ->atomic_enable(). > = > Signed-off-by: Liu Ying Look good to me. Reviewed-by: Alexander Stein > --- > v3->v4: > * Use 'new_{c,p}state' instead of 'new_{crtc,plane}_state'. (Alexander) > * Simplify lcdif_crtc_reset() by calling lcdif_crtc_atomic_destroy_state(= ). > (Alexander) > * Add '!crtc->state' check in lcdif_crtc_atomic_duplicate_state(). > (Alexander) > = > v2->v3: > * No change. > = > v1->v2: > * Split from patch 2/2 in v1. (Marek, Alexander) > * Add comment on the 'base' member of lcdif_crtc_state structure to > note it should always be the first member. (Lothar) > = > drivers/gpu/drm/mxsfb/lcdif_kms.c | 134 ++++++++++++++++++++++-------- > 1 file changed, 99 insertions(+), 35 deletions(-) > = > diff --git a/drivers/gpu/drm/mxsfb/lcdif_kms.c > b/drivers/gpu/drm/mxsfb/lcdif_kms.c index e54200a9fcb9..d46de433cd8e 1006= 44 > --- a/drivers/gpu/drm/mxsfb/lcdif_kms.c > +++ b/drivers/gpu/drm/mxsfb/lcdif_kms.c > @@ -30,6 +30,18 @@ > #include "lcdif_drv.h" > #include "lcdif_regs.h" > = > +struct lcdif_crtc_state { > + struct drm_crtc_state base; /* always be the first = member */ > + u32 bus_format; > + u32 bus_flags; > +}; > + > +static inline struct lcdif_crtc_state * > +to_lcdif_crtc_state(struct drm_crtc_state *s) > +{ > + return container_of(s, struct lcdif_crtc_state, base); > +} > + > /* > -------------------------------------------------------------------------= -- > -- * CRTC > */ > @@ -385,48 +397,72 @@ static void lcdif_reset_block(struct lcdif_drm_priv= ate > *lcdif) readl(lcdif->base + LCDC_V8_CTRL); > } > = > -static void lcdif_crtc_mode_set_nofb(struct lcdif_drm_private *lcdif, > - struct drm_plane_state = *plane_state, > - struct drm_bridge_state = *bridge_state, > - const u32 bus_format) > +static void lcdif_crtc_mode_set_nofb(struct drm_crtc_state *crtc_state, > + struct drm_plane_state = *plane_state) > { > - struct drm_device *drm =3D lcdif->crtc.dev; > - struct drm_display_mode *m =3D &lcdif->crtc.state->adjusted_mode; > - u32 bus_flags =3D 0; > - > - if (lcdif->bridge->timings) > - bus_flags =3D lcdif->bridge->timings->input_bus_flags; > - else if (bridge_state) > - bus_flags =3D bridge_state->input_bus_cfg.flags; > + struct lcdif_crtc_state *lcdif_crtc_state =3D > to_lcdif_crtc_state(crtc_state); + struct drm_device *drm =3D > crtc_state->crtc->dev; > + struct lcdif_drm_private *lcdif =3D to_lcdif_drm_private(drm); > + struct drm_display_mode *m =3D &crtc_state->adjusted_mode; > = > DRM_DEV_DEBUG_DRIVER(drm->dev, "Pixel clock: %dkHz (actual: %dkHz) \n", > m->crtc_clock, > (int)(clk_get_rate(lcdif->clk) / 1000)); > DRM_DEV_DEBUG_DRIVER(drm->dev, "Bridge bus_flags: 0x%08X\n", > - bus_flags); > + lcdif_crtc_state->bus_flags); > DRM_DEV_DEBUG_DRIVER(drm->dev, "Mode flags: 0x%08X\n", m->flags); > = > /* Mandatory eLCDIF reset as per the Reference Manual */ > lcdif_reset_block(lcdif); > = > - lcdif_set_formats(lcdif, plane_state, bus_format); > + lcdif_set_formats(lcdif, plane_state, lcdif_crtc_state->bus_format); > = > - lcdif_set_mode(lcdif, bus_flags); > + lcdif_set_mode(lcdif, lcdif_crtc_state->bus_flags); > } > = > static int lcdif_crtc_atomic_check(struct drm_crtc *crtc, > struct drm_atomic_state *state) > { > + struct drm_device *drm =3D crtc->dev; > + struct lcdif_drm_private *lcdif =3D to_lcdif_drm_private(drm); > struct drm_crtc_state *crtc_state =3D = drm_atomic_get_new_crtc_state(state, > = crtc); > + struct lcdif_crtc_state *lcdif_crtc_state =3D > to_lcdif_crtc_state(crtc_state); bool has_primary =3D crtc_state->plane_m= ask > & > drm_plane_mask(crtc->primary); > + struct drm_bridge_state *bridge_state; > + struct drm_bridge *bridge =3D lcdif->bridge; > + int ret; > = > /* The primary plane has to be enabled when the CRTC is active. */ > if (crtc_state->active && !has_primary) > return -EINVAL; > = > - return drm_atomic_add_affected_planes(state, crtc); > + ret =3D drm_atomic_add_affected_planes(state, crtc); > + if (ret) > + return ret; > + > + bridge_state =3D drm_atomic_get_new_bridge_state(state, bridge); > + if (!bridge_state) > + lcdif_crtc_state->bus_format =3D MEDIA_BUS_FMT_FIXED; > + else > + lcdif_crtc_state->bus_format =3D bridge_state- >input_bus_cfg.format; > + > + if (lcdif_crtc_state->bus_format =3D=3D MEDIA_BUS_FMT_FIXED) { > + dev_warn_once(drm->dev, > + "Bridge does not provide bus format, = assuming > MEDIA_BUS_FMT_RGB888_1X24.\n" + "Please fix = bridge driver by > handling atomic_get_input_bus_fmts.\n"); + lcdif_crtc_state- >bus_format =3D > MEDIA_BUS_FMT_RGB888_1X24; > + } > + > + if (bridge->timings) > + lcdif_crtc_state->bus_flags =3D bridge->timings- >input_bus_flags; > + else if (bridge_state) > + lcdif_crtc_state->bus_flags =3D bridge_state- >input_bus_cfg.flags; > + else > + lcdif_crtc_state->bus_flags =3D 0; > + > + return 0; > } > = > static void lcdif_crtc_atomic_flush(struct drm_crtc *crtc, > @@ -458,32 +494,18 @@ static void lcdif_crtc_atomic_enable(struct drm_crtc > *crtc, struct drm_atomic_state *state) > { > struct lcdif_drm_private *lcdif =3D to_lcdif_drm_private(crtc->dev); > + struct drm_crtc_state *new_cstate =3D = drm_atomic_get_new_crtc_state(state, > crtc); struct drm_plane_state *new_pstate =3D > drm_atomic_get_new_plane_state(state, crtc->primary); > struct drm_display_mode *m =3D &lcdif->crtc.state->adjusted_mode; > - struct drm_bridge_state *bridge_state =3D NULL; > struct drm_device *drm =3D lcdif->drm; > - u32 bus_format; > dma_addr_t paddr; > = > - bridge_state =3D drm_atomic_get_new_bridge_state(state, lcdif- >bridge); > - if (!bridge_state) > - bus_format =3D MEDIA_BUS_FMT_FIXED; > - else > - bus_format =3D bridge_state->input_bus_cfg.format; > - > - if (bus_format =3D=3D MEDIA_BUS_FMT_FIXED) { > - dev_warn_once(drm->dev, > - "Bridge does not provide bus format, = assuming > MEDIA_BUS_FMT_RGB888_1X24.\n" - "Please fix = bridge driver by > handling atomic_get_input_bus_fmts.\n"); - bus_format =3D > MEDIA_BUS_FMT_RGB888_1X24; > - } > - > clk_set_rate(lcdif->clk, m->crtc_clock * 1000); > = > pm_runtime_get_sync(drm->dev); > = > - lcdif_crtc_mode_set_nofb(lcdif, new_pstate, bridge_state, = bus_format); > + lcdif_crtc_mode_set_nofb(new_cstate, new_pstate); > = > /* Write cur_buf as well to avoid an initial corrupt frame */ > paddr =3D drm_fb_dma_get_gem_addr(new_pstate->fb, new_pstate, 0); > @@ -520,6 +542,48 @@ static void lcdif_crtc_atomic_disable(struct drm_crtc > *crtc, pm_runtime_put_sync(drm->dev); > } > = > +static void lcdif_crtc_atomic_destroy_state(struct drm_crtc *crtc, > + struct drm_crtc_state = *state) > +{ > + __drm_atomic_helper_crtc_destroy_state(state); > + kfree(to_lcdif_crtc_state(state)); > +} > + > +static void lcdif_crtc_reset(struct drm_crtc *crtc) > +{ > + struct lcdif_crtc_state *state; > + > + if (crtc->state) > + lcdif_crtc_atomic_destroy_state(crtc, crtc->state); > + > + crtc->state =3D NULL; > + > + state =3D kzalloc(sizeof(*state), GFP_KERNEL); > + if (state) > + __drm_atomic_helper_crtc_reset(crtc, &state->base); > +} > + > +static struct drm_crtc_state * > +lcdif_crtc_atomic_duplicate_state(struct drm_crtc *crtc) > +{ > + struct lcdif_crtc_state *old =3D to_lcdif_crtc_state(crtc->state); > + struct lcdif_crtc_state *new; > + > + if (WARN_ON(!crtc->state)) > + return NULL; > + > + new =3D kzalloc(sizeof(*new), GFP_KERNEL); > + if (!new) > + return NULL; > + > + __drm_atomic_helper_crtc_duplicate_state(crtc, &new->base); > + > + new->bus_format =3D old->bus_format; > + new->bus_flags =3D old->bus_flags; > + > + return &new->base; > +} > + > static int lcdif_crtc_enable_vblank(struct drm_crtc *crtc) > { > struct lcdif_drm_private *lcdif =3D to_lcdif_drm_private(crtc->dev); > @@ -548,12 +612,12 @@ static const struct drm_crtc_helper_funcs > lcdif_crtc_helper_funcs =3D { }; > = > static const struct drm_crtc_funcs lcdif_crtc_funcs =3D { > - .reset =3D drm_atomic_helper_crtc_reset, > + .reset =3D lcdif_crtc_reset, > .destroy =3D drm_crtc_cleanup, > .set_config =3D drm_atomic_helper_set_config, > .page_flip =3D drm_atomic_helper_page_flip, > - .atomic_duplicate_state =3D drm_atomic_helper_crtc_duplicate_state, > - .atomic_destroy_state =3D drm_atomic_helper_crtc_destroy_state, > + .atomic_duplicate_state =3D lcdif_crtc_atomic_duplicate_state, > + .atomic_destroy_state =3D lcdif_crtc_atomic_destroy_state, > .enable_vblank =3D lcdif_crtc_enable_vblank, > .disable_vblank =3D lcdif_crtc_disable_vblank, > }; -- = TQ-Systems GmbH | M=FChlstra=DFe 2, Gut Delling | 82229 Seefeld, Germany Amtsgericht M=FCnchen, HRB 105018 Gesch=E4ftsf=FChrer: Detlef Schneider, R=FCdiger Stahl, Stefan Schneider http://www.tq-group.com/ _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel