| Message ID | 1442580890-2954-1-git-send-email-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 18 Sep 2015, Jani Nikula <jani.nikula@intel.com> wrote: > SKL port E handling was added in > > commit 26951caf55d73ceb1967b0bf12f6d0b96853508e > Author: Xiong Zhang <xiong.y.zhang@intel.com> > 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@intel.com> > 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@intel.com> Tested-by: Tomi Sarvela <tomix.p.sarvela@intel.com> > --- > 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 >
Jani Nikula <jani.nikula@intel.com> writes: > SKL port E handling was added in > > commit 26951caf55d73ceb1967b0bf12f6d0b96853508e > Author: Xiong Zhang <xiong.y.zhang@intel.com> > 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@intel.com> > 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@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> > --- > 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@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Mon, 21 Sep 2015, Mika Kuoppala <mika.kuoppala@linux.intel.com> wrote: > Jani Nikula <jani.nikula@intel.com> writes: > >> SKL port E handling was added in >> >> commit 26951caf55d73ceb1967b0bf12f6d0b96853508e >> Author: Xiong Zhang <xiong.y.zhang@intel.com> >> 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@intel.com> >> 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@intel.com> > > Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com> 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@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
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;
SKL port E handling was added in commit 26951caf55d73ceb1967b0bf12f6d0b96853508e Author: Xiong Zhang <xiong.y.zhang@intel.com> 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@intel.com> 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@intel.com> --- drivers/gpu/drm/i915/intel_dp.c | 3 +++ 1 file changed, 3 insertions(+)