From patchwork Mon Apr 13 20:51:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paauwe, Bob J" X-Patchwork-Id: 6211751 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 53E7E9F725 for ; Mon, 13 Apr 2015 20:49:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 762862034E for ; Mon, 13 Apr 2015 20:49:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 572A4202E9 for ; Mon, 13 Apr 2015 20:49:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 807A46E608; Mon, 13 Apr 2015 13:49:07 -0700 (PDT) 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 ESMTP id 91CC46E292 for ; Mon, 13 Apr 2015 13:49:04 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP; 13 Apr 2015 13:49:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,572,1422950400"; d="scan'208";a="480412814" Received: from bpaauwe-desk.fm.intel.com ([10.1.134.218]) by FMSMGA003.fm.intel.com with ESMTP; 13 Apr 2015 13:49:03 -0700 From: Bob Paauwe To: intel-gfx Date: Mon, 13 Apr 2015 13:51:06 -0700 Message-Id: <1428958271-15653-6-git-send-email-bob.j.paauwe@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1428958271-15653-1-git-send-email-bob.j.paauwe@intel.com> References: <1428958271-15653-1-git-send-email-bob.j.paauwe@intel.com> Subject: [Intel-gfx] [RFC 05/10] drm/i915/config: Add init-time configuration of DP max link rate. 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 sink does not provide a maximum link rate, then check the connector configuration before defaulting to the lowest allowed link rate. Signed-off-by: Bob Paauwe --- drivers/gpu/drm/i915/intel_dp.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index b6944b9..b05ff6d 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -129,6 +129,9 @@ static int intel_dp_max_link_bw(struct intel_dp *intel_dp) { int max_link_bw = intel_dp->dpcd[DP_MAX_LINK_RATE]; + int cfg_max_link_bw = DP_LINK_BW_1_62; + struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); + struct drm_device *dev = intel_dig_port->base.base.dev; switch (max_link_bw) { case DP_LINK_BW_1_62: @@ -136,9 +139,15 @@ intel_dp_max_link_bw(struct intel_dp *intel_dp) case DP_LINK_BW_5_4: break; default: - WARN(1, "invalid max DP link bw val %x, using 1.62Gbps\n", - max_link_bw); - max_link_bw = DP_LINK_BW_1_62; + intel_config_get_integer(to_i915(dev), + CFG_CONNECTOR, + intel_dp->attached_connector->base.name, + "Maximum DPCD Rate", + &cfg_max_link_bw); + + WARN(1, "invalid max DP link bw val %x, using %x\n", + max_link_bw, cfg_max_link_bw); + max_link_bw = cfg_max_link_bw; break; } return max_link_bw;