Skip to contentSkip to conversation

drm/i915/skl: handle port E in cpt_digital_port_connected

PATCH In review Jani Nikula 2 participants 4 messages Sep 18, 2015 – Sep 21, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/skl: handle port E in cpt_digital_port_connected

SKL port E handling was added in

commit 26951caf55d73ceb1967b0bf12f6d0b96853508e

Author: Xiong Zhang <[email protected]>
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 <[email protected]>
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.

---
 drivers/gpu/drm/i915/intel_dp.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_dp.c +3 -0
index a6872508adec..77e4115fc847 100644
@@ -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;
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
author Tested-by Tomi Sarvela on v1 1/1
#1 lore raw
Quoted 14 lines · Jani Nikula

SKL port E handling was added in

commit 26951caf55d73ceb1967b0bf12f6d0b96853508e

Author: Xiong Zhang <[email protected]>
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 <[email protected]>
Date:   Thu Aug 20 10:47:36 2015 +0300
Quoted 6 lines

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.

Quoted 21 lines
---
 drivers/gpu/drm/i915/intel_dp.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_dp.c +3 -0
index a6872508adec..77e4115fc847 100644
@@ -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;
Signature · 1 line
2.1.4
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#2 lore raw
In reply to Jani Nikula
Quoted 14 lines · Jani Nikula

SKL port E handling was added in

commit 26951caf55d73ceb1967b0bf12f6d0b96853508e

Author: Xiong Zhang <[email protected]>
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 <[email protected]>
Date:   Thu Aug 20 10:47:36 2015 +0300
Quoted 6 lines

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.

Quoted 25 lines
---
 drivers/gpu/drm/i915/intel_dp.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_dp.c +3 -0
index a6872508adec..77e4115fc847 100644
@@ -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;
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
Quoted 16 lines · Mika Kuoppala
Quoted 14 lines · Jani Nikula

SKL port E handling was added in

commit 26951caf55d73ceb1967b0bf12f6d0b96853508e

Author: Xiong Zhang <[email protected]>
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 <[email protected]>
Date:   Thu Aug 20 10:47:36 2015 +0300
Quoted 8 lines
Quoted 6 lines

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.

Thanks, pushed to drm-intel-next-queued.

BR,
Jani.

Quoted 26 lines
Quoted 26 lines
---
 drivers/gpu/drm/i915/intel_dp.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/intel_dp.c +3 -0
index a6872508adec..77e4115fc847 100644
@@ -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;
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx