| From 0c2fb7c6c8fef2092051192095a7788231ba9a42 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> |
| Date: Mon, 2 May 2016 22:08:24 +0300 |
| Subject: drm/i915: Enable/disable TMDS output buffers in DP++ adaptor as needed |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| |
| commit 0c2fb7c6c8fef2092051192095a7788231ba9a42 upstream. |
| |
| To save a bit of power, let's try to turn off the TMDS output buffers |
| in DP++ adaptors when we're not driving the port. |
| |
| v2: Let's not forget DDI, toss in a debug message while at it |
| v3: Just do the TMDS output control based on adaptor type. With the |
| helper getting passed the type, we wouldn't actually have to |
| check at all in the driver, but the check eliminates the debug |
| output more honest |
| |
| Cc: Tore Anderson <tore@fud.no> |
| Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Cc: Shashank Sharma <shashank.sharma@intel.com> |
| Cc: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Link: http://patchwork.freedesktop.org/patch/msgid/1462216105-20881-4-git-send-email-ville.syrjala@linux.intel.com |
| Reviewed-by: Shashank Sharma <shashank.sharma@intel.com> |
| (cherry picked from commit b2ccb822d376d1bbbe5d1f9118d1488b25e6bc6d) |
| Signed-off-by: Jani Nikula <jani.nikula@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/i915/intel_ddi.c | 12 ++++++++++++ |
| drivers/gpu/drm/i915/intel_drv.h | 1 + |
| drivers/gpu/drm/i915/intel_hdmi.c | 20 ++++++++++++++++++++ |
| 3 files changed, 33 insertions(+) |
| |
| --- a/drivers/gpu/drm/i915/intel_ddi.c |
| +++ b/drivers/gpu/drm/i915/intel_ddi.c |
| @@ -2309,6 +2309,12 @@ static void intel_ddi_pre_enable(struct |
| enum port port = intel_ddi_get_encoder_port(intel_encoder); |
| int type = intel_encoder->type; |
| |
| + if (type == INTEL_OUTPUT_HDMI) { |
| + struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); |
| + |
| + intel_dp_dual_mode_set_tmds_output(intel_hdmi, true); |
| + } |
| + |
| intel_prepare_ddi_buffer(intel_encoder); |
| |
| if (type == INTEL_OUTPUT_EDP) { |
| @@ -2375,6 +2381,12 @@ static void intel_ddi_post_disable(struc |
| DPLL_CTRL2_DDI_CLK_OFF(port))); |
| else if (INTEL_INFO(dev)->gen < 9) |
| I915_WRITE(PORT_CLK_SEL(port), PORT_CLK_SEL_NONE); |
| + |
| + if (type == INTEL_OUTPUT_HDMI) { |
| + struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder); |
| + |
| + intel_dp_dual_mode_set_tmds_output(intel_hdmi, false); |
| + } |
| } |
| |
| static void intel_enable_ddi(struct intel_encoder *intel_encoder) |
| --- a/drivers/gpu/drm/i915/intel_drv.h |
| +++ b/drivers/gpu/drm/i915/intel_drv.h |
| @@ -1356,6 +1356,7 @@ void intel_hdmi_init_connector(struct in |
| struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder); |
| bool intel_hdmi_compute_config(struct intel_encoder *encoder, |
| struct intel_crtc_state *pipe_config); |
| +void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable); |
| |
| |
| /* intel_lvds.c */ |
| --- a/drivers/gpu/drm/i915/intel_hdmi.c |
| +++ b/drivers/gpu/drm/i915/intel_hdmi.c |
| @@ -836,6 +836,22 @@ static void hsw_set_infoframes(struct dr |
| intel_hdmi_set_hdmi_infoframe(encoder, adjusted_mode); |
| } |
| |
| +void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable) |
| +{ |
| + struct drm_i915_private *dev_priv = to_i915(intel_hdmi_to_dev(hdmi)); |
| + struct i2c_adapter *adapter = |
| + intel_gmbus_get_adapter(dev_priv, hdmi->ddc_bus); |
| + |
| + if (hdmi->dp_dual_mode.type < DRM_DP_DUAL_MODE_TYPE2_DVI) |
| + return; |
| + |
| + DRM_DEBUG_KMS("%s DP dual mode adaptor TMDS output\n", |
| + enable ? "Enabling" : "Disabling"); |
| + |
| + drm_dp_dual_mode_set_tmds_output(hdmi->dp_dual_mode.type, |
| + adapter, enable); |
| +} |
| + |
| static void intel_hdmi_prepare(struct intel_encoder *encoder) |
| { |
| struct drm_device *dev = encoder->base.dev; |
| @@ -845,6 +861,8 @@ static void intel_hdmi_prepare(struct in |
| const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode; |
| u32 hdmi_val; |
| |
| + intel_dp_dual_mode_set_tmds_output(intel_hdmi, true); |
| + |
| hdmi_val = SDVO_ENCODING_HDMI; |
| if (!HAS_PCH_SPLIT(dev) && crtc->config->limited_color_range) |
| hdmi_val |= HDMI_COLOR_RANGE_16_235; |
| @@ -1143,6 +1161,8 @@ static void intel_disable_hdmi(struct in |
| } |
| |
| intel_hdmi->set_infoframes(&encoder->base, false, NULL); |
| + |
| + intel_dp_dual_mode_set_tmds_output(intel_hdmi, false); |
| } |
| |
| static void g4x_disable_hdmi(struct intel_encoder *encoder) |