Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1625734

Re: [PATCH 1/3 v2] drm/vc4: Turn the V3D clock on at runtime.

Show all headers | View raw

On 04/18/2017 04:38 PM, Eric Anholt wrote:
> For the Raspberry Pi's bindings, the power domain also implicitly
> turns on the clock and deasserts reset, but for the new Cygnus port we
> start representing the clock in the devicetree.
> 
> v2: Document the clock-names property, check for -ENOENT for no clock
>     in DT.
> 
> Signed-off-by: Eric Anholt <eric@anholt.net>
> ---

> +	if (v3d->clk)
> +		clk_disable_unprepare(v3d->clk);

The clock API allows you to pass a NULL clk and do nothing in these
cases which is what you seem to have done a few lines below, you could
simplify these checks?

> +
>  	return 0;
>  }
>  
> @@ -318,6 +322,13 @@ static int vc4_v3d_runtime_resume(struct device *dev)
>  	if (ret)
>  		return ret;
>  
> +	if (v3d->clk) {
> +		int ret = clk_prepare_enable(v3d->clk);
> +
> +		if (ret != 0)
> +			return ret;
> +	}
> +
>  	vc4_v3d_init_hw(vc4->dev);
>  	vc4_irq_postinstall(vc4->dev);
>  
> @@ -348,15 +359,40 @@ static int vc4_v3d_bind(struct device *dev, struct device *master, void *data)
>  	vc4->v3d = v3d;
>  	v3d->vc4 = vc4;
>  
> +	v3d->clk = devm_clk_get(dev, "v3d_clk");
> +	if (IS_ERR(v3d->clk)) {
> +		int ret = PTR_ERR(v3d->clk);
> +
> +		if (ret == -ENOENT) {
> +			/* bcm2835 didn't have a clock reference in the DT. */
> +			ret = 0;
> +			v3d->clk = NULL;
> +		} else {
> +			if (ret != -EPROBE_DEFER)
> +				dev_err(dev, "Failed to get V3D clock: %d\n",
> +					ret);
> +			return ret;
> +		}
> +	}
> +
>  	if (V3D_READ(V3D_IDENT0) != V3D_EXPECTED_IDENT0) {
>  		DRM_ERROR("V3D_IDENT0 read 0x%08x instead of 0x%08x\n",
>  			  V3D_READ(V3D_IDENT0), V3D_EXPECTED_IDENT0);
>  		return -EINVAL;
>  	}
>  
> +	if (v3d->clk) {
> +		ret = clk_prepare_enable(v3d->clk);
> +		if (ret != 0)
> +			return ret;
> +	}
> +
>  	ret = vc4_allocate_bin_bo(drm);
> -	if (ret)
> +	if (ret) {
> +		if (v3d->clk)
> +			clk_disable_unprepare(v3d->clk);
>  		return ret;
> +	}
>  
>  	/* Reset the binner overflow address/size at setup, to be sure
>  	 * we don't reuse an old one.
> 


-- 
Florian

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/3] drm/vc4: Turn the V3D clock on at runtime. Eric Anholt <eric@anholt.net> - 2017-04-18 21:20 +0200
  [PATCH 3/3] drm/vc4: Add specific compatible strings for Cygnus. Eric Anholt <eric@anholt.net> - 2017-04-18 21:20 +0200
    Re: [PATCH 3/3] drm/vc4: Add specific compatible strings for Cygnus. Rob Herring <robh@kernel.org> - 2017-04-20 22:40 +0200
  [PATCH 2/3] drm/vc4: Don't try to initialize FBDEV if we're only bound to V3D. Eric Anholt <eric@anholt.net> - 2017-04-18 21:20 +0200
    Re: [PATCH 2/3] drm/vc4: Don't try to initialize FBDEV if we're only  bound to V3D. Daniel Vetter <daniel@ffwll.ch> - 2017-04-19 07:10 +0200
      Re: [PATCH 2/3] drm/vc4: Don't try to initialize FBDEV if we're only bound to V3D. Eric Anholt <eric@anholt.net> - 2017-04-19 20:00 +0200
        Re: [PATCH 2/3] drm/vc4: Don't try to initialize FBDEV if we're only  bound to V3D. Daniel Vetter <daniel@ffwll.ch> - 2017-04-19 21:40 +0200
          Re: [PATCH 2/3] drm/vc4: Don't try to initialize FBDEV if we're only bound to V3D. Eric Anholt <eric@anholt.net> - 2017-04-22 01:00 +0200
            Re: [PATCH 2/3] drm/vc4: Don't try to initialize FBDEV if we're only  bound to V3D. Alex Deucher <alexdeucher@gmail.com> - 2017-04-24 16:30 +0200
  Re: [PATCH 1/3] drm/vc4: Turn the V3D clock on at runtime. Eric Anholt <eric@anholt.net> - 2017-04-18 21:30 +0200
  [PATCH 1/3 v2] drm/vc4: Turn the V3D clock on at runtime. Eric Anholt <eric@anholt.net> - 2017-04-19 01:40 +0200
    Re: [PATCH 1/3 v2] drm/vc4: Turn the V3D clock on at runtime. Florian Fainelli <f.fainelli@gmail.com> - 2017-04-19 01:50 +0200
      Re: [PATCH 1/3 v2] drm/vc4: Turn the V3D clock on at runtime. Eric Anholt <eric@anholt.net> - 2017-04-19 02:10 +0200
      Re: [PATCH 1/3 v2] drm/vc4: Turn the V3D clock on at runtime. Eric Anholt <eric@anholt.net> - 2017-04-19 02:10 +0200
      [PATCH 1/3 v3] drm/vc4: Turn the V3D clock on at runtime. Eric Anholt <eric@anholt.net> - 2017-04-24 22:20 +0200

csiph-web