[Intel-gfx] [PATCH 1/2] drm/i915: Check num_pipes before initializing audio component

Jani Nikula jani.nikula at linux.intel.com
Mon Dec 19 09:26:47 UTC 2016


On Fri, 16 Dec 2016, Wang Elaine <elaine.wang at intel.com> wrote:
> From: Elaine Wang <elaine.wang at intel.com>
>
> when num_pipes is zero, it indicates there is no display and HDMI
> audio doesn't exist.
>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Signed-off-by: Elaine Wang <elaine.wang at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 6428588..c94e26d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1132,7 +1132,8 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
>  	if (IS_GEN5(dev_priv))
>  		intel_gpu_ips_init(dev_priv);
>  
> -	i915_audio_component_init(dev_priv);
> +	if (INTEL_INFO(dev_priv)->num_pipes)
> +		i915_audio_component_init(dev_priv);

I just wonder why on some patches in the series the check is on the
caller side and on some others on the callee side. I'd like consistency.

BR,
Jani.

>  
>  	/*
>  	 * Some ports require correctly set-up hpd registers for detection to

-- 
Jani Nikula, Intel Open Source Technology Center


More information about the Intel-gfx mailing list