From patchwork Fri Aug 16 00:30:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Ausmus X-Patchwork-Id: 2845347 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 12CA09F239 for ; Fri, 16 Aug 2013 00:53:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 28932202B1 for ; Fri, 16 Aug 2013 00:53:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 406A82021E for ; Fri, 16 Aug 2013 00:53:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 913ED43A5A for ; Thu, 15 Aug 2013 17:53:50 -0700 (PDT) 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 CEFB3E6025 for ; Thu, 15 Aug 2013 17:32:08 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 15 Aug 2013 17:29:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.89,889,1367996400"; d="scan'208";a="387901437" Received: from jausmus-gentoo-dev5.jf.intel.com ([10.7.198.60]) by orsmga002.jf.intel.com with ESMTP; 15 Aug 2013 17:31:55 -0700 From: james.ausmus@intel.com To: intel-gfx@lists.freedesktop.org Date: Thu, 15 Aug 2013 17:30:33 -0700 Message-Id: <1376613069-15790-9-git-send-email-james.ausmus@intel.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1376613069-15790-1-git-send-email-james.ausmus@intel.com> References: <1376613069-15790-1-git-send-email-james.ausmus@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] Restrict DP sink wake up to non-EDP. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-7.0 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 From: Stuart Abercrombie Doing it on EDP was producing a kernel warning with screen power down. BUG=chrome-os-partner:17893 TEST=No warning with screen power down. Apple mini DP->VGA adapter still works. Change-Id: I769c31b43753c7ced7cb0b2f0d50fc96c2486779 [sonnyrao: 3.8: fixup for 3.8] Reviewed-on: https://gerrit.chromium.org/gerrit/45814 Reviewed-by: Stéphane Marchesin Commit-Queue: Stuart Abercrombie Tested-by: Stuart Abercrombie --- drivers/gpu/drm/i915/intel_dp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index f886ae9..d896cb8 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -2337,7 +2337,7 @@ intel_dp_detect(struct drm_connector *connector, bool force) intel_dp->has_audio = false; /* Ensure the sink is awake for DPCD/EDID reads. */ - if (connector->dpms != DRM_MODE_DPMS_ON) { + if (!is_edp(intel_dp) && connector->dpms != DRM_MODE_DPMS_ON) { /* Bypass DPCD check, since we obtain it during detection. */ intel_dp_do_sink_dpms(intel_dp, DRM_MODE_DPMS_ON); } @@ -2352,7 +2352,7 @@ intel_dp_detect(struct drm_connector *connector, bool force) DRM_DEBUG_KMS("DPCD: %s\n", dpcd_hex_dump); if (status != connector_status_connected) { - if (connector->dpms != DRM_MODE_DPMS_ON) + if (!is_edp(intel_dp) && connector->dpms != DRM_MODE_DPMS_ON) intel_dp_do_sink_dpms(intel_dp, connector->dpms); return status; } @@ -2373,7 +2373,7 @@ intel_dp_detect(struct drm_connector *connector, bool force) intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT; /* Restore the sink state */ - if (connector->dpms != DRM_MODE_DPMS_ON) + if (!is_edp(intel_dp) && connector->dpms != DRM_MODE_DPMS_ON) intel_dp_do_sink_dpms(intel_dp, connector->dpms); return connector_status_connected;