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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 E88ABC433DB for ; Mon, 1 Mar 2021 10:58:10 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 5ADA764EBA for ; Mon, 1 Mar 2021 10:58:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5ADA764EBA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=LkBwxDD/7sbOJgPMNUoIGvIQ+vOyRbV1IOqSEJrkd1M=; b=BJveON1qIH+jBwl0y59EQ59B0 sXc76ibhgTq/h21gqGg+4OzjQpROe6YzKgt/QocMY/+2Yh2wXhFpBcmbVZ6x7owYnrTE9Y6EBlPph QbELEVn4i9FmItA1HBQbYYb5ZUtrZx3kDESTEBQPbRpvU4+NILnOa2zMsIN/EAKtuD48uD0zwRm60 yJmzT4uZDWJ7qpcbAerP5Bt4pZrJqd8xfBbrJ8nDMutlkPsXLWGMLhvAkSiySGRKCr9+4q1wSMDyQ Yl0RNZ0K1xtVlftaf+nEK4qSJoYQfClKl84Stk5/1ROnoVv2WduGjpv99i+gR9SoGmkKBSKU7DEhn bjmUkTKZg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lGgED-0004bp-7R; Mon, 01 Mar 2021 10:56:41 +0000 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lGgE8-0004Zv-Cx for linux-arm-kernel@lists.infradead.org; Mon, 01 Mar 2021 10:56:38 +0000 Received: by mail-pg1-x52f.google.com with SMTP id b21so11297746pgk.7 for ; Mon, 01 Mar 2021 02:56:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Jw5LmImUC8l7Txkrx1wM5OJqIUErbDAc54T7jV46YDo=; b=EhET5O7M1vC4O/GZEvdmzNustrnONPWEDVZTDGDxUb49IBJX2smYdiCrBOXOIVlXE/ +O80+81e3/un1FTIv7u3qyP9n/v2MRMdijIRH1Zb/s/OhxTXSKSk6bi1Kbp386+BpMGW BuF/yDOhFSiYAgwPAAYIu/en3OVfTKtMplmv7418FC3IxkPYkJyMOdvfncESHtAcagQO dks9FaMN654mX+7wS7n/d8kqfR2ir/6pO+m3Sk28WF56AG4wVPH/ujdQblf7Hp+GEDVz JV5ZDOhKvVF7dN7GgK5hl716gf6L5ZpS6tp1pKK6fNMsjfwB8RLfWlJHZfDTlU7oIZ5N Ikfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Jw5LmImUC8l7Txkrx1wM5OJqIUErbDAc54T7jV46YDo=; b=TevIvKA71XfA0yDYC2gSwM29pwM4q1W+PLewiTzFAVH7CG3gMjOAWjzzoyx/4pGZNJ Dh+9uoAh7ynId/B2X3m5kCuN5oEAw9R0l0hPa/6gAL3pKc/XM/7YiFD1485Enjoxpxoc FQany5MtN6pN037IN393dnRDyljRQ6g0f0jseQQOYuASb6BuhgWb1qbFMvgUaKmDu8zv FFIan3P6vhHg2nyFdQCMMTdU2m7Vf5IJIHjykainb25kMDY/w/bPREWCHcbje7GV1lpE Ke2M0S2+oQVuqIq4A78fdLwuw52mwY8HaqqBUm6FKlETYLLwDQinC5D/6hcJmUCcnwgI QU5g== X-Gm-Message-State: AOAM530CFoZX9szKHCA7rc7FzirC7FPsMTsEQSKyTzhG++HzVr6vLgB/ PBoLPPum8rLcYofy5yytboD/xC3YextUyUKHSw6foQ== X-Google-Smtp-Source: ABdhPJyXX60+I9RVTTic6sWZfWka7K7/olkMuWP6hpsLjFNKYwN/8Jugmdo/WYo1OQv8LVbGBa9bNHBlh75gT++hdK8= X-Received: by 2002:a63:ee4b:: with SMTP id n11mr13443164pgk.265.1614596191331; Mon, 01 Mar 2021 02:56:31 -0800 (PST) MIME-Version: 1.0 References: <1613619715-28785-1-git-send-email-victor.liu@nxp.com> <1613619715-28785-6-git-send-email-victor.liu@nxp.com> <1ea2261315c8e744ca60a66403c78a3c551d04fe.camel@nxp.com> In-Reply-To: <1ea2261315c8e744ca60a66403c78a3c551d04fe.camel@nxp.com> From: Robert Foss Date: Mon, 1 Mar 2021 11:56:19 +0100 Message-ID: Subject: Re: [PATCH v4 05/14] drm/bridge: imx: Add i.MX8qm/qxp pixel combiner support To: Liu Ying X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210301_055636_477172_4066B586 X-CRM114-Status: GOOD ( 42.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Jernej Skrabec , Laurent Pinchart , kernel@pengutronix.de, Neil Armstrong , David Airlie , Fabio Estevam , s.hauer@pengutronix.de, Jonas Karlman , linux-kernel , dri-devel , kishon@ti.com, Andrzej Hajda , Vinod Koul , Rob Herring , linux-imx@nxp.com, Daniel Vetter , Mauro Carvalho Chehab , shawnguo@kernel.org, "moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE" , linux-media Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, 1 Mar 2021 at 10:07, Liu Ying wrote: > > Hi Robert, > > On Fri, 2021-02-26 at 14:07 +0100, Robert Foss wrote: > > Hey Liu, > > > > With the below nit straightened out, feel free to add my r-b. > > > > Reviewed-by: Robert Foss > > Thanks for reviewing this patch. > > > > > On Thu, 18 Feb 2021 at 04:58, Liu Ying wrote: > > > This patch adds a drm bridge driver for i.MX8qm/qxp pixel combiner. > > > The pixel combiner takes two output streams from a single display > > > controller and manipulates the two streams to support a number > > > of modes(bypass, pixel combine, YUV444 to YUV422, split_RGB) configured > > > as either one screen, two screens, or virtual screens. The pixel > > > combiner is also responsible for generating some of the control signals > > > for the pixel link output channel. For now, the driver only supports > > > the bypass mode. > > > > > > Signed-off-by: Liu Ying > > > --- > > > v3->v4: > > > * No change. > > > > > > v2->v3: > > > * No change. > > > > > > v1->v2: > > > * No change. > > > > > > drivers/gpu/drm/bridge/Kconfig | 2 + > > > drivers/gpu/drm/bridge/Makefile | 1 + > > > drivers/gpu/drm/bridge/imx/Kconfig | 8 + > > > drivers/gpu/drm/bridge/imx/Makefile | 1 + > > > .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 452 +++++++++++++++++++++ > > > 5 files changed, 464 insertions(+) > > > create mode 100644 drivers/gpu/drm/bridge/imx/Kconfig > > > create mode 100644 drivers/gpu/drm/bridge/imx/Makefile > > > create mode 100644 drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c > > > > > > diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig > > > index e4110d6c..84944e0 100644 > > > --- a/drivers/gpu/drm/bridge/Kconfig > > > +++ b/drivers/gpu/drm/bridge/Kconfig > > > @@ -256,6 +256,8 @@ source "drivers/gpu/drm/bridge/adv7511/Kconfig" > > > > > > source "drivers/gpu/drm/bridge/cadence/Kconfig" > > > > > > +source "drivers/gpu/drm/bridge/imx/Kconfig" > > > + > > > source "drivers/gpu/drm/bridge/synopsys/Kconfig" > > > > > > endmenu > > > diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile > > > index 86e7acc..bc80cae 100644 > > > --- a/drivers/gpu/drm/bridge/Makefile > > > +++ b/drivers/gpu/drm/bridge/Makefile > > > @@ -27,4 +27,5 @@ obj-$(CONFIG_DRM_NWL_MIPI_DSI) += nwl-dsi.o > > > > > > obj-y += analogix/ > > > obj-y += cadence/ > > > +obj-y += imx/ > > > obj-y += synopsys/ > > > diff --git a/drivers/gpu/drm/bridge/imx/Kconfig b/drivers/gpu/drm/bridge/imx/Kconfig > > > new file mode 100644 > > > index 00000000..f1c91b6 > > > --- /dev/null > > > +++ b/drivers/gpu/drm/bridge/imx/Kconfig > > > @@ -0,0 +1,8 @@ > > > +config DRM_IMX8QXP_PIXEL_COMBINER > > > + tristate "Freescale i.MX8QM/QXP pixel combiner" > > > + depends on OF > > > + depends on COMMON_CLK > > > + select DRM_KMS_HELPER > > > + help > > > + Choose this to enable pixel combiner found in > > > + Freescale i.MX8qm/qxp processors. > > > diff --git a/drivers/gpu/drm/bridge/imx/Makefile b/drivers/gpu/drm/bridge/imx/Makefile > > > new file mode 100644 > > > index 00000000..7d7c8d6 > > > --- /dev/null > > > +++ b/drivers/gpu/drm/bridge/imx/Makefile > > > @@ -0,0 +1 @@ > > > +obj-$(CONFIG_DRM_IMX8QXP_PIXEL_COMBINER) += imx8qxp-pixel-combiner.o > > > diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c > > > new file mode 100644 > > > index 00000000..cd5b1be > > > --- /dev/null > > > +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c > > > @@ -0,0 +1,452 @@ > > > +// SPDX-License-Identifier: GPL-2.0+ > > > + > > > +/* > > > + * Copyright 2020 NXP > > > + */ > > > + > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > +#include > > > + > > > +#include > > > +#include > > > +#include > > > + > > > +#define PC_CTRL_REG 0x0 > > > +#define PC_COMBINE_ENABLE BIT(0) > > > +#define PC_DISP_BYPASS(n) BIT(1 + 21 * (n)) > > > +#define PC_DISP_HSYNC_POLARITY(n) BIT(2 + 11 * (n)) > > > +#define PC_DISP_HSYNC_POLARITY_POS(n) DISP_HSYNC_POLARITY(n) > > > +#define PC_DISP_VSYNC_POLARITY(n) BIT(3 + 11 * (n)) > > > +#define PC_DISP_VSYNC_POLARITY_POS(n) DISP_VSYNC_POLARITY(n) > > > +#define PC_DISP_DVALID_POLARITY(n) BIT(4 + 11 * (n)) > > > +#define PC_DISP_DVALID_POLARITY_POS(n) DISP_DVALID_POLARITY(n) > > > +#define PC_VSYNC_MASK_ENABLE BIT(5) > > > +#define PC_SKIP_MODE BIT(6) > > > +#define PC_SKIP_NUMBER_MASK GENMASK(12, 7) > > > +#define PC_SKIP_NUMBER(n) FIELD_PREP(PC_SKIP_NUMBER_MASK, (n)) > > > +#define PC_DISP0_PIX_DATA_FORMAT_MASK GENMASK(18, 16) > > > +#define PC_DISP0_PIX_DATA_FORMAT(fmt) \ > > > + FIELD_PREP(PC_DISP0_PIX_DATA_FORMAT_MASK, (fmt)) > > > +#define PC_DISP1_PIX_DATA_FORMAT_MASK GENMASK(21, 19) > > > +#define PC_DISP1_PIX_DATA_FORMAT(fmt) \ > > > + FIELD_PREP(PC_DISP1_PIX_DATA_FORMAT_MASK, (fmt)) > > > + > > > +#define PC_BUF_PARA_REG 0x10 > > > > This register is unused, keeping it in here to avoid future headaches > > seems like a good idea. > > Yes, for now, this register is unused. > It will be used to set the below PC_BUF_ACTIVE_DEPTH field when > non-bypass modes are enabled, I think. > > Though you said 'keeping it', you actually want me to drop it for now, > right? If there is a 2nd series coming which will enable non-bypass modes, then maybe add it in that series instead. > > > > > > +#define PC_BUF_ACTIVE_DEPTH_MASK GENMASK(10, 0) > > > +#define PC_BUF_ACTIVE_DEPTH(n) FIELD_PREP(PC_BUF_ACTIVE_DEPTH_MASK, (n)) > > > + > > > +#define PC_SW_RESET_REG 0x20 > > > +#define PC_SW_RESET_N BIT(0) > > > +#define PC_DISP_SW_RESET_N(n) BIT(1 + (n)) > > > +#define PC_FULL_RESET_N (PC_SW_RESET_N | \ > > > + PC_DISP_SW_RESET_N(0) | \ > > > + PC_DISP_SW_RESET_N(1)) > > > + > > > +#define PC_REG_SET 0x4 > > > +#define PC_REG_CLR 0x8 > > > + > > > +#define DRIVER_NAME "imx8qxp-pixel-combiner" > > > + > > > +enum imx8qxp_pc_pix_data_format { > > > + RGB, > > > + YUV444, > > > + YUV422, > > > + SPLIT_RGB, > > > > YUV444, YUV422 & SPLIT_RGB are also unused, but if their values are > > compatible with the PC_DISP0_PIX_DATA_FORMAT macro I think keeping > > them around for future reference is a good idea. > > Yes, YUV444, YUV422 & SPLIT_RGB are compatible with the > PC_DISP{0, 1}_PIX_DATA_FORMAT macros, so I'll keep them here. > > Regards, > Liu Ying > > > > > > +}; > > > + > > > +struct imx8qxp_pc_channel { > > > + struct drm_bridge bridge; > > > + struct drm_bridge *next_bridge; > > > + struct imx8qxp_pc *pc; > > > + unsigned int stream_id; > > > + bool is_available; > > > +}; > > > + > > > +struct imx8qxp_pc { > > > + struct device *dev; > > > + struct imx8qxp_pc_channel ch[2]; > > > + struct clk *clk_apb; > > > + void __iomem *base; > > > +}; > > > + > > > +static inline u32 imx8qxp_pc_read(struct imx8qxp_pc *pc, unsigned int offset) > > > +{ > > > + return readl(pc->base + offset); > > > +} > > > + > > > +static inline void > > > +imx8qxp_pc_write(struct imx8qxp_pc *pc, unsigned int offset, u32 value) > > > +{ > > > + writel(value, pc->base + offset); > > > +} > > > + > > > +static inline void > > > +imx8qxp_pc_write_set(struct imx8qxp_pc *pc, unsigned int offset, u32 value) > > > +{ > > > + imx8qxp_pc_write(pc, offset + PC_REG_SET, value); > > > +} > > > + > > > +static inline void > > > +imx8qxp_pc_write_clr(struct imx8qxp_pc *pc, unsigned int offset, u32 value) > > > +{ > > > + imx8qxp_pc_write(pc, offset + PC_REG_CLR, value); > > > +} > > > + > > > +static enum drm_mode_status > > > +imx8qxp_pc_bridge_mode_valid(struct drm_bridge *bridge, > > > + const struct drm_display_info *info, > > > + const struct drm_display_mode *mode) > > > +{ > > > + if (mode->hdisplay > 2560) > > > + return MODE_BAD_HVALUE; > > > + > > > + return MODE_OK; > > > +} > > > + > > > +static int imx8qxp_pc_bridge_attach(struct drm_bridge *bridge, > > > + enum drm_bridge_attach_flags flags) > > > +{ > > > + struct imx8qxp_pc_channel *ch = bridge->driver_private; > > > + struct imx8qxp_pc *pc = ch->pc; > > > + > > > + if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) { > > > + DRM_DEV_ERROR(pc->dev, > > > + "do not support creating a drm_connector\n"); > > > + return -EINVAL; > > > + } > > > + > > > + if (!bridge->encoder) { > > > + DRM_DEV_ERROR(pc->dev, "missing encoder\n"); > > > + return -ENODEV; > > > + } > > > + > > > + return drm_bridge_attach(bridge->encoder, > > > + ch->next_bridge, bridge, > > > + DRM_BRIDGE_ATTACH_NO_CONNECTOR); > > > +} > > > + > > > +static void > > > +imx8qxp_pc_bridge_mode_set(struct drm_bridge *bridge, > > > + const struct drm_display_mode *mode, > > > + const struct drm_display_mode *adjusted_mode) > > > +{ > > > + struct imx8qxp_pc_channel *ch = bridge->driver_private; > > > + struct imx8qxp_pc *pc = ch->pc; > > > + u32 val; > > > + int ret; > > > + > > > + ret = pm_runtime_get_sync(pc->dev); > > > + if (ret < 0) > > > + DRM_DEV_ERROR(pc->dev, > > > + "failed to get runtime PM sync: %d\n", ret); > > > + > > > + ret = clk_prepare_enable(pc->clk_apb); > > > + if (ret) > > > + DRM_DEV_ERROR(pc->dev, "%s: failed to enable apb clock: %d\n", > > > + __func__, ret); > > > + > > > + /* HSYNC to pixel link is active low. */ > > > + imx8qxp_pc_write_clr(pc, PC_CTRL_REG, > > > + PC_DISP_HSYNC_POLARITY(ch->stream_id)); > > > + > > > + /* VSYNC to pixel link is active low. */ > > > + imx8qxp_pc_write_clr(pc, PC_CTRL_REG, > > > + PC_DISP_VSYNC_POLARITY(ch->stream_id)); > > > + > > > + /* Data enable to pixel link is active high. */ > > > + imx8qxp_pc_write_set(pc, PC_CTRL_REG, > > > + PC_DISP_DVALID_POLARITY(ch->stream_id)); > > > + > > > + /* Mask the first frame output which may be incomplete. */ > > > + imx8qxp_pc_write_set(pc, PC_CTRL_REG, PC_VSYNC_MASK_ENABLE); > > > + > > > + /* Only support RGB currently. */ > > > + val = imx8qxp_pc_read(pc, PC_CTRL_REG); > > > + if (ch->stream_id == 0) { > > > + val &= ~PC_DISP0_PIX_DATA_FORMAT_MASK; > > > + val |= PC_DISP0_PIX_DATA_FORMAT(RGB); > > > + } else { > > > + val &= ~PC_DISP1_PIX_DATA_FORMAT_MASK; > > > + val |= PC_DISP1_PIX_DATA_FORMAT(RGB); > > > + } > > > + imx8qxp_pc_write(pc, PC_CTRL_REG, val); > > > + > > > + /* Only support bypass mode currently. */ > > > + imx8qxp_pc_write_set(pc, PC_CTRL_REG, PC_DISP_BYPASS(ch->stream_id)); > > > + > > > + clk_disable_unprepare(pc->clk_apb); > > > +} > > > + > > > +static void imx8qxp_pc_bridge_atomic_disable(struct drm_bridge *bridge, > > > + struct drm_bridge_state *old_bridge_state) > > > +{ > > > + struct imx8qxp_pc_channel *ch = bridge->driver_private; > > > + struct imx8qxp_pc *pc = ch->pc; > > > + int ret; > > > + > > > + ret = pm_runtime_put(pc->dev); > > > + if (ret < 0) > > > + DRM_DEV_ERROR(pc->dev, "failed to put runtime PM: %d\n", ret); > > > +} > > > + > > > +static const u32 imx8qxp_pc_bus_output_fmts[] = { > > > + MEDIA_BUS_FMT_RGB888_1X36_CPADLO, > > > + MEDIA_BUS_FMT_RGB666_1X36_CPADLO, > > > +}; > > > + > > > +static bool imx8qxp_pc_bus_output_fmt_supported(u32 fmt) > > > +{ > > > + int i; > > > + > > > + for (i = 0; i < ARRAY_SIZE(imx8qxp_pc_bus_output_fmts); i++) { > > > + if (imx8qxp_pc_bus_output_fmts[i] == fmt) > > > + return true; > > > + } > > > + > > > + return false; > > > +} > > > + > > > +static u32 * > > > +imx8qxp_pc_bridge_atomic_get_input_bus_fmts(struct drm_bridge *bridge, > > > + struct drm_bridge_state *bridge_state, > > > + struct drm_crtc_state *crtc_state, > > > + struct drm_connector_state *conn_state, > > > + u32 output_fmt, > > > + unsigned int *num_input_fmts) > > > +{ > > > + u32 *input_fmts; > > > + > > > + if (!imx8qxp_pc_bus_output_fmt_supported(output_fmt)) > > > + return NULL; > > > + > > > + *num_input_fmts = 1; > > > + > > > + input_fmts = kmalloc(sizeof(*input_fmts), GFP_KERNEL); > > > + if (!input_fmts) > > > + return NULL; > > > + > > > + switch (output_fmt) { > > > + case MEDIA_BUS_FMT_RGB888_1X36_CPADLO: > > > + input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X30_CPADLO; > > > + break; > > > + case MEDIA_BUS_FMT_RGB666_1X36_CPADLO: > > > + input_fmts[0] = MEDIA_BUS_FMT_RGB666_1X30_CPADLO; > > > + break; > > > + default: > > > + kfree(input_fmts); > > > + input_fmts = NULL; > > > + break; > > > + } > > > + > > > + return input_fmts; > > > +} > > > + > > > +static u32 * > > > +imx8qxp_pc_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge, > > > + struct drm_bridge_state *bridge_state, > > > + struct drm_crtc_state *crtc_state, > > > + struct drm_connector_state *conn_state, > > > + unsigned int *num_output_fmts) > > > +{ > > > + *num_output_fmts = ARRAY_SIZE(imx8qxp_pc_bus_output_fmts); > > > + return kmemdup(imx8qxp_pc_bus_output_fmts, > > > + sizeof(imx8qxp_pc_bus_output_fmts), GFP_KERNEL); > > > +} > > > + > > > +static const struct drm_bridge_funcs imx8qxp_pc_bridge_funcs = { > > > + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, > > > + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, > > > + .atomic_reset = drm_atomic_helper_bridge_reset, > > > + .mode_valid = imx8qxp_pc_bridge_mode_valid, > > > + .attach = imx8qxp_pc_bridge_attach, > > > + .mode_set = imx8qxp_pc_bridge_mode_set, > > > + .atomic_disable = imx8qxp_pc_bridge_atomic_disable, > > > + .atomic_get_input_bus_fmts = > > > + imx8qxp_pc_bridge_atomic_get_input_bus_fmts, > > > + .atomic_get_output_bus_fmts = > > > + imx8qxp_pc_bridge_atomic_get_output_bus_fmts, > > > +}; > > > + > > > +static int imx8qxp_pc_bridge_probe(struct platform_device *pdev) > > > +{ > > > + struct imx8qxp_pc *pc; > > > + struct imx8qxp_pc_channel *ch; > > > + struct device *dev = &pdev->dev; > > > + struct device_node *np = dev->of_node; > > > + struct device_node *child, *remote; > > > + u32 i; > > > + int ret; > > > + > > > + pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL); > > > + if (!pc) > > > + return -ENOMEM; > > > + > > > + pc->base = devm_platform_ioremap_resource(pdev, 0); > > > + if (IS_ERR(pc->base)) > > > + return PTR_ERR(pc->base); > > > + > > > + pc->dev = dev; > > > + > > > + pc->clk_apb = devm_clk_get(dev, "apb"); > > > + if (IS_ERR(pc->clk_apb)) { > > > + ret = PTR_ERR(pc->clk_apb); > > > + if (ret != -EPROBE_DEFER) > > > + DRM_DEV_ERROR(dev, "failed to get apb clock: %d\n", > > > + ret); > > > + return ret; > > > + } > > > + > > > + platform_set_drvdata(pdev, pc); > > > + pm_runtime_enable(dev); > > > + > > > + for_each_available_child_of_node(np, child) { > > > + ret = of_property_read_u32(child, "reg", &i); > > > + if (ret || i > 1) { > > > + ret = -EINVAL; > > > + DRM_DEV_ERROR(dev, > > > + "invalid channel(%u) node address\n", i); > > > + goto free_child; > > > + } > > > + > > > + ch = &pc->ch[i]; > > > + ch->pc = pc; > > > + ch->stream_id = i; > > > + > > > + remote = of_graph_get_remote_node(child, 1, 0); > > > + if (!remote) { > > > + ret = -ENODEV; > > > + DRM_DEV_ERROR(dev, > > > + "channel%u failed to get port1's remote node: %d\n", > > > + i, ret); > > > + goto free_child; > > > + } > > > + > > > + ch->next_bridge = of_drm_find_bridge(remote); > > > + if (!ch->next_bridge) { > > > + of_node_put(remote); > > > + ret = -EPROBE_DEFER; > > > + DRM_DEV_DEBUG_DRIVER(dev, > > > + "channel%u failed to find next bridge: %d\n", > > > + i, ret); > > > + goto free_child; > > > + } > > > + > > > + of_node_put(remote); > > > + > > > + ch->bridge.driver_private = ch; > > > + ch->bridge.funcs = &imx8qxp_pc_bridge_funcs; > > > + ch->bridge.of_node = child; > > > + ch->is_available = true; > > > + > > > + drm_bridge_add(&ch->bridge); > > > + } > > > + > > > + return 0; > > > + > > > +free_child: > > > + of_node_put(child); > > > + > > > + if (i == 1 && pc->ch[0].next_bridge) > > > + drm_bridge_remove(&pc->ch[0].bridge); > > > + > > > + pm_runtime_disable(dev); > > > + return ret; > > > +} > > > + > > > +static int imx8qxp_pc_bridge_remove(struct platform_device *pdev) > > > +{ > > > + struct imx8qxp_pc *pc = platform_get_drvdata(pdev); > > > + struct imx8qxp_pc_channel *ch; > > > + int i; > > > + > > > + for (i = 0; i < 2; i++) { > > > + ch = &pc->ch[i]; > > > + > > > + if (!ch->is_available) > > > + continue; > > > + > > > + drm_bridge_remove(&ch->bridge); > > > + ch->is_available = false; > > > + } > > > + > > > + pm_runtime_disable(&pdev->dev); > > > + > > > + return 0; > > > +} > > > + > > > +static int __maybe_unused imx8qxp_pc_runtime_suspend(struct device *dev) > > > +{ > > > + struct platform_device *pdev = to_platform_device(dev); > > > + struct imx8qxp_pc *pc = platform_get_drvdata(pdev); > > > + int ret; > > > + > > > + ret = clk_prepare_enable(pc->clk_apb); > > > + if (ret) > > > + DRM_DEV_ERROR(pc->dev, "%s: failed to enable apb clock: %d\n", > > > + __func__, ret); > > > + > > > + /* Disable pixel combiner by full reset. */ > > > + imx8qxp_pc_write_clr(pc, PC_SW_RESET_REG, PC_FULL_RESET_N); > > > + > > > + clk_disable_unprepare(pc->clk_apb); > > > + > > > + /* Ensure the reset takes effect. */ > > > + usleep_range(10, 20); > > > + > > > + return ret; > > > +} > > > + > > > +static int __maybe_unused imx8qxp_pc_runtime_resume(struct device *dev) > > > +{ > > > + struct platform_device *pdev = to_platform_device(dev); > > > + struct imx8qxp_pc *pc = platform_get_drvdata(pdev); > > > + int ret; > > > + > > > + ret = clk_prepare_enable(pc->clk_apb); > > > + if (ret) { > > > + DRM_DEV_ERROR(pc->dev, "%s: failed to enable apb clock: %d\n", > > > + __func__, ret); > > > + return ret; > > > + } > > > + > > > + /* out of reset */ > > > + imx8qxp_pc_write_set(pc, PC_SW_RESET_REG, PC_FULL_RESET_N); > > > + > > > + clk_disable_unprepare(pc->clk_apb); > > > + > > > + return ret; > > > +} > > > + > > > +static const struct dev_pm_ops imx8qxp_pc_pm_ops = { > > > + SET_RUNTIME_PM_OPS(imx8qxp_pc_runtime_suspend, > > > + imx8qxp_pc_runtime_resume, NULL) > > > +}; > > > + > > > +static const struct of_device_id imx8qxp_pc_dt_ids[] = { > > > + { .compatible = "fsl,imx8qm-pixel-combiner", }, > > > + { .compatible = "fsl,imx8qxp-pixel-combiner", }, > > > + { /* sentinel */ } > > > +}; > > > +MODULE_DEVICE_TABLE(of, imx8qxp_pc_dt_ids); > > > + > > > +static struct platform_driver imx8qxp_pc_bridge_driver = { > > > + .probe = imx8qxp_pc_bridge_probe, > > > + .remove = imx8qxp_pc_bridge_remove, > > > + .driver = { > > > + .pm = &imx8qxp_pc_pm_ops, > > > + .name = DRIVER_NAME, > > > + .of_match_table = imx8qxp_pc_dt_ids, > > > + }, > > > +}; > > > +module_platform_driver(imx8qxp_pc_bridge_driver); > > > + > > > +MODULE_DESCRIPTION("i.MX8QM/QXP pixel combiner bridge driver"); > > > +MODULE_AUTHOR("Liu Ying "); > > > +MODULE_LICENSE("GPL v2"); > > > +MODULE_ALIAS("platform:" DRIVER_NAME); > > > -- > > > 2.7.4 > > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel