From patchwork Fri Apr 22 16:40:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Xiong X-Patchwork-Id: 8913891 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 4A37DBF29F for ; Fri, 22 Apr 2016 16:40:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6C6122024F for ; Fri, 22 Apr 2016 16:40:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1CE2820270 for ; Fri, 22 Apr 2016 16:40:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1C9686EF2E; Fri, 22 Apr 2016 16:40:07 +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 23D266EF2E for ; Fri, 22 Apr 2016 16:40:06 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP; 22 Apr 2016 09:40:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,517,1455004800"; d="scan'208";a="690586948" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by FMSMGA003.fm.intel.com with ESMTP; 22 Apr 2016 09:40:05 -0700 Received: from fmsmsx115.amr.corp.intel.com (10.18.116.19) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 22 Apr 2016 09:40:04 -0700 Received: from fmsmsx101.amr.corp.intel.com ([169.254.1.162]) by fmsmsx115.amr.corp.intel.com ([10.18.116.19]) with mapi id 14.03.0248.002; Fri, 22 Apr 2016 09:40:04 -0700 From: "Xiong, James" To: "Paauwe, Bob J" , isg-gms , intel-gfx Thread-Topic: [isg-gms] [PATCH] drm/i915: Get audio power domain during initial hw readout (v2) Thread-Index: AQHRm0SeE2WxgcI2bUKVzGKc278RUp+WNDMQ Date: Fri, 22 Apr 2016 16:40:04 +0000 Message-ID: <83E9754AABFD724886879E166F79B1DA0D2A71C7@fmsmsx101.amr.corp.intel.com> References: <1460501568-29102-1-git-send-email-bob.j.paauwe@intel.com> <1461184701-10417-1-git-send-email-bob.j.paauwe@intel.com> In-Reply-To: <1461184701-10417-1-git-send-email-bob.j.paauwe@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMjM1OThjZDQtMDNiOC00NDc0LTkzYTctZTQ3NGY3NzMyOGE4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IkZIeFV1YWVsVHNYZ3dZUFFZczRFU0FESkNqcG1sTVQ4aStPTnM5cjNDV289In0= x-originating-ip: [10.1.200.108] MIME-Version: 1.0 Subject: Re: [Intel-gfx] [isg-gms] [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 -----Original Message----- From: isg-gms-request@eclists.intel.com [mailto:isg-gms-request@eclists.intel.com] On Behalf Of Paauwe, Bob J Sent: Wednesday, April 20, 2016 1:38 PM To: isg-gms ; intel-gfx Cc: Paauwe, Bob J ; Ville Syrjälä Subject: [isg-gms] [PATCH] drm/i915: Get audio power domain during initial hw readout (v2) 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 Reviewed-by: James Xiong Tested-by: James Xiong Cc: Ville Syrjälä --- drivers/gpu/drm/i915/intel_display.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.5.5 ------------------------------------- isg-gms@eclists.intel.com https://eclists.intel.com/sympa/info/isg-gms Unsubscribe by sending email to sympa@eclists.intel.com with subject "Unsubscribe isg-gms" 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; }