public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Wang Elaine <elaine.wang@intel.com>
To: intel-gfx@lists.freedesktop.org, elaine.wang@intel.com
Subject: [PATCH 1/2] drm/i915: Check num_pipes before initializing audio component
Date: Fri, 16 Dec 2016 14:30:30 +0800	[thread overview]
Message-ID: <1481869831-1209-1-git-send-email-elaine.wang@intel.com> (raw)

From: Elaine Wang <elaine.wang@intel.com>

when num_pipes is zero, it indicates there is no display and HDMI
audio doesn't exist.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Elaine Wang <elaine.wang@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);
 
 	/*
 	 * Some ports require correctly set-up hpd registers for detection to
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

             reply	other threads:[~2016-12-16  6:33 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-16  6:30 Wang Elaine [this message]
2016-12-16  6:30 ` [PATCH 2/2] drm/i915: Check num_pipes before initializing or calling display hooks Wang Elaine
2016-12-16  7:15 ` ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: Check num_pipes before initializing audio component Patchwork
2016-12-19  9:16   ` Wang, Elaine
2016-12-19  9:26 ` [PATCH 1/2] " Jani Nikula
2016-12-19  9:48   ` Wang, Elaine

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=1481869831-1209-1-git-send-email-elaine.wang@intel.com \
    --to=elaine.wang@intel.com \
    --cc=intel-gfx@lists.freedesktop.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox