From patchwork Tue Oct 4 08:34:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dhinakaran Pandiyan X-Patchwork-Id: 9361355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B8D9600C8 for ; Tue, 4 Oct 2016 08:35:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B1B02840A for ; Tue, 4 Oct 2016 08:35:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F583287D7; Tue, 4 Oct 2016 08:35:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C86012870E for ; Tue, 4 Oct 2016 08:35:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E5176E5F7; Tue, 4 Oct 2016 08:35:16 +0000 (UTC) X-Original-To: intel-gfx@freedesktop.org Delivered-To: intel-gfx@freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2CB746E5F7 for ; Tue, 4 Oct 2016 08:35:15 +0000 (UTC) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP; 04 Oct 2016 01:35:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,442,1473145200"; d="scan'208";a="886487894" Received: from nuc-skylake.jf.intel.com ([10.54.75.14]) by orsmga003.jf.intel.com with ESMTP; 04 Oct 2016 01:35:14 -0700 From: Dhinakaran Pandiyan To: intel-gfx@freedesktop.org Date: Tue, 4 Oct 2016 01:34:51 -0700 Message-Id: <1475570091-8186-1-git-send-email-dhinakaran.pandiyan@intel.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Cc: Paulo R , Jani Nikula , Dhinakaran Pandiyan , Zanoni@freedesktop.org Subject: [Intel-gfx] [PATCH] drm/dp/i915: Enable audio codec after the HDA audio driver is initialized X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This fixes the underruns that are seen in DP MST multi-monitor setups when audio is enabled with commit 3708d5e082c3 ("drm/i915: start adding dp mst audio"). The underruns triggered continuous cycles of display on/off cycles. Signed-off-by: Dhinakaran Pandiyan Cc: Libin Yang Cc: Ville Syrjälä Cc: Jani Nikula Cc: Zanoni, Paulo R --- Not exactly sure why this works for me, but I am sending this patch to get some feedback in case the idea is completely wrong. In the meantime, I will try to get some testing done on platforms other than SKL. drivers/gpu/drm/i915/intel_audio.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 9583f43..3f4e741 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -497,6 +497,9 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) if (!connector) return; + if (!acomp) + return; + DRM_DEBUG_DRIVER("ELD on [CONNECTOR:%d:%s], [ENCODER:%d:%s]\n", connector->base.id, connector->name, @@ -546,6 +549,9 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder) struct intel_crtc *crtc = to_intel_crtc(encoder->crtc); enum pipe pipe = crtc->pipe; + if (!acomp) + return; + if (dev_priv->display.audio_codec_disable) dev_priv->display.audio_codec_disable(intel_encoder);