Re: [PATCH v4 2/2] drm/v3d: Add support for V3D v4.2.
Dave Emett writes: > On Fri, 8 Mar 2019 at 17:43, Eric Anholt wrote: >> >> No compatible string for it yet, just the version-dependent changes. >> They've now tied the hub and the core interrupt lines into a single >> interrupt line coming out of the block. It also turns out I made a >> mistake in modeling the V3D v3.3 and v4.1 bridge as a part of V3D >> itself -- the bridge is going away in favor of an external reset >> controller in a larger HW module. >> >> v2: Use consistent checks for whether we're on 4.2, and fix a leak in >> an error path. >> v3: Use more general means of determining if the current 4.2 changes >> are in place, as apparently other platforms may switch back (noted >> by Dave). Update the binding doc. >> v4: Improve error handling for IRQ init. >> >> Signed-off-by: Eric Anholt > > Reviewed-by: Dave Emett Pushed to drm-misc-next. Thanks! signature.asc Description: PGP signature
Re: [PATCH v4 2/2] drm/v3d: Add support for V3D v4.2.
On Fri, 8 Mar 2019 at 17:43, Eric Anholt wrote: > > No compatible string for it yet, just the version-dependent changes. > They've now tied the hub and the core interrupt lines into a single > interrupt line coming out of the block. It also turns out I made a > mistake in modeling the V3D v3.3 and v4.1 bridge as a part of V3D > itself -- the bridge is going away in favor of an external reset > controller in a larger HW module. > > v2: Use consistent checks for whether we're on 4.2, and fix a leak in > an error path. > v3: Use more general means of determining if the current 4.2 changes > are in place, as apparently other platforms may switch back (noted > by Dave). Update the binding doc. > v4: Improve error handling for IRQ init. > > Signed-off-by: Eric Anholt Reviewed-by: Dave Emett > --- > .../devicetree/bindings/gpu/brcm,bcm-v3d.txt | 11 +++-- > drivers/gpu/drm/v3d/v3d_drv.c | 21 +++-- > drivers/gpu/drm/v3d/v3d_drv.h | 2 + > drivers/gpu/drm/v3d/v3d_gem.c | 12 - > drivers/gpu/drm/v3d/v3d_irq.c | 45 ++- > 5 files changed, 71 insertions(+), 20 deletions(-) > > diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt > b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt > index c907aa8dd755..b2df82b44625 100644 > --- a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt > +++ b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt > @@ -6,15 +6,20 @@ For V3D 2.x, see brcm,bcm-vc4.txt. > Required properties: > - compatible: Should be "brcm,7268-v3d" or "brcm,7278-v3d" > - reg: Physical base addresses and lengths of the register areas > -- reg-names: Names for the register areas. The "hub", "bridge", and > "core0" > +- reg-names: Names for the register areas. The "hub" and "core0" > register areas are always required. The "gca" register area > - is required if the GCA cache controller is present. > + is required if the GCA cache controller is present. The > + "bridge" register area is required if an external reset > + controller is not present. > - interrupts: The interrupt numbers. The first interrupt is for the hub, > - while the following interrupts are for the cores. > + while the following interrupts are separate interrupt lines > + for the cores (if they don't share the hub's interrupt). > See bindings/interrupt-controller/interrupts.txt > > Optional properties: > - clocks: The core clock the unit runs on > +- resets: The reset line for v3d, if not using a mapping of the bridge > + See bindings/reset/reset.txt > > v3d { > compatible = "brcm,7268-v3d"; > diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c > index f9906cac7a88..89b7567d550f 100644 > --- a/drivers/gpu/drm/v3d/v3d_drv.c > +++ b/drivers/gpu/drm/v3d/v3d_drv.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -264,10 +265,6 @@ static int v3d_platform_drm_probe(struct platform_device > *pdev) > v3d->pdev = pdev; > drm = &v3d->drm; > > - ret = map_regs(v3d, &v3d->bridge_regs, "bridge"); > - if (ret) > - goto dev_free; > - > ret = map_regs(v3d, &v3d->hub_regs, "hub"); > if (ret) > goto dev_free; > @@ -282,6 +279,22 @@ static int v3d_platform_drm_probe(struct platform_device > *pdev) > v3d->cores = V3D_GET_FIELD(ident1, V3D_HUB_IDENT1_NCORES); > WARN_ON(v3d->cores > 1); /* multicore not yet implemented */ > > + v3d->reset = devm_reset_control_get_exclusive(dev, NULL); > + if (IS_ERR(v3d->reset)) { > + ret = PTR_ERR(v3d->reset); > + > + if (ret == -EPROBE_DEFER) > + goto dev_free; > + > + v3d->reset = NULL; > + ret = map_regs(v3d, &v3d->bridge_regs, "bridge"); > + if (ret) { > + dev_err(dev, > + "Failed to get reset control or bridge > regs\n"); > + goto dev_free; > + } > + } > + > if (v3d->ver < 41) { > ret = map_regs(v3d, &v3d->gca_regs, "gca"); > if (ret) > diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h > index bb58ecb9d9c5..b5efac7894ca 100644 > --- a/drivers/gpu/drm/v3d/v3d_drv.h > +++ b/drivers/gpu/drm/v3d/v3d_drv.h > @@ -33,6 +33,7 @@ struct v3d_dev { > * and revision. > */ > int ver; > + bool single_irq_line; > > struct device *dev; > struct platform_device *pdev; > @@ -41,6 +42,7 @@ struct v3d_dev { > void __iomem *bridge_regs; > void __iomem *gca_regs; > struct clk *clk; > + struct reset_contro
[PATCH v4 2/2] drm/v3d: Add support for V3D v4.2.
No compatible string for it yet, just the version-dependent changes. They've now tied the hub and the core interrupt lines into a single interrupt line coming out of the block. It also turns out I made a mistake in modeling the V3D v3.3 and v4.1 bridge as a part of V3D itself -- the bridge is going away in favor of an external reset controller in a larger HW module. v2: Use consistent checks for whether we're on 4.2, and fix a leak in an error path. v3: Use more general means of determining if the current 4.2 changes are in place, as apparently other platforms may switch back (noted by Dave). Update the binding doc. v4: Improve error handling for IRQ init. Signed-off-by: Eric Anholt --- .../devicetree/bindings/gpu/brcm,bcm-v3d.txt | 11 +++-- drivers/gpu/drm/v3d/v3d_drv.c | 21 +++-- drivers/gpu/drm/v3d/v3d_drv.h | 2 + drivers/gpu/drm/v3d/v3d_gem.c | 12 - drivers/gpu/drm/v3d/v3d_irq.c | 45 ++- 5 files changed, 71 insertions(+), 20 deletions(-) diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt index c907aa8dd755..b2df82b44625 100644 --- a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt +++ b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt @@ -6,15 +6,20 @@ For V3D 2.x, see brcm,bcm-vc4.txt. Required properties: - compatible: Should be "brcm,7268-v3d" or "brcm,7278-v3d" - reg: Physical base addresses and lengths of the register areas -- reg-names: Names for the register areas. The "hub", "bridge", and "core0" +- reg-names: Names for the register areas. The "hub" and "core0" register areas are always required. The "gca" register area - is required if the GCA cache controller is present. + is required if the GCA cache controller is present. The + "bridge" register area is required if an external reset + controller is not present. - interrupts: The interrupt numbers. The first interrupt is for the hub, - while the following interrupts are for the cores. + while the following interrupts are separate interrupt lines + for the cores (if they don't share the hub's interrupt). See bindings/interrupt-controller/interrupts.txt Optional properties: - clocks: The core clock the unit runs on +- resets: The reset line for v3d, if not using a mapping of the bridge + See bindings/reset/reset.txt v3d { compatible = "brcm,7268-v3d"; diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index f9906cac7a88..89b7567d550f 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -264,10 +265,6 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) v3d->pdev = pdev; drm = &v3d->drm; - ret = map_regs(v3d, &v3d->bridge_regs, "bridge"); - if (ret) - goto dev_free; - ret = map_regs(v3d, &v3d->hub_regs, "hub"); if (ret) goto dev_free; @@ -282,6 +279,22 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) v3d->cores = V3D_GET_FIELD(ident1, V3D_HUB_IDENT1_NCORES); WARN_ON(v3d->cores > 1); /* multicore not yet implemented */ + v3d->reset = devm_reset_control_get_exclusive(dev, NULL); + if (IS_ERR(v3d->reset)) { + ret = PTR_ERR(v3d->reset); + + if (ret == -EPROBE_DEFER) + goto dev_free; + + v3d->reset = NULL; + ret = map_regs(v3d, &v3d->bridge_regs, "bridge"); + if (ret) { + dev_err(dev, + "Failed to get reset control or bridge regs\n"); + goto dev_free; + } + } + if (v3d->ver < 41) { ret = map_regs(v3d, &v3d->gca_regs, "gca"); if (ret) diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h index bb58ecb9d9c5..b5efac7894ca 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -33,6 +33,7 @@ struct v3d_dev { * and revision. */ int ver; + bool single_irq_line; struct device *dev; struct platform_device *pdev; @@ -41,6 +42,7 @@ struct v3d_dev { void __iomem *bridge_regs; void __iomem *gca_regs; struct clk *clk; + struct reset_control *reset; /* Virtual and DMA addresses of the single shared page table. */ volatile u32 *pt; diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c index 0a83268dec0c..449d01ea54a0 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -6