From patchwork Wed Apr 20 20:38:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paauwe, Bob J" X-Patchwork-Id: 8894991 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 78C0DBF29F for ; Wed, 20 Apr 2016 20:38:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC012202B8 for ; Wed, 20 Apr 2016 20:38:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E3E72202A1 for ; Wed, 20 Apr 2016 20:38:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A26C86EB27; Wed, 20 Apr 2016 20:38:08 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id A60176EB27 for ; Wed, 20 Apr 2016 20:38:07 +0000 (UTC) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 20 Apr 2016 13:38:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,511,1455004800"; d="scan'208";a="963000719" Received: from bpaauwe-desk.fm.intel.com ([10.1.134.204]) by fmsmga002.fm.intel.com with ESMTP; 20 Apr 2016 13:38:07 -0700 From: Bob Paauwe To: isg-gms , intel-gfx Date: Wed, 20 Apr 2016 13:38:21 -0700 Message-Id: <1461184701-10417-1-git-send-email-bob.j.paauwe@intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1460501568-29102-1-git-send-email-bob.j.paauwe@intel.com> References: <1460501568-29102-1-git-send-email-bob.j.paauwe@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915: Get audio power domain during initial hw readout (v2) 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-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP if the crtc has audio is enabled. Otherwise, when the first atomic modeset happens it will warn when trying to drop the audio power domain. v2: move this to get_crtc_power_domains to be consistent with other power domain setup (Ville) Signed-off-by: Bob Paauwe Cc: Ville Syrjälä --- drivers/gpu/drm/i915/intel_display.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f29f2f6..96f7a87 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5264,6 +5264,9 @@ static unsigned long get_crtc_power_domains(struct drm_crtc *crtc, if (crtc_state->shared_dpll) mask |= BIT(POWER_DOMAIN_PLLS); + if (crtc_state->has_audio) + mask |= BIT(POWER_DOMAIN_AUDIO); + return mask; }