All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Airlie <airlied@gmail.com>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Subject: [PATCH 06/11] i915: split some DP modesetting code into a separate function
Date: Thu,  5 Jun 2014 14:01:33 +1000	[thread overview]
Message-ID: <1401940898-2825-7-git-send-email-airlied@gmail.com> (raw)
In-Reply-To: <1401940898-2825-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 | 18 +++++++++++++-----
 drivers/gpu/drm/i915/intel_drv.h |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index a80cb3e..aeb398b 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_init_dp_buf_reg(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 struct intel_encoder *
 intel_ddi_get_crtc_encoder(struct drm_crtc *crtc)
 {
@@ -1266,12 +1278,8 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)
 
 	if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP) {
 		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
-		struct intel_digital_port *intel_dig_port =
-			enc_to_dig_port(encoder);
 
-		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_init_dp_buf_reg(intel_encoder);
 
 		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
 		intel_dp_start_link_train(intel_dp);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 9666ec3..da6c440 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -714,6 +714,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_init_dp_buf_reg(struct intel_encoder *encoder);
 
 /* intel_display.c */
 const char *intel_output_name(int output);
-- 
1.9.3

  parent reply	other threads:[~2014-06-05  4:01 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-05  4:01 drm/i915 mst support Dave Airlie
2014-06-05  4:01 ` [PATCH 01/11] drm/i915: add some registers need for displayport MST support Dave Airlie
2014-06-05  4:01 ` [PATCH 02/11] drm/crtc: add interface to reinitialise the legacy mode group Dave Airlie
2014-06-05  4:01 ` [PATCH 03/11] drm/fb_helper: allow adding/removing connectors later Dave Airlie
2014-06-05  4:01 ` [PATCH 04/11] drm: add a path blob property Dave Airlie
2014-06-05  4:01 ` [PATCH 05/11] drm/helper: add Displayport multi-stream helper (v0.6) Dave Airlie
2014-06-05  4:01 ` Dave Airlie [this message]
2014-06-05  4:01 ` [PATCH 07/11] drm/i915: check connector->encoder before using it Dave Airlie
2014-06-05  4:01 ` [PATCH 08/11] drm/i915: split some conversion functions out into separate functions Dave Airlie
2014-06-05  4:01 ` [PATCH 09/11] i915: add DP 1.2 MST support (v0.6) Dave Airlie
2014-07-22 20:02   ` Paulo Zanoni
2014-07-23  4:32     ` Dave Airlie
2014-07-29 10:46       ` [Intel-gfx] " Daniel Vetter
2014-07-29 10:50         ` Dave Airlie
2014-07-29 11:00           ` [Intel-gfx] " Daniel Vetter
2014-06-05  4:01 ` [PATCH 10/11] i915: mst topology dumper in debugfs (v0.2) Dave Airlie
2014-06-05  4:01 ` [PATCH 11/11] HACK: i915: avoid with fbdev init warning doesn't seem to matter Dave Airlie

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=1401940898-2825-7-git-send-email-airlied@gmail.com \
    --to=airlied@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.