<html><head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
</head><body bgcolor="#FFFFFF" text="#000000"><br>
Looks good to me.<br>
<br>
<span>Reviewed-by: Todd Previte <a class="moz-txt-link-rfc2396E" href="mailto:tprevite@gmail.com"><tprevite@gmail.com></a><br> 
</span><br>
<blockquote style="border: 0px none;" 
cite="mid:1400640904-16847-9-git-send-email-airlied@gmail.com" 
type="cite">
  <div style="margin:30px 25px 10px 25px;" class="__pbConvHr"><div 
style="display:table;width:100%;border-top:1px solid 
#EDEEF0;padding-top:5px">       <div 
style="display:table-cell;vertical-align:middle;padding-right:6px;"><img
 photoaddress="airlied@gmail.com" photoname="Dave Airlie" 
src="cid:part1.00050100.01040807@gmail.com" name="postbox-contact.jpg" 
height="25px" width="25px"></div>   <div 
style="display:table-cell;white-space:nowrap;vertical-align:middle;width:100%">
        <a moz-do-not-send="true" href="mailto:airlied@gmail.com" 
style="color:#737F92 
!important;padding-right:6px;font-weight:bold;text-decoration:none 
!important;">Dave Airlie</a></div>   <div 
style="display:table-cell;white-space:nowrap;vertical-align:middle;">   
  <font color="#9FA2A5"><span style="padding-left:6px">Tuesday, May 20, 
2014 7:55 PM</span></font></div></div></div>
  <div style="color:#888888;margin-left:24px;margin-right:24px;" 
__pbrmquotes="true" class="__pbConvBody"><div>From: Dave Airlie 
<a class="moz-txt-link-rfc2396E" href="mailto:airlied@redhat.com"><airlied@redhat.com></a><br><br>this is just prep work for mst 
support.<br><br>Signed-off-by: Dave Airlie <a class="moz-txt-link-rfc2396E" href="mailto:airlied@redhat.com"><airlied@redhat.com></a><br>---<br>
 drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++-------<br> 
drivers/gpu/drm/i915/intel_drv.h |  1 +<br> 2 files changed, 14 
insertions(+), 7 deletions(-)<br><br>diff --git 
a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c<br>index
 0ad4e96..a5b8b76 100644<br>--- a/drivers/gpu/drm/i915/intel_ddi.c<br>+++
 b/drivers/gpu/drm/i915/intel_ddi.c<br>@@ -364,6 +364,18 @@ void 
hsw_fdi_link_train(struct drm_crtc *crtc)<br>     DRM_ERROR("FDI link 
training failed!\n");<br> }<br> <br>+void intel_ddi_mode_set_dp(struct 
intel_encoder *encoder)<br>+{<br>+  struct intel_dp *intel_dp = 
enc_to_intel_dp(&encoder->base);<br>+      struct intel_digital_port 
*intel_dig_port =<br>+            enc_to_dig_port(&encoder->base);<br>+<br>+
        intel_dp->DP = intel_dig_port->saved_port_bits |<br>+               
DDI_BUF_CTL_ENABLE | DDI_BUF_EMP_400MV_0DB_HSW;<br>+      intel_dp->DP |= 
DDI_PORT_WIDTH(intel_dp->lane_count);<br>+<br>+}<br>+<br> static void
 intel_ddi_mode_set(struct intel_encoder *encoder)<br> {<br>        struct 
intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);<br>@@ -378,13 
+390,7 @@ static void intel_ddi_mode_set(struct intel_encoder *encoder)<br>
        crtc->eld_vld = false;<br>     if (type == INTEL_OUTPUT_DISPLAYPORT ||
 type == INTEL_OUTPUT_EDP) {<br>          struct intel_dp *intel_dp = 
enc_to_intel_dp(&encoder->base);<br>-              struct intel_digital_port 
*intel_dig_port =<br>-                    enc_to_dig_port(&encoder->base);<br>-<br>-
                intel_dp->DP = intel_dig_port->saved_port_bits |<br>-                              
DDI_BUF_CTL_ENABLE | DDI_BUF_EMP_400MV_0DB_HSW;<br>-              intel_dp->DP |=
 DDI_PORT_WIDTH(intel_dp->lane_count);<br>-<br>+         
intel_ddi_mode_set_dp(encoder);<br>               if (intel_dp->has_audio) {<br> 
                        DRM_DEBUG_DRIVER("DP audio on pipe %c on DDI\n",<br>                                     
pipe_name(crtc->pipe));<br>diff --git 
a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h<br>index
 b885df1..8e41cdc 100644<br>--- a/drivers/gpu/drm/i915/intel_drv.h<br>+++
 b/drivers/gpu/drm/i915/intel_drv.h<br>@@ -683,6 +683,7 @@ void 
intel_ddi_fdi_disable(struct drm_crtc *crtc);<br> void 
intel_ddi_get_config(struct intel_encoder *encoder,<br>                     struct 
intel_crtc_config *pipe_config);<br> <br>+void 
intel_ddi_mode_set_dp(struct intel_encoder *encoder);<br> <br> /* 
intel_display.c */<br> const char *intel_output_name(int output);<br></div></div>
  <div style="margin:30px 25px 10px 25px;" class="__pbConvHr"><div 
style="display:table;width:100%;border-top:1px solid 
#EDEEF0;padding-top:5px">       <div 
style="display:table-cell;vertical-align:middle;padding-right:6px;"><img
 photoaddress="airlied@gmail.com" photoname="Dave Airlie" 
src="cid:part1.00050100.01040807@gmail.com" name="postbox-contact.jpg" 
height="25px" width="25px"></div>   <div 
style="display:table-cell;white-space:nowrap;vertical-align:middle;width:100%">
        <a moz-do-not-send="true" href="mailto:airlied@gmail.com" 
style="color:#737F92 
!important;padding-right:6px;font-weight:bold;text-decoration:none 
!important;">Dave Airlie</a></div>   <div 
style="display:table-cell;white-space:nowrap;vertical-align:middle;">   
  <font color="#9FA2A5"><span style="padding-left:6px">Tuesday, May 20, 
2014 7:54 PM</span></font></div></div></div>
  <div style="color:#888888;margin-left:24px;margin-right:24px;" 
__pbrmquotes="true" class="__pbConvBody"><div>Hey,<br><br>So this set is
 pretty close to what I think we should be merging initially,<br><br>Since
 the last set, it makes fbcon and suspend/resume work a lot better,<br><br>I've
 also fixed a couple of bugs in -intel that make things work a lot<br>better.<br><br>I've
 bashed on this a bit using kms-flip from intel-gpu-tools, hacked<br>to 
add 3 monitor support.<br><br>It still generates a fair few i915 state 
checker backtraces, and some<br>of them are fairly hard to work out, it 
might be we should just tone<br>down the state checker for 
encoders/connectors with no actual hw backing<br>them.<br><br>Dave.<br><br>_______________________________________________<br>Intel-gfx
 mailing list<br><a class="moz-txt-link-abbreviated" href="mailto:Intel-gfx@lists.freedesktop.org">Intel-gfx@lists.freedesktop.org</a><br><a class="moz-txt-link-freetext" href="http://lists.freedesktop.org/mailman/listinfo/intel-gfx">http://lists.freedesktop.org/mailman/listinfo/intel-gfx</a><br></div></div>
</blockquote>
<br>
<div class="moz-signature">-- <br>
<div><font size="-1">Sent using Postbox:<br><a 
href="http://www.getpostbox.com"><span style="color: rgb(51, 102, 153);">http://www.getpostbox.com</span></a></font></div></div>
</body></html>