dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Airlie <airlied@gmail.com>
To: dri-devel@lists.freedesktop.org
Subject: [PATCH 6/8] i915: split some DP modesetting code into a separate function
Date: Fri,  2 May 2014 14:39:43 +1000	[thread overview]
Message-ID: <1399005585-2396-7-git-send-email-airlied@gmail.com> (raw)
In-Reply-To: <1399005585-2396-1-git-send-email-airlied@gmail.com>

From: Dave Airlie <airlied@redhat.com>

this is just prep work for mst support.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++-------
 drivers/gpu/drm/i915/intel_drv.h |  1 +
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 0ad4e96..a5b8b76 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -364,6 +364,18 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)
 	DRM_ERROR("FDI link training failed!\n");
 }
 
+void intel_ddi_mode_set_dp(struct intel_encoder *encoder)
+{
+	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
+	struct intel_digital_port *intel_dig_port =
+		enc_to_dig_port(&encoder->base);
+
+	intel_dp->DP = intel_dig_port->saved_port_bits |
+		DDI_BUF_CTL_ENABLE | DDI_BUF_EMP_400MV_0DB_HSW;
+	intel_dp->DP |= DDI_PORT_WIDTH(intel_dp->lane_count);
+
+}
+
 static void intel_ddi_mode_set(struct intel_encoder *encoder)
 {
 	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
@@ -378,13 +390,7 @@ static void intel_ddi_mode_set(struct intel_encoder *encoder)
 	crtc->eld_vld = false;
 	if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP) {
 		struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
-		struct intel_digital_port *intel_dig_port =
-			enc_to_dig_port(&encoder->base);
-
-		intel_dp->DP = intel_dig_port->saved_port_bits |
-			       DDI_BUF_CTL_ENABLE | DDI_BUF_EMP_400MV_0DB_HSW;
-		intel_dp->DP |= DDI_PORT_WIDTH(intel_dp->lane_count);
-
+		intel_ddi_mode_set_dp(encoder);
 		if (intel_dp->has_audio) {
 			DRM_DEBUG_DRIVER("DP audio on pipe %c on DDI\n",
 					 pipe_name(crtc->pipe));
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index b885df1..8e41cdc 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -683,6 +683,7 @@ void intel_ddi_fdi_disable(struct drm_crtc *crtc);
 void intel_ddi_get_config(struct intel_encoder *encoder,
 			  struct intel_crtc_config *pipe_config);
 
+void intel_ddi_mode_set_dp(struct intel_encoder *encoder);
 
 /* intel_display.c */
 const char *intel_output_name(int output);
-- 
1.9.0

  parent reply	other threads:[~2014-05-02  4:39 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-02  4:39 [RFC] drm + i915 DP MST code preview Dave Airlie
2014-05-02  4:39 ` [PATCH 1/8] drm/dp_helper: add defines for DP 1.2 and MST support Dave Airlie
2014-05-02  4:39 ` [PATCH 2/8] drm: add DP MST encoder type Dave Airlie
2014-05-02  4:39 ` [PATCH 3/8] drm/i915: add some registers need for displayport MST support Dave Airlie
2014-05-02  4:39 ` [PATCH 4/8] drm/crtc: add interface to reinitialise the legacy mode group Dave Airlie
2014-05-02  4:39 ` [PATCH 5/8] drm/helper: add Displayport multi-stream helper Dave Airlie
2014-05-02  4:39 ` Dave Airlie [this message]
2014-05-02  4:39 ` [PATCH 7/8] drm/i915: check connector->encoder before using it Dave Airlie
2014-05-02  4:39 ` [PATCH 8/8] i915: add DP 1.2 MST support (v0.1) Dave Airlie
2014-05-02  4:51 ` [RFC] drm + i915 DP MST code preview Dave Airlie
2014-05-02  8:52 ` Chris Wilson
2014-05-02 21:08   ` Dave Airlie
2014-05-03  9:00     ` Chris Wilson
2014-05-07  7:16       ` Aaron Plattner
2014-05-07  8:07         ` Daniel Vetter
2014-05-07 16:46           ` Aaron Plattner
2014-05-07 22:24           ` Dave Airlie
2014-05-08  1:56             ` Dave Airlie
2014-05-08  7:24               ` Chris Wilson
2014-05-08  7:32                 ` Dave Airlie
2014-05-07  9:00         ` Dave Airlie
2014-05-07 16:42           ` Aaron Plattner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1399005585-2396-7-git-send-email-airlied@gmail.com \
    --to=airlied@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox