From: Lucas Stach <l.stach@pengutronix.de>
To: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org,
patchwork-lst@pengutronix.de, Rob Herring <robh+dt@kernel.org>,
kernel@pengutronix.de
Subject: Re: [PATCH 3/9] gpu: ipu-v3: add driver for Prefetch Resolve Engine
Date: Fri, 03 Mar 2017 19:25:39 +0100 [thread overview]
Message-ID: <1488565539.11464.1.camel@pengutronix.de> (raw)
In-Reply-To: <1487604055.3878.25.camel@pengutronix.de>
Am Montag, den 20.02.2017, 16:20 +0100 schrieb Philipp Zabel:
> On Fri, 2017-02-17 at 19:28 +0100, Lucas Stach wrote:
> > This adds support for the i.MX6 QuadPlus PRE units. Currently only
> > linear prefetch into SRAM is supported, other modes of operation
> > like the tiled-to-linear conversion will be added later.
> >
> > Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> > ---
> > drivers/gpu/ipu-v3/Makefile | 2 +-
> > drivers/gpu/ipu-v3/ipu-pre.c | 290
> > +++++++++++++++++++++++++++++++++++++++++++
> > drivers/gpu/ipu-v3/ipu-prv.h | 11 ++
> > 3 files changed, 302 insertions(+), 1 deletion(-)
> > create mode 100644 drivers/gpu/ipu-v3/ipu-pre.c
> >
> > diff --git a/drivers/gpu/ipu-v3/Makefile b/drivers/gpu/ipu-
> > v3/Makefile
> > index 5f961416c4ee..8ae90de46b4d 100644
> > --- a/drivers/gpu/ipu-v3/Makefile
> > +++ b/drivers/gpu/ipu-v3/Makefile
> > @@ -2,4 +2,4 @@ obj-$(CONFIG_IMX_IPUV3_CORE) += imx-ipu-v3.o
> >
> > imx-ipu-v3-objs := ipu-common.o ipu-cpmem.o ipu-csi.o ipu-dc.o
> > ipu-di.o \
> > ipu-dp.o ipu-dmfc.o ipu-ic.o ipu-image-convert.o \
> > - ipu-smfc.o ipu-vdi.o
> > + ipu-pre.o ipu-smfc.o ipu-vdi.o
> > diff --git a/drivers/gpu/ipu-v3/ipu-pre.c b/drivers/gpu/ipu-v3/ipu-
> > pre.c
> > new file mode 100644
> > index 000000000000..febe0cb8b094
> > --- /dev/null
> > +++ b/drivers/gpu/ipu-v3/ipu-pre.c
> > @@ -0,0 +1,290 @@
> > +/*
> > + * Copyright (c) 2017 Lucas Stach, Pengutronix
> > + *
> > + * This program is free software; you can redistribute it and/or
> > modify it
> > + * under the terms and conditions of the GNU General Public
> > License,
> > + * version 2, as published by the Free Software Foundation.
> > + *
> > + * This program is distributed in the hope it will be useful, but
> > WITHOUT
> > + * ANY WARRANTY; without even the implied warranty of
> > MERCHANTABILITY or
> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
> > License for
> > + * more details.
> > + */
> > +
> > +#include <drm/drm_fourcc.h>
> > +#include <linux/clk.h>
> > +#include <linux/err.h>
> > +#include <linux/genalloc.h>
> > +#include <linux/module.h>
> > +#include <linux/of.h>
> > +#include <linux/platform_device.h>
> > +#include <video/imx-ipu-v3.h>
> > +
> > +#include "ipu-prv.h"
> > +
> > +#define IPU_PRE_MAX_WIDTH 2048
> > +#define IPU_PRE_NUM_SCANLINES 8
> > +
> > +#define IPU_PRE_CTRL 0x000
> > +#define IPU_PRE_CTRL_SET 0x004
> > +#define IPU_PRE_CTRL_ENABLE (1 <<
> > 0)
>
> Single bit fields could use BIT(0) etc.
>
> > +#define IPU_PRE_CTRL_BLOCK_EN (1
> > << 1)
> > +#define IPU_PRE_CTRL_BLOCK_16 (1
> > << 2)
> > +#define IPU_PRE_CTRL_SDW_UPDATE (1 << 4)
> > +#define IPU_PRE_CTRL_VFLIP (1 <<
> > 5)
> > +#define IPU_PRE_CTRL_SO (1 << 6)
> > +#define IPU_PRE_CTRL_INTERLACED_FIELD (1
> > << 7)
> > +#define IPU_PRE_CTRL_HANDSHAKE_EN (1 << 8)
> > +#define IPU_PRE_CTRL_HANDSHAKE_LINE_NUM(v) ((v &
> > 0x3) << 9)
> > +#define IPU_PRE_CTRL_HANDSHAKE_ABORT_SKIP_EN (1 <<
> > 11)
> > +#define IPU_PRE_CTRL_EN_REPEAT (1
> > << 28)
> > +#define IPU_PRE_CTRL_TPR_REST_SEL (1 <<
> > 29)
> > +#define IPU_PRE_CTRL_CLKGATE (1 <<
> > 30)
> > +#define IPU_PRE_CTRL_SFTRST (1 <<
> > 31)
> > +
> > +#define IPU_PRE_CUR_BUF 0x0
> > 30
> > +
> > +#define IPU_PRE_NEXT_BUF 0x040
> > +
> > +#define IPU_PRE_TPR_CTRL 0x070
> > +#define IPU_PRE_TPR_CTRL_TILE_FORMAT(v) ((v &
> > 0xff) << 0)
> > +#define IPU_PRE_TPR_CTRL_TILE_FORMAT_MASK 0xff
> > +
> > +#define IPU_PRE_PREFETCH_ENG_CTRL 0x080
> > +#define IPU_PRE_PREF_ENG_CTRL_PREFETCH_EN (1 << 0)
> > +#define IPU_PRE_PREF_ENG_CTRL_RD_NUM_BYTES(v) ((v
> > & 0x7) << 1)
> > +#define IPU_PRE_PREF_ENG_CTRL_INPUT_ACTIVE_BPP(v) ((v &
> > 0x3) << 4)
> > +#define IPU_PRE_PREF_ENG_CTRL_INPUT_PIXEL_FORMAT(v) ((v &
> > 0x7) << 8)
> > +#define IPU_PRE_PREF_ENG_CTRL_SHIFT_BYPASS (1 <<
> > 11)
> > +#define IPU_PRE_PREF_ENG_CTRL_FIELD_INVERSE (1 <<
> > 12)
> > +#define IPU_PRE_PREF_ENG_CTRL_PARTIAL_UV_SWAP (1
> > << 14)
> > +#define IPU_PRE_PREF_ENG_CTRL_TPR_COOR_OFFSET_EN (1 << 15)
> > +
> > +#define IPU_PRE_PREFETCH_ENG_INPUT_SIZE 0x0
> > a0
> > +#define IPU_PRE_PREFETCH_ENG_INPUT_SIZE_WIDTH(v) ((v &
> > 0xffff) << 0)
> > +#define IPU_PRE_PREFETCH_ENG_INPUT_SIZE_HEIGHT(v) ((v &
> > 0xffff) << 16)
> > +
> > +#define IPU_PRE_PREFETCH_ENG_PITCH 0x0d0
> > +#define IPU_PRE_PREFETCH_ENG_PITCH_Y(v) ((v &
> > 0xffff) << 0)
> > +#define IPU_PRE_PREFETCH_ENG_PITCH_UV(v) ((v &
> > 0xffff) << 16)
> > +
> > +#define IPU_PRE_STORE_ENG_CTRL 0x11
> > 0
> > +#define IPU_PRE_STORE_ENG_CTRL_STORE_EN (1 << 0)
> > +#define IPU_PRE_STORE_ENG_CTRL_WR_NUM_BYTES(v) ((v
> > & 0x7) << 1)
> > +#define IPU_PRE_STORE_ENG_CTRL_OUTPUT_ACTIVE_BPP(v) ((v &
> > 0x3) << 4)
> > +
> > +#define IPU_PRE_STORE_ENG_SIZE 0x13
> > 0
> > +#define IPU_PRE_STORE_ENG_SIZE_INPUT_WIDTH(v) ((v
> > & 0xffff) << 0)
> > +#define IPU_PRE_STORE_ENG_SIZE_INPUT_HEIGHT(v) ((v
> > & 0xffff) << 16)
> > +
> > +#define IPU_PRE_STORE_ENG_PITCH 0x1
> > 40
> > +#define IPU_PRE_STORE_ENG_PITCH_OUT_PITCH(v) ((v &
> > 0xffff) << 0)
> > +
> > +#define IPU_PRE_STORE_ENG_ADDR 0x15
> > 0
> > +
> > +struct ipu_pre {
> > + struct list_head list;
> > + struct device *dev;
> > +
> > + void __iomem *regs;
> > + struct clk *clk_axi;
> > + struct gen_pool *ocram;
> > +
> > + dma_addr_t buffer_paddr;
> > + void *buffer_virt;
> > + bool in_use;
> > +};
> > +
> > +static DEFINE_MUTEX(ipu_pre_list_mutex);
> > +static LIST_HEAD(ipu_pre_list);
> > +static int available_pres;
> > +
> > +int ipu_pre_get_available_count(void)
> > +{
> > + return available_pres;
> > +}
> > +
> > +struct ipu_pre *
> > +ipu_pre_get_by_prg_device(struct device *dev, int index)
>
> I'd call this ipu_pre_lookup_by_phandle and pass the device_node and
> property name string parameter.
> That way the name is better separated from ipu_pre_get ...
>
> > +{
> > + struct device_node *pre_node = of_parse_phandle(dev-
> > >of_node,
> > + "fsl,pres"
> > , index);
>
> ... and the PRG specific "fsl,pres" string could move into the PRG
> driver.
Good point, will do.
>
> > + struct ipu_pre *pre;
> > +
> > + mutex_lock(&ipu_pre_list_mutex);
> > + list_for_each_entry(pre, &ipu_pre_list, list) {
> > + if (pre_node == pre->dev->of_node) {
> > + mutex_unlock(&ipu_pre_list_mutex);
> > + device_link_add(dev, pre->dev,
> > DL_FLAG_AUTOREMOVE);
> > + return pre;
> > + }
> > + }
> > + mutex_unlock(&ipu_pre_list_mutex);
> > +
> > + return NULL;
> > +}
> > +
> > +int ipu_pre_get(struct ipu_pre *pre)
> > +{
> > + u32 val;
> > +
> > + if (pre->in_use)
> > + return -EBUSY;
>
> This could race for in_use ...
All the PRE/PRG configuration functions are thread unsafe, with the
premise that they are only used during an atomic commit, which is
inherently single threaded. I would rather like to avoid introducing
unnecessary thread safety here.
>
> > + clk_prepare_enable(pre->clk_axi);
> > +
> > + /* first get the engine out of reset and remove clock
> > gating */
> > + writel(0, pre->regs + IPU_PRE_CTRL);
> > +
> > + /* init defaults that should be applied to all streams */
> > + val = IPU_PRE_CTRL_HANDSHAKE_ABORT_SKIP_EN |
> > + IPU_PRE_CTRL_HANDSHAKE_EN |
> > + IPU_PRE_CTRL_TPR_REST_SEL |
> > + IPU_PRE_CTRL_BLOCK_16 | IPU_PRE_CTRL_SDW_UPDATE;
> > + writel(val, pre->regs + IPU_PRE_CTRL);
> > +
> > + pre->in_use = true;
>
> ... until here.
>
> > + return 0;
> > +}
> > +
> > +void ipu_pre_put(struct ipu_pre *pre)
> > +{
> > + u32 val;
> > +
> > + val = IPU_PRE_CTRL_SFTRST | IPU_PRE_CTRL_CLKGATE;
> > + writel(val, pre->regs + IPU_PRE_CTRL);
> > +
> > + clk_disable_unprepare(pre->clk_axi);
> > +
> > + pre->in_use = false;
> > +}
> > +
> > +void ipu_pre_configure(struct ipu_pre *pre, unsigned int width,
> > + unsigned int height, unsigned int stride,
> > u32 format,
> > + unsigned int bufaddr)
> > +{
> > + const struct drm_format_info *info =
> > drm_format_info(format);
> > + u32 active_bpp = info->cpp[0] >> 1;
> > + u32 val;
> > +
> > + writel(bufaddr, pre->regs + IPU_PRE_CUR_BUF);
> > + writel(bufaddr, pre->regs + IPU_PRE_NEXT_BUF);
> > +
> > + val = IPU_PRE_PREF_ENG_CTRL_INPUT_PIXEL_FORMAT(0) |
> > + IPU_PRE_PREF_ENG_CTRL_INPUT_ACTIVE_BPP(active_bpp) |
> > + IPU_PRE_PREF_ENG_CTRL_RD_NUM_BYTES(4) |
> > + IPU_PRE_PREF_ENG_CTRL_SHIFT_BYPASS |
> > + IPU_PRE_PREF_ENG_CTRL_PREFETCH_EN;
> > + writel(val, pre->regs + IPU_PRE_PREFETCH_ENG_CTRL);
> > +
> > + val = IPU_PRE_PREFETCH_ENG_INPUT_SIZE_WIDTH(width) |
> > + IPU_PRE_PREFETCH_ENG_INPUT_SIZE_HEIGHT(height);
> > + writel(val, pre->regs + IPU_PRE_PREFETCH_ENG_INPUT_SIZE);
> > +
> > + val = IPU_PRE_PREFETCH_ENG_PITCH_Y(stride);
> > + writel(val, pre->regs + IPU_PRE_PREFETCH_ENG_PITCH);
> > +
> > + val = IPU_PRE_STORE_ENG_CTRL_OUTPUT_ACTIVE_BPP(active_bpp)
> > |
> > + IPU_PRE_STORE_ENG_CTRL_WR_NUM_BYTES(4) |
> > + IPU_PRE_STORE_ENG_CTRL_STORE_EN;
> > + writel(val, pre->regs + IPU_PRE_STORE_ENG_CTRL);
> > +
> > + val = IPU_PRE_STORE_ENG_SIZE_INPUT_WIDTH(width) |
> > + IPU_PRE_STORE_ENG_SIZE_INPUT_HEIGHT(height);
> > + writel(val, pre->regs + IPU_PRE_STORE_ENG_SIZE);
> > +
> > + val = IPU_PRE_STORE_ENG_PITCH_OUT_PITCH(stride);
> > + writel(val, pre->regs + IPU_PRE_STORE_ENG_PITCH);
> > +
> > + writel(pre->buffer_paddr, pre->regs +
> > IPU_PRE_STORE_ENG_ADDR);
> > +
> > + val = readl(pre->regs + IPU_PRE_CTRL);
> > + val |= IPU_PRE_CTRL_EN_REPEAT | IPU_PRE_CTRL_ENABLE |
> > + IPU_PRE_CTRL_SDW_UPDATE;
> > + writel(val, pre->regs + IPU_PRE_CTRL);
> > +}
> > +
> > +void ipu_pre_update(struct ipu_pre *pre, unsigned int bufaddr)
> > +{
> > + writel(bufaddr, pre->regs + IPU_PRE_NEXT_BUF);
> > + writel(IPU_PRE_CTRL_SDW_UPDATE, pre->regs +
> > IPU_PRE_CTRL_SET);
> > +}
> > +
> > +u32 ipu_pre_get_baddr(struct ipu_pre *pre)
> > +{
> > + return (u32)pre->buffer_paddr;
> > +}
> > +
> > +static int ipu_pre_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct resource *res;
> > + struct ipu_pre *pre;
> > +
> > + pre = devm_kzalloc(dev, sizeof(*pre), GFP_KERNEL);
> > + if (!pre)
> > + return -ENOMEM;
> > +
> > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > + pre->regs = devm_ioremap_resource(&pdev->dev, res);
> > + if (IS_ERR(pre->regs))
> > + return PTR_ERR(pre->regs);
> > +
> > + pre->clk_axi = devm_clk_get(dev, "axi");
> > + if (IS_ERR(pre->clk_axi))
> > + return PTR_ERR(pre->clk_axi);
> > +
> > + pre->ocram = of_gen_pool_get(dev->of_node, "fsl,ocram",
> > 0);
> > + if (!pre->ocram)
> > + return -EPROBE_DEFER;
>
> I'd call this iram, from the point of view of the PRE.
>
> > +
> > + /*
> > + * Allocate OCRAM buffer with maximum size. This could be
> > made dynamic,
> > + * but as there is no other user of this OCRAM region and
> > we can fit all
> > + * max sized buffers into it, there is no need yet.
> > + */
> > + pre->buffer_virt = gen_pool_dma_alloc(pre->ocram,
> > IPU_PRE_MAX_WIDTH *
> > + IPU_PRE_NUM_SCANLINE
> > S * 4,
> > + &pre->buffer_paddr);
> > + if (!pre->buffer_virt)
> > + return -ENOMEM;
> > +
> > + pre->dev = dev;
> > + platform_set_drvdata(pdev, pre);
> > + mutex_lock(&ipu_pre_list_mutex);
> > + list_add(&pre->list, &ipu_pre_list);
> > + available_pres++;
> > + mutex_unlock(&ipu_pre_list_mutex);
> > +
> > + return 0;
> > +}
> > +
> > +static int ipu_pre_remove(struct platform_device *pdev)
> > +{
> > + struct ipu_pre *pre = platform_get_drvdata(pdev);
> > +
> > + mutex_lock(&ipu_pre_list_mutex);
> > + list_del(&pre->list);
> > + available_pres--;
> > + mutex_unlock(&ipu_pre_list_mutex);
> > +
> > + if (pre->buffer_virt)
> > + gen_pool_free(pre->ocram, (unsigned long)pre-
> > >buffer_virt,
> > + IPU_PRE_MAX_WIDTH *
> > IPU_PRE_NUM_SCANLINES * 4);
> > + return 0;
> > +}
> > +
> > +static const struct of_device_id ipu_pre_dt_ids[] = {
> > + { .compatible = "fsl,imx6qp-pre", },
> > + { /* sentinel */ },
> > +};
> > +
> > +static struct platform_driver ipu_pre_drv = {
> > + .probe = ipu_pre_probe,
> > + .remove = ipu_pre_remove,
> > + .driver = {
> > + .name = "imx-ipu-pre",
> > + .of_match_table = ipu_pre_dt_ids,
> > + },
> > +};
> > +module_platform_driver(ipu_pre_drv);
> > diff --git a/drivers/gpu/ipu-v3/ipu-prv.h b/drivers/gpu/ipu-v3/ipu-
> > prv.h
> > index 22e47b68b14a..536a156a5eb6 100644
> > --- a/drivers/gpu/ipu-v3/ipu-prv.h
> > +++ b/drivers/gpu/ipu-v3/ipu-prv.h
> > @@ -168,6 +168,7 @@ struct ipu_ic_priv;
> > struct ipu_vdi;
> > struct ipu_image_convert_priv;
> > struct ipu_smfc_priv;
> > +struct ipu_pre;
> >
> > struct ipu_devtype;
> >
> > @@ -259,4 +260,14 @@ void ipu_cpmem_exit(struct ipu_soc *ipu);
> > int ipu_smfc_init(struct ipu_soc *ipu, struct device *dev,
> > unsigned long base);
> > void ipu_smfc_exit(struct ipu_soc *ipu);
> >
> > +struct ipu_pre *ipu_pre_get_by_prg_device(struct device *dev, int
> > index);
> > +int ipu_pre_get_available_count(void);
> > +int ipu_pre_get(struct ipu_pre *pre);
> > +void ipu_pre_put(struct ipu_pre *pre);
> > +u32 ipu_pre_get_baddr(struct ipu_pre *pre);
> > +void ipu_pre_configure(struct ipu_pre *pre, unsigned int width,
> > + unsigned int height,
> > + unsigned int stride, u32 format, unsigned
> > int bufaddr);
> > +void ipu_pre_update(struct ipu_pre *pre, unsigned int bufaddr);
> > +
> > #endif /* __IPU_PRV_H__ */
>
> regards
> Philipp
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2017-03-03 18:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-17 18:28 [PATCH 0/9] ipu-v3/imx-drm PRG/PRE extension Lucas Stach
[not found] ` <20170217182830.32618-1-l.stach-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2017-02-17 18:28 ` [PATCH 1/9] gpu: ipu-v3: remove AXI ID setting for IC channel Lucas Stach
2017-02-20 13:04 ` Philipp Zabel
2017-02-17 18:28 ` [PATCH 2/9] gpu: ipu-v3: add DT binding for the Prefetch Resolve Engine Lucas Stach
[not found] ` <20170217182830.32618-3-l.stach-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2017-02-20 15:01 ` Philipp Zabel
2017-02-27 17:00 ` Rob Herring
2017-02-17 18:28 ` [PATCH 3/9] gpu: ipu-v3: add driver for " Lucas Stach
[not found] ` <20170217182830.32618-4-l.stach-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2017-02-20 15:20 ` Philipp Zabel
2017-03-03 18:25 ` Lucas Stach [this message]
2017-03-06 8:42 ` Philipp Zabel
2017-02-17 18:28 ` [PATCH 4/9] gpu: ipu-v3: add DT binding for the Prefetch Resolve Gasket Lucas Stach
2017-02-27 17:02 ` Rob Herring
2017-02-17 18:28 ` [PATCH 5/9] gpu: ipu-v3: add driver for " Lucas Stach
2017-02-20 15:31 ` Philipp Zabel
2017-02-17 18:28 ` [PATCH 6/9] gpu: ipu-v3: extend the IPUv3 DT binding for i.MX6 QuadPlus Lucas Stach
2017-02-27 17:04 ` Rob Herring
2017-02-17 18:28 ` [PATCH 7/9] gpu: ipu-v3: hook up PRG unit Lucas Stach
2017-02-17 18:28 ` [PATCH 8/9] drm/imx: enable/disable PRG on CRTC enable/disable Lucas Stach
2017-02-17 18:28 ` [PATCH 9/9] drm/imx: use PRG/PRE when possible Lucas Stach
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1488565539.11464.1.camel@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel@pengutronix.de \
--cc=mark.rutland@arm.com \
--cc=p.zabel@pengutronix.de \
--cc=patchwork-lst@pengutronix.de \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.