From patchwork Wed Aug 17 10:49:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kahola, Mika" X-Patchwork-Id: 9285907 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E0DDE60459 for ; Wed, 17 Aug 2016 12:44:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D58772859B for ; Wed, 17 Aug 2016 12:44:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA12D285A9; Wed, 17 Aug 2016 12:44:36 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable 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 90AC92859B for ; Wed, 17 Aug 2016 12:44:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DED716E878; Wed, 17 Aug 2016 12:44:27 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id C55DC6E821; Wed, 17 Aug 2016 10:50:18 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP; 17 Aug 2016 03:50:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.28,529,1464678000"; d="scan'208"; a="1015867340" Received: from sorvi.fi.intel.com ([10.237.72.167]) by orsmga001.jf.intel.com with ESMTP; 17 Aug 2016 03:50:17 -0700 From: Mika Kahola To: intel-gfx@lists.freedesktop.org Subject: [PATCH v8 12/12] drm/i915: Check TMDS clock DP to HDMI dongle Date: Wed, 17 Aug 2016 13:49:49 +0300 Message-Id: <1471430989-28161-14-git-send-email-mika.kahola@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471430989-28161-1-git-send-email-mika.kahola@intel.com> References: <1471430989-28161-1-git-send-email-mika.kahola@intel.com> X-Mailman-Approved-At: Wed, 17 Aug 2016 12:43:57 +0000 Cc: daniel.vetter@ffwll.ch, jim.bride@linux.intel.com, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Respect max TMDS clock frequency from DPCD for active DP to HDMI adapters. Signed-off-by: Mika Kahola Reviewed-by: Jim Bride --- drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_hdmi.c | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 1c700b0..b7fd551 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -817,6 +817,9 @@ struct intel_hdmi { i915_reg_t hdmi_reg; int ddc_bus; struct { + int max_tmds_clock; + } dp_to_hdmi; + struct { enum drm_dp_dual_mode_type type; int max_tmds_clock; } dp_dual_mode; diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 4df9f38..1469d00 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -1204,6 +1204,9 @@ static int hdmi_port_clock_limit(struct intel_hdmi *hdmi, int max_tmds_clock = intel_hdmi_source_max_tmds_clock(to_i915(dev)); if (respect_downstream_limits) { + if (hdmi->dp_to_hdmi.max_tmds_clock) + max_tmds_clock = min(max_tmds_clock, + hdmi->dp_to_hdmi.max_tmds_clock); if (hdmi->dp_dual_mode.max_tmds_clock) max_tmds_clock = min(max_tmds_clock, hdmi->dp_dual_mode.max_tmds_clock); @@ -1373,11 +1376,33 @@ intel_hdmi_unset_edid(struct drm_connector *connector) intel_hdmi->dp_dual_mode.type = DRM_DP_DUAL_MODE_NONE; intel_hdmi->dp_dual_mode.max_tmds_clock = 0; + intel_hdmi->dp_to_hdmi.max_tmds_clock = 0; + kfree(to_intel_connector(connector)->detect_edid); to_intel_connector(connector)->detect_edid = NULL; } static void +intel_hdmi_dp_adapter_detect(struct drm_connector *connector) +{ + struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector); + struct intel_digital_port *intel_dig_port = + hdmi_to_dig_port(intel_hdmi); + struct intel_dp *intel_dp = &intel_dig_port->dp; + int type = intel_dp->downstream_ports[0] & DP_DS_PORT_TYPE_MASK; + + if (type != DP_DS_PORT_TYPE_HDMI) + return; + + intel_hdmi->dp_to_hdmi.max_tmds_clock = + drm_dp_downstream_max_clock(intel_dp->dpcd, + intel_dp->downstream_ports); + + DRM_DEBUG_KMS("DP HDMI adaptor detected (max TMDS clock : %d kHz\n", + intel_hdmi->dp_to_hdmi.max_tmds_clock); +} + +static void intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector, bool has_edid) { struct drm_i915_private *dev_priv = to_i915(connector->dev); @@ -1438,6 +1463,8 @@ intel_hdmi_set_edid(struct drm_connector *connector, bool force) intel_hdmi_dp_dual_mode_detect(connector, edid != NULL); + intel_hdmi_dp_adapter_detect(connector); + intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS); }