On Fri, Mar 08, 2013 at 10:46:03AM -0800, Jesse Barnes wrote: > Port C is for eDP. Port B is shared between HDMI and DP. > > Signed-off-by: Jesse Barnes <jbar...@virtuousgeek.org> > --- > drivers/gpu/drm/i915/intel_display.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index 3b085bb..3459c64 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -8557,10 +8557,6 @@ static void intel_setup_outputs(struct drm_device *dev) > if (I915_READ(VLV_DISPLAY_BASE + DP_B) & DP_DETECTED) > intel_dp_init(dev, VLV_DISPLAY_BASE + DP_B, > PORT_B); > } > - > - if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIC) & SDVO_DETECTED) > - intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIC, > - PORT_C);
Meh, patch conflict since some random other patch in this series removed an empty line here. Iirc I've spotted that in the infamous "frob vlv pll stuff harder over the dpio sideband" patch. Merge a few other random patches which will hopefully only blow up on the next vlv silicon iteration ;-) Cheers, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx
