drm/i915: revert intel_dp_probe_oui call during HPD interrupt handler
Subsystems (2)
PATCH 1/1 drm/i915: revert intel_dp_probe_oui call during HPD interrupt handler
From: Clint Taylor <[email protected]>
Remove OUI read function from the lower half interrupt handler. Upon closing the eDP panel lid an HPD interrupt is generated. The lower half handler calls intel_dp_probe_oui() as part of intel_dp_detect(). intel_dp_probe_oui() enables eDP VDD and subsequently disables eDP VDD causing another HPD interrupt. This cycle repeats every 3.6 seconds with VDD asserted for 3.5 of those seconds until the lid is opened again.
Revert of 0d198328538276c4459ef5de081e68ae60e6c4c2 Revert of 351cfc34db8decb0c5cc1aac7cf1780a0e45c8b1
--- drivers/gpu/drm/i915/intel_dp.c | 23 ----------------------- 1 file changed, 23 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +0 -23
@@ -2867,27 +2867,6 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)return true; } -static void -intel_dp_probe_oui (struct intel_dp *intel_dp) -{ -u8 buf[3 ]; - -if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT ] &DP_OUI_SUPPORT )) -return ; - -intel_edp_panel_vdd_on (intel_dp); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_SINK_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Sink OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_BRANCH_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Branch OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -edp_panel_vdd_off (intel_dp, false); -} -int intel_dp_sink_crc (struct intel_dp *intel_dp,u8 *crc) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);
@@ -3178,8 +3157,6 @@ intel_dp_detect(struct drm_connector *connector, bool force)if (status != connector_status_connected) goto out; -intel_dp_probe_oui (intel_dp); -if (intel_dp->force_audio !=HDMI_AUDIO_AUTO ) { intel_dp->has_audio = (intel_dp->force_audio ==HDMI_AUDIO_ON ); }else {
Signature · 1 line
1.7.9.5
Quoted 9 lines · On Wed, Jun 04, 2014 at 03:29:41PM -0700, [email protected] wrote:
From: Clint Taylor <[email protected]>
Remove OUI read function from the lower half interrupt handler. Upon closing the eDP panel lid an HPD interrupt is generated. The lower half handler calls
intel_dp_probe_oui()as part ofintel_dp_detect().intel_dp_probe_oui()enables eDP VDD and subsequently disables eDP VDD causing another HPD interrupt. This cycle repeats every 3.6 seconds with VDD asserted for 3.5 of those seconds until the lid is opened again.
Quoted 4 lines
Revert of
0d198328538276c4459ef5de081e68ae60e6c4c2Revert of351cfc34db8decb0c5cc1aac7cf1780a0e45c8b1Signed-off-by Clint Taylor <[email protected]>
Hm, this is funky ... we currently don't handle port A hotplug events, and we filter hotplug events properly.
How does this exactly blow up for you? Or is this port D?
We might want to have some filtering here checking whether the edp panel is on or off. Also the delayed work is _way_ too long. -Daniel
Quoted 52 lines
--- drivers/gpu/drm/i915/intel_dp.c | 23 ----------------------- 1 file changed, 23 deletions(-)drivers/gpu/drm/i915/intel_dp.c +0
-23@@ -2867,27 +2867,6 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)return true; } -static void -intel_dp_probe_oui (struct intel_dp *intel_dp) -{ -u8 buf[3 ]; - -if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT ] &DP_OUI_SUPPORT )) -return ; - -intel_edp_panel_vdd_on (intel_dp); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_SINK_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Sink OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_BRANCH_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Branch OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -edp_panel_vdd_off (intel_dp, false); -} -int intel_dp_sink_crc (struct intel_dp *intel_dp,u8 *crc) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);@@ -3178,8 +3157,6 @@ intel_dp_detect(struct drm_connector *connector, bool force)if (status != connector_status_connected) goto out; -intel_dp_probe_oui (intel_dp); -if (intel_dp->force_audio !=HDMI_AUDIO_AUTO ) { intel_dp->has_audio = (intel_dp->force_audio ==HDMI_AUDIO_ON ); }else {Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Jani Nikula
maintainerQuoted 15 lines · Daniel Vetter
Quoted 9 lines · On Wed, Jun 04, 2014 at 03:29:41PM -0700, [email protected] wrote:
From: Clint Taylor <[email protected]>
Remove OUI read function from the lower half interrupt handler. Upon closing the eDP panel lid an HPD interrupt is generated. The lower half handler calls
intel_dp_probe_oui()as part ofintel_dp_detect().intel_dp_probe_oui()enables eDP VDD and subsequently disables eDP VDD causing another HPD interrupt. This cycle repeats every 3.6 seconds with VDD asserted for 3.5 of those seconds until the lid is opened again.Quoted 4 lines
Revert of
0d198328538276c4459ef5de081e68ae60e6c4c2Revert of351cfc34db8decb0c5cc1aac7cf1780a0e45c8b1Signed-off-by Clint Taylor <[email protected]>
Quoted 7 lines
Hm, this is funky ... we currently don't handle port A hotplug events, and we filter hotplug events properly.
How does this exactly blow up for you? Or is this port D?
We might want to have some filtering here checking whether the edp panel is on or off. Also the delayed work is _way_ too long.
Dave just posted a patch that depends on the OUI [1].
BR,
Jani.
[1] http://mid.gmane.org/[email protected]
Quoted 63 lines
-Daniel
Quoted 52 lines
--- drivers/gpu/drm/i915/intel_dp.c | 23 ----------------------- 1 file changed, 23 deletions(-)drivers/gpu/drm/i915/intel_dp.c +0
-23@@ -2867,27 +2867,6 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)return true; } -static void -intel_dp_probe_oui (struct intel_dp *intel_dp) -{ -u8 buf[3 ]; - -if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT ] &DP_OUI_SUPPORT )) -return ; - -intel_edp_panel_vdd_on (intel_dp); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_SINK_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Sink OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_BRANCH_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Branch OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -edp_panel_vdd_off (intel_dp, false); -} -int intel_dp_sink_crc (struct intel_dp *intel_dp,u8 *crc) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);@@ -3178,8 +3157,6 @@ intel_dp_detect(struct drm_connector *connector, bool force)if (status != connector_status_connected) goto out; -intel_dp_probe_oui (intel_dp); -if (intel_dp->force_audio !=HDMI_AUDIO_AUTO ) { intel_dp->has_audio = (intel_dp->force_audio ==HDMI_AUDIO_ON ); }else {Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Quoted 19 lines · Jani Nikula
Quoted 18 lines · Daniel Vetter
Quoted 9 lines · On Wed, Jun 04, 2014 at 03:29:41PM -0700, [email protected] wrote:
From: Clint Taylor <[email protected]>
Remove OUI read function from the lower half interrupt handler. Upon closing the eDP panel lid an HPD interrupt is generated. The lower half handler calls
intel_dp_probe_oui()as part ofintel_dp_detect().intel_dp_probe_oui()enables eDP VDD and subsequently disables eDP VDD causing another HPD interrupt. This cycle repeats every 3.6 seconds with VDD asserted for 3.5 of those seconds until the lid is opened again.Quoted 4 lines
Revert of
0d198328538276c4459ef5de081e68ae60e6c4c2Revert of351cfc34db8decb0c5cc1aac7cf1780a0e45c8b1Signed-off-by Clint Taylor <[email protected]>Hm, this is funky ... we currently don't handle port A hotplug events, and we filter hotplug events properly.
Quoted 6 lines
Quoted 4 lines
How does this exactly blow up for you? Or is this port D?
We might want to have some filtering here checking whether the edp panel is on or off. Also the delayed work is _way_ too long.
Dave just posted a patch that depends on the OUI [1].
I didn't see any changes to intel_dp_probe_oui() in Dave's patches. The function is still a NOP as it doesn't save the OUI reads.
I'm also concerned about his intel_dp_probe_mst() as it also turns on and off eDP VDD to read the DPCD registers. In the intel_dp_detect() function of his patches he is now calling intel_dp_probe_oui() then immediately calls intel_dp_probe_mst() resulting in the panel being turned on and off twice.
Clint
Quoted 75 lines
BR,
Jani.[1] http://mid.gmane.org/[email protected]
Quoted 63 lines
-Daniel
Quoted 48 lines
--- drivers/gpu/drm/i915/intel_dp.c | 23 ----------------------- 1 file changed, 23 deletions(-)drivers/gpu/drm/i915/intel_dp.c +0
-24@@ -2867,27 +2867,6 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)return true; } -static void -intel_dp_probe_oui (struct intel_dp *intel_dp) -{ -u8 buf[3 ]; - -if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT ] &DP_OUI_SUPPORT )) -return ; - -intel_edp_panel_vdd_on (intel_dp); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_SINK_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Sink OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_BRANCH_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Branch OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -edp_panel_vdd_off (intel_dp, false); -} -int intel_dp_sink_crc (struct intel_dp *intel_dp,u8 *crc) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);@@ -3178,8 +3157,6 @@ intel_dp_detect(struct drm_connector *connector, bool force)if (status != connector_status_connected) goto out; -intel_dp_probe_oui (intel_dp); -if (intel_dp->force_audio !=HDMI_AUDIO_AUTO ) { intel_dp->has_audio = (intel_dp->force_audio ==HDMI_AUDIO_ON ); }else { --1.7.9.5
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 22 lines · Clint Taylor
Quoted 21 lines · Jani Nikula
Quoted 20 lines · Daniel Vetter
Quoted 9 lines · On Wed, Jun 04, 2014 at 03:29:41PM -0700, [email protected] wrote:
From: Clint Taylor <[email protected]>
Remove OUI read function from the lower half interrupt handler. Upon closing the eDP panel lid an HPD interrupt is generated. The lower half handler calls
intel_dp_probe_oui()as part ofintel_dp_detect().intel_dp_probe_oui()enables eDP VDD and subsequently disables eDP VDD causing another HPD interrupt. This cycle repeats every 3.6 seconds with VDD asserted for 3.5 of those seconds until the lid is opened again.Quoted 4 lines
Revert of
0d198328538276c4459ef5de081e68ae60e6c4c2Revert of351cfc34db8decb0c5cc1aac7cf1780a0e45c8b1Signed-off-by Clint Taylor <[email protected]>Hm, this is funky ... we currently don't handle port A hotplug events, and we filter hotplug events properly.
How does this exactly blow up for you? Or is this port D?
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
We might want to have some filtering here checking whether the edp panel is on or off. Also the delayed work is _way_ too long.
Dave just posted a patch that depends on the OUI [1].
I didn't see any changes to
intel_dp_probe_oui()in Dave's patches. The function is still a NOP as it doesn't save the OUI reads.
See the referenced "drm/i915/dp: add support for load detect Apple DP->VGA dongles" patch, it adds more logic to the end of intel_dp_probe_oui(). I'm not talking about the MST series.
BR,
Jani.
Quoted 85 lines
I'm also concerned about his
intel_dp_probe_mst()as it also turns on and off eDP VDD to read the DPCD registers. In theintel_dp_detect()function of his patches he is now callingintel_dp_probe_oui()then immediately callsintel_dp_probe_mst()resulting in the panel being turned on and off twice.Clint
Quoted 75 lines
BR,
Jani.[1] http://mid.gmane.org/[email protected]
Quoted 63 lines
-Daniel
Quoted 48 lines
--- drivers/gpu/drm/i915/intel_dp.c | 23 ----------------------- 1 file changed, 23 deletions(-)drivers/gpu/drm/i915/intel_dp.c +0
-24@@ -2867,27 +2867,6 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)return true; } -static void -intel_dp_probe_oui (struct intel_dp *intel_dp) -{ -u8 buf[3 ]; - -if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT ] &DP_OUI_SUPPORT )) -return ; - -intel_edp_panel_vdd_on (intel_dp); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_SINK_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Sink OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_BRANCH_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Branch OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -edp_panel_vdd_off (intel_dp, false); -} -int intel_dp_sink_crc (struct intel_dp *intel_dp,u8 *crc) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);@@ -3178,8 +3157,6 @@ intel_dp_detect(struct drm_connector *connector, bool force)if (status != connector_status_connected) goto out; -intel_dp_probe_oui (intel_dp); -if (intel_dp->force_audio !=HDMI_AUDIO_AUTO ) { intel_dp->has_audio = (intel_dp->force_audio ==HDMI_AUDIO_ON ); }else { --1.7.9.5
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Dave Airlie
maintainerQuoted 26 lines · Jani Nikula
Quoted 25 lines · Clint Taylor
Quoted 24 lines · Jani Nikula
Quoted 22 lines · Daniel Vetter
Quoted 9 lines · On Wed, Jun 04, 2014 at 03:29:41PM -0700, [email protected] wrote:
From: Clint Taylor <[email protected]>
Remove OUI read function from the lower half interrupt handler. Upon closing the eDP panel lid an HPD interrupt is generated. The lower half handler calls
intel_dp_probe_oui()as part ofintel_dp_detect().intel_dp_probe_oui()enables eDP VDD and subsequently disables eDP VDD causing another HPD interrupt. This cycle repeats every 3.6 seconds with VDD asserted for 3.5 of those seconds until the lid is opened again.Quoted 4 lines
Revert of
0d198328538276c4459ef5de081e68ae60e6c4c2Revert of351cfc34db8decb0c5cc1aac7cf1780a0e45c8b1Signed-off-by Clint Taylor <[email protected]>Hm, this is funky ... we currently don't handle port A hotplug events, and we filter hotplug events properly.
How does this exactly blow up for you? Or is this port D?
We might want to have some filtering here checking whether the edp panel is on or off. Also the delayed work is _way_ too long.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Dave just posted a patch that depends on the OUI [1].
I didn't see any changes to
intel_dp_probe_oui()in Dave's patches. The function is still a NOP as it doesn't save the OUI reads.See the referenced "drm/i915/dp: add support for load detect Apple
DP->VGAdongles" patch, it adds more logic to the end ofintel_dp_probe_oui(). I'm not talking about the MST series.
My patch is actually broken on non-MST due to the OUI being read too late.
We only read the OUI if the intel_dp_detect passes as connected, however if we have a dongle plugged in without any EDID on it we won't ever get that far.
MST branch fixes that anyways by probing the OUIs if we get the DPCD without error.
My edp panel bits are all cut-n-paste anyways. maybe we should hold the edp on for long periods around that whole probing.
Dave.
Quoted 93 lines
BR,
Jani.Quoted 85 lines
I'm also concerned about his
intel_dp_probe_mst()as it also turns on and off eDP VDD to read the DPCD registers. In theintel_dp_detect()function of his patches he is now callingintel_dp_probe_oui()then immediately callsintel_dp_probe_mst()resulting in the panel being turned on and off twice.Clint
Quoted 75 lines
BR,
Jani.[1] http://mid.gmane.org/[email protected]
Quoted 63 lines
-Daniel
Quoted 48 lines
--- drivers/gpu/drm/i915/intel_dp.c | 23 ----------------------- 1 file changed, 23 deletions(-)drivers/gpu/drm/i915/intel_dp.c +0
-24@@ -2867,27 +2867,6 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)return true; } -static void -intel_dp_probe_oui (struct intel_dp *intel_dp) -{ -u8 buf[3 ]; - -if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT ] &DP_OUI_SUPPORT )) -return ; - -intel_edp_panel_vdd_on (intel_dp); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_SINK_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Sink OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_BRANCH_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Branch OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -edp_panel_vdd_off (intel_dp, false); -} -int intel_dp_sink_crc (struct intel_dp *intel_dp,u8 *crc) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);@@ -3178,8 +3157,6 @@ intel_dp_detect(struct drm_connector *connector, bool force)if (status != connector_status_connected) goto out; -intel_dp_probe_oui (intel_dp); -if (intel_dp->force_audio !=HDMI_AUDIO_AUTO ) { intel_dp->has_audio = (intel_dp->force_audio ==HDMI_AUDIO_ON ); }else { --1.7.9.5
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Jani Nikula, Intel Open Source Technology Center
Quoted 2 lines · Dave Airlie
My edp panel bits are all cut-n-paste anyways. maybe we should hold the edp on for long periods around that whole probing.
We have a delayed put on the edp panel power. So keeping it just around the bits where we need it doesn't have perf downsides and imo makes it clearer why we need it - we've had some good amounts of fun in the past where functions assumed that the panel is on but not all callers ensured that. We've pushed the edp panel power handling down the callstacks due to that.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 10 lines · Daniel Vetter
Quoted 9 lines · On Wed, Jun 04, 2014 at 03:29:41PM -0700, [email protected] wrote:
From: Clint Taylor <[email protected]>
Remove OUI read function from the lower half interrupt handler. Upon closing the eDP panel lid an HPD interrupt is generated. The lower half handler calls
intel_dp_probe_oui()as part ofintel_dp_detect().intel_dp_probe_oui()enables eDP VDD and subsequently disables eDP VDD causing another HPD interrupt. This cycle repeats every 3.6 seconds with VDD asserted for 3.5 of those seconds until the lid is opened again.
Quoted 8 lines
Quoted 4 lines
Revert of
0d198328538276c4459ef5de081e68ae60e6c4c2Revert of351cfc34db8decb0c5cc1aac7cf1780a0e45c8b1Signed-off-by Clint Taylor <[email protected]>Hm, this is funky ... we currently don't handle port A hotplug events, and we filter hotplug events properly.
This is a Port A panel on ValleyView.
Quoted 2 lines
How does this exactly blow up for you? Or is this port D?
[ 219.723752] [drm:ironlake_panel_vdd_off_sync], PP_STATUS: 0x00000000 PP_CONTROL: 0xabcd0000 [ 219.823937] [drm:valleyview_irq_handler], hotplug event received, stat 0x20100000 [ 219.823964] [drm:intel_hpd_irq_handler], Received HPD interrupt on PIN 5 - cnt: 0 [ 219.824153] [drm:i915_hotplug_work_func], running encoder hotplug functions [ 219.824175] [drm:i915_hotplug_work_func], Connector eDP-1 (pin 5) received hotplug event. [ 219.824193] [drm:i915_hotplug_work_func], Connector HDMI-A-1 (pin 5) received hotplug event. [ 219.824213] [drm:intel_dp_detect], [CONNECTOR:14:eDP-1] [ 219.824229] [drm:ironlake_edp_panel_vdd_on], Turn eDP VDD on
The valleyview_irq_handler() is receiving the HPD event and i915_hotplug_work_func() is calling intel_dp_detect().
Quoted 2 lines
We might want to have some filtering here checking whether the edp panel is on or off. Also the delayed work is _way_ too long.
We could filter if the lid is closed, but it seemed a lot safer to remove the function. Or we could move the Sink and branch OUI reads to the training function. If OUI is necessary we should probably also save the values to the context.
Quoted 55 lines
-Daniel
Quoted 52 lines
--- drivers/gpu/drm/i915/intel_dp.c | 23 ----------------------- 1 file changed, 23 deletions(-)drivers/gpu/drm/i915/intel_dp.c +0
-24@@ -2867,27 +2867,6 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)return true; } -static void -intel_dp_probe_oui (struct intel_dp *intel_dp) -{ -u8 buf[3 ]; - -if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT ] &DP_OUI_SUPPORT )) -return ; - -intel_edp_panel_vdd_on (intel_dp); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_SINK_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Sink OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -if (intel_dp_dpcd_read_wake (&intel_dp->aux,DP_BRANCH_OUI , buf,3 ) ==3 ) -DRM_DEBUG_KMS ("Branch OUI: %02hx%02hx%02hx\n" , - buf[0 ], buf[1 ], buf[2 ]); - -edp_panel_vdd_off (intel_dp, false); -} -int intel_dp_sink_crc (struct intel_dp *intel_dp,u8 *crc) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);@@ -3178,8 +3157,6 @@ intel_dp_detect(struct drm_connector *connector, bool force)if (status != connector_status_connected) goto out; -intel_dp_probe_oui (intel_dp); -if (intel_dp->force_audio !=HDMI_AUDIO_AUTO ) { intel_dp->has_audio = (intel_dp->force_audio ==HDMI_AUDIO_ON ); }else { --1.7.9.5
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 14 lines · Clint Taylor
Quoted 13 lines · Daniel Vetter
Quoted 12 lines · On Wed, Jun 04, 2014 at 03:29:41PM -0700, [email protected] wrote:
From: Clint Taylor <[email protected]>
Remove OUI read function from the lower half interrupt handler. Upon closing the eDP panel lid an HPD interrupt is generated. The lower half handler calls
intel_dp_probe_oui()as part ofintel_dp_detect().intel_dp_probe_oui()enables eDP VDD and subsequently disables eDP VDD causing another HPD interrupt. This cycle repeats every 3.6 seconds with VDD asserted for 3.5 of those seconds until the lid is opened again.Revert of
0d198328538276c4459ef5de081e68ae60e6c4c2Revert of351cfc34db8decb0c5cc1aac7cf1780a0e45c8b1
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Clint Taylor <[email protected]>Hm, this is funky ... we currently don't handle port A hotplug events, and we filter hotplug events properly.
This is a Port A panel on ValleyView.
Ah, that might actually be wired up hdp-wise. edp on big core (well at least on port A) definitely isn't.
Quoted 18 lines
Quoted 2 lines
How does this exactly blow up for you? Or is this port D?
[ 219.723752] [drm:ironlake_panel_vdd_off_sync], PP_STATUS: 0x00000000 PP_CONTROL: 0xabcd0000 [ 219.823937] [drm:valleyview_irq_handler], hotplug event received, stat 0x20100000 [ 219.823964] [drm:intel_hpd_irq_handler], Received HPD interrupt on PIN 5 - cnt: 0 [ 219.824153] [drm:i915_hotplug_work_func], running encoder hotplug functions [ 219.824175] [drm:i915_hotplug_work_func], Connector eDP-1 (pin 5) received hotplug event. [ 219.824193] [drm:i915_hotplug_work_func], Connector HDMI-A-1 (pin 5) received hotplug event. [ 219.824213] [drm:intel_dp_detect], [CONNECTOR:14:eDP-1] [ 219.824229] [drm:ironlake_edp_panel_vdd_on], Turn eDP VDD on
Quoted 8 lines
The
valleyview_irq_handler()is receiving the HPD event andi915_hotplug_work_func()is callingintel_dp_detect().Quoted 2 lines
We might want to have some filtering here checking whether the edp panel is on or off. Also the delayed work is _way_ too long.
We could filter if the lid is closed, but it seemed a lot safer to remove the function. Is reading the OUI required as part of MST for DP?
I think we should filter the OUI read if it's an eDP panel since we might wake those up. With a comment ofc why we do that special-cases. Checking for edp will also catch all-in-ones where edp is on port D.
And yeah, we need OUI for a bunch of things apparently ... -Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch