[Intel-gfx] [PATCH 01/12] drm/i915/gen9: Handle error returned by gen9_init_workarounds

[Ville Syrjälä]

On Fri, Sep 25, 2015 at 02:33:35PM +0100, Arun Siluvery wrote:
> Signed-off-by: Arun Siluvery <arun.siluvery at linux.intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_ringbuffer.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index fdff606..6671800 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -1026,10 +1026,13 @@ static int skl_tune_iz_hashing(struct intel_engine_cs *ring)
>  
>  static int skl_init_workarounds(struct intel_engine_cs *ring)
>  {
> +	int ret;
>  	struct drm_device *dev = ring->dev;
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  
> -	gen9_init_workarounds(ring);
> +	ret = gen9_init_workarounds(ring);
> +	if (ret)
> +		return ret;
>  
>  	/* WaDisablePowerCompilerClockGating:skl */
>  	if (INTEL_REVID(dev) == SKL_REVID_B0)
> @@ -1066,10 +1069,13 @@ static int skl_init_workarounds(struct intel_engine_cs *ring)
>  
>  static int bxt_init_workarounds(struct intel_engine_cs *ring)
>  {
> +	int ret;
>  	struct drm_device *dev = ring->dev;
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  
> -	gen9_init_workarounds(ring);
> +	ret = gen9_init_workarounds(ring);
> +	if (ret)
> +		return ret;
>  
>  	/* WaDisableThreadStallDopClockGating:bxt */
>  	WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC