On Mon, 21 Sep 2015, Mika Kuoppala <mika.kuoppala@xxxxxxxxxxxxxxx> wrote: > Jani Nikula <jani.nikula@xxxxxxxxx> writes: > >> SKL port E handling was added in >> >> commit 26951caf55d73ceb1967b0bf12f6d0b96853508e >> Author: Xiong Zhang <xiong.y.zhang@xxxxxxxxx> >> Date: Mon Aug 17 15:55:50 2015 +0800 >> >> drm/i915/skl: enable DDI-E hotplug >> >> but the whole function was moved in a another branch in >> >> commit b93433ccf64846820b9448f5ff5dd4348b58a8ed >> Author: Jani Nikula <jani.nikula@xxxxxxxxx> >> Date: Thu Aug 20 10:47:36 2015 +0300 >> >> drm/i915: move ibx_digital_port_connected to intel_dp.c >> >> and the addition was lost at some backmerge that I was unable to >> identify. Put it back in. >> >> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > Reviewed-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxx> Thanks, pushed to drm-intel-next-queued. BR, Jani. > >> --- >> drivers/gpu/drm/i915/intel_dp.c | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >> index a6872508adec..77e4115fc847 100644 >> --- a/drivers/gpu/drm/i915/intel_dp.c >> +++ b/drivers/gpu/drm/i915/intel_dp.c >> @@ -4583,6 +4583,9 @@ static bool cpt_digital_port_connected(struct drm_i915_private *dev_priv, >> case PORT_D: >> bit = SDE_PORTD_HOTPLUG_CPT; >> break; >> + case PORT_E: >> + bit = SDE_PORTE_HOTPLUG_SPT; >> + break; >> default: >> MISSING_CASE(port->port); >> return false; >> -- >> 2.1.4 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
