From: Dave Airlie <airlied@gmail.com>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Subject: [PATCH 08/11] i915: split some DP modesetting code into a separate function
Date: Wed, 21 May 2014 12:55:01 +1000 [thread overview]
Message-ID: <1400640904-16847-9-git-send-email-airlied@gmail.com> (raw)
In-Reply-To: <1400640904-16847-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
next prev parent reply other threads:[~2014-05-21 2:55 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-21 2:54 [RFC] DisplayPort MST support Dave Airlie
2014-05-21 2:54 ` [PATCH 01/11] drm/dp_helper: add defines for DP 1.2 and " Dave Airlie
2014-05-23 4:22 ` Todd Previte
2014-05-23 5:57 ` Jingoo Han
2014-05-21 2:54 ` [PATCH 02/11] drm: add DP MST encoder type Dave Airlie
2014-05-23 4:22 ` [Intel-gfx] " Todd Previte
2014-05-21 2:54 ` [PATCH 03/11] drm/i915: add some registers need for displayport MST support Dave Airlie
2014-05-23 4:22 ` [Intel-gfx] " Todd Previte
2014-05-21 2:54 ` [PATCH 04/11] drm/crtc: add interface to reinitialise the legacy mode group Dave Airlie
2014-05-23 4:22 ` Todd Previte
2014-05-21 2:54 ` [PATCH 05/11] drm/fb_helper: allow adding/removing connectors later Dave Airlie
2014-06-17 15:23 ` Todd Previte
2014-05-21 2:54 ` [PATCH 06/11] drm: add a path blob property Dave Airlie
2014-06-17 15:23 ` [Intel-gfx] " Todd Previte
2014-05-21 2:55 ` [PATCH 07/11] drm/helper: add Displayport multi-stream helper (v0.5) Dave Airlie
2014-06-17 15:23 ` Todd Previte
2014-05-21 2:55 ` Dave Airlie [this message]
2014-06-17 15:23 ` [PATCH 08/11] i915: split some DP modesetting code into a separate function Todd Previte
2014-05-21 2:55 ` [PATCH 09/11] drm/i915: check connector->encoder before using it Dave Airlie
2014-06-17 15:23 ` Todd Previte
2014-05-21 2:55 ` [PATCH 10/11] i915: add DP 1.2 MST support (v0.5) Dave Airlie
2014-05-21 2:55 ` [PATCH 11/11] i915: mst topology dumper in debugfs (v0.2) 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=1400640904-16847-9-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).