From patchwork Tue Oct 2 17:50:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Souza, Jose" X-Patchwork-Id: 10623941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 427A715E8 for ; Tue, 2 Oct 2018 17:52:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 324AE27D4A for ; Tue, 2 Oct 2018 17:52:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 262CB27F10; Tue, 2 Oct 2018 17:52:05 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 C33FB27D4A for ; Tue, 2 Oct 2018 17:52:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DA47D6E377; Tue, 2 Oct 2018 17:51:58 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 87AE06E36E for ; Tue, 2 Oct 2018 17:51:57 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Oct 2018 10:51:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,332,1534834800"; d="scan'208";a="77907657" Received: from josouza-mobl.jf.intel.com ([10.24.11.2]) by orsmga007.jf.intel.com with ESMTP; 02 Oct 2018 10:51:06 -0700 From: =?utf-8?q?Jos=C3=A9_Roberto_de_Souza?= To: intel-gfx@lists.freedesktop.org Date: Tue, 2 Oct 2018 10:50:47 -0700 Message-Id: <20181002175054.15010-3-jose.souza@intel.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181002175054.15010-1-jose.souza@intel.com> References: <20181002175054.15010-1-jose.souza@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 03/10] drm/i915: Do not get aux power for disconnected DP ports X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 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 For ICL type-c ports there is a aux power restriction, it can only be enabled while there is sink connected. BSpec: 21750 v2: - rebased on top of the refactored version of intel_dp_detect() - fixing CI errors by getting runtime_pm(), for VLV/CHV it is also necessary get the DPIO power well reference Cc: Jani Nikula Cc: Ville Syrjälä Cc: Imre Deak Signed-off-by: José Roberto de Souza --- drivers/gpu/drm/i915/intel_dp.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 5a84a929bc7d..2cd2dc564181 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4996,10 +4996,28 @@ bool intel_digital_port_connected(struct intel_encoder *encoder) struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (HAS_GMCH_DISPLAY(dev_priv)) { + enum intel_display_power_domain domain = 0; + bool ret; + + /* + * Oddly VLV/CHV needs the DPIO power well on to be able to + * read the hotplug status, otherwise it will read a bogus value + * and throw a unclaimed register warning + */ + if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { + domain = intel_port_to_power_domain(encoder->port); + intel_display_power_get(dev_priv, domain); + } + if (IS_GM45(dev_priv)) - return gm45_digital_port_connected(encoder); + ret = gm45_digital_port_connected(encoder); else - return g4x_digital_port_connected(encoder); + ret = g4x_digital_port_connected(encoder); + + if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) + intel_display_power_put(dev_priv, domain); + + return ret; } if (IS_GEN5(dev_priv)) @@ -5075,7 +5093,7 @@ intel_dp_detect(struct drm_connector *connector, connector->base.id, connector->name); WARN_ON(!drm_modeset_is_locked(&dev_priv->drm.mode_config.connection_mutex)); - intel_display_power_get(dev_priv, intel_dp->aux_power_domain); + intel_runtime_pm_get(dev_priv); /* Is port connected? eDP can't be disconnected */ if (!intel_dp_is_edp(intel_dp) && @@ -5084,6 +5102,8 @@ intel_dp_detect(struct drm_connector *connector, goto port_disconnected; } + intel_display_power_get(dev_priv, intel_dp->aux_power_domain); + if (intel_dp_is_edp(intel_dp)) status = edp_detect(intel_dp); else @@ -5116,6 +5136,7 @@ intel_dp_detect(struct drm_connector *connector, * with EDID on it */ intel_display_power_put(dev_priv, intel_dp->aux_power_domain); + intel_runtime_pm_put(dev_priv); return connector_status_disconnected; } @@ -5130,6 +5151,7 @@ intel_dp_detect(struct drm_connector *connector, if (ret) { intel_display_power_put(dev_priv, intel_dp->aux_power_domain); + intel_runtime_pm_put(dev_priv); return ret; } } @@ -5153,9 +5175,11 @@ intel_dp_detect(struct drm_connector *connector, intel_dp_check_service_irq(intel_dp); intel_display_power_put(dev_priv, intel_dp->aux_power_domain); + intel_runtime_pm_put(dev_priv); return status; port_not_detected: + intel_display_power_put(dev_priv, intel_dp->aux_power_domain); port_disconnected: memset(&intel_dp->compliance, 0, sizeof(intel_dp->compliance)); @@ -5168,7 +5192,7 @@ intel_dp_detect(struct drm_connector *connector, } else intel_dp_unset_edid(intel_dp); - intel_display_power_put(dev_priv, intel_dp->aux_power_domain); + intel_runtime_pm_put(dev_priv); return status; }