From patchwork Tue Apr 12 22:52:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paauwe, Bob J" X-Patchwork-Id: 8817051 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 C0059C0553 for ; Tue, 12 Apr 2016 22:52:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BD07C2037F for ; Tue, 12 Apr 2016 22:52:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 94C2820361 for ; Tue, 12 Apr 2016 22:52:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 19D086E133; Tue, 12 Apr 2016 22:52:20 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 6408D6E133 for ; Tue, 12 Apr 2016 22:52:18 +0000 (UTC) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP; 12 Apr 2016 15:52:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,476,1455004800"; d="scan'208";a="943843668" Received: from bpaauwe-desk.fm.intel.com ([10.1.134.204]) by fmsmga001.fm.intel.com with ESMTP; 12 Apr 2016 15:52:19 -0700 From: Bob Paauwe To: intel-gfx Date: Tue, 12 Apr 2016 15:52:48 -0700 Message-Id: <1460501568-29102-1-git-send-email-bob.j.paauwe@intel.com> X-Mailer: git-send-email 2.5.5 Subject: [Intel-gfx] [PATCH] drm/i915: Get audio power domain during initial hw readout 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: , MIME-Version: 1.0 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. Signed-off-by: Bob Paauwe --- drivers/gpu/drm/i915/intel_display.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5155efb6..caeb3e1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10561,6 +10561,7 @@ found: } ret = intel_modeset_setup_plane_state(state, crtc, mode, fb, 0, 0); + if (ret) goto fail; @@ -15998,6 +15999,10 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) memset(&crtc->base.mode, 0, sizeof(crtc->base.mode)); if (crtc->base.state->active) { + if (crtc->config->has_audio) + intel_display_power_get(dev_priv, + POWER_DOMAIN_AUDIO); + intel_mode_from_pipe_config(&crtc->base.mode, crtc->config); intel_mode_from_pipe_config(&crtc->base.state->adjusted_mode, crtc->config); WARN_ON(drm_atomic_set_mode_for_crtc(crtc->base.state, &crtc->base.mode));