Prep. for DP audio MST support
Subsystems (2)
v3 cover Prep. for DP audio MST support
This series lays the groundwork for more DP MST audio work that will follow.
v2:
Different solution replacing the enc_to_dig_port() fix (Ville, Lyude). No changes to MST audio enabling and move audio_connector patches. Reordered the patches (Lyude)
v3:
Different solution to get port from encoder (danvet). Removed locals that are not needed any more.
Minor variable renaming clean up.
Rebased on dinq.
Retained r-b for "start adding dp mst audio" as it does not change.
Dhinakaran Pandiyan (3):
drm/i915: Store port enum in intel_encoder drm/i915: Switch to using port stored in intel_encoder drm/i915: Move audio_connector to intel_encoder
Libin Yang (1):
drm/i915: start adding dp mst audio
drivers/gpu/drm/i915/i915_debugfs.c | 19 +++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_audio.c | 51 ++++++++++++++----------------------- drivers/gpu/drm/i915/intel_ddi.c | 21 +++++++++++---- drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 22 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 7 +++-- drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_tv.c | 2 ++ 12 files changed, 90 insertions(+), 41 deletions(-)
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/4 drm/i915: Store port enum in intel_encoder
Storing the port enum in intel_encoder makes it convenient to know the port attached to an encoder. Moving the port information up from intel_digital_port to intel_encoder avoids unecessary intel_digital_port access and handles MST encoders cleanly without requiring conditional checks for them (thanks danvet).
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_ddi.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_tv.c | 2 ++ 10 files changed, 13 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -185,6 +185,7 @@ enum plane {#define sprite_name (p, s) ((p) * INTEL_INFO(dev)->num_sprites[(p)] + (s) + 'A')enum port { +PORT_NONE =-1 ,PORT_A =0 ,PORT_B ,PORT_C ,
drivers/gpu/drm/i915/intel_ddi.c +1 -0
@@ -2426,6 +2426,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) intel_dig_port->max_lanes = max_lanes; intel_encoder->type =INTEL_OUTPUT_UNKNOWN ; + intel_encoder->attached_port = port; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); intel_encoder->cloneable =0 ;
drivers/gpu/drm/i915/intel_dp.c +1 -0
@@ -5726,6 +5726,7 @@ bool intel_dp_init(struct drm_device *dev, intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); } intel_encoder->cloneable =0 ; + intel_encoder->attached_port = port; intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; dev_priv->hotplug.irq_port[port] = intel_dig_port;
drivers/gpu/drm/i915/intel_dp_mst.c +1 -0
@@ -540,6 +540,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe)); intel_encoder->type =INTEL_OUTPUT_DP_MST ; + intel_encoder->attached_port = intel_dig_port->port; intel_encoder->crtc_mask =0x7 ; intel_encoder->cloneable =0 ;
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -202,6 +202,7 @@ struct intel_encoder {struct drm_encoder base;enum intel_output_type type; +enum port attached_port;unsigned int cloneable;void (*hot_plug)(struct intel_encoder *); bool (*compute_config)(struct intel_encoder *,
drivers/gpu/drm/i915/intel_dsi.c +1 -0
@@ -1478,6 +1478,7 @@ void intel_dsi_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_encoder->attached_port = port;/* * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI * port C. BXT isn't limited like this.
drivers/gpu/drm/i915/intel_dvo.c +2 -0
@@ -511,7 +511,9 @@ void intel_dvo_init(struct drm_device *dev) "DVO %c", intel_dvo_port_name(dvo->dvo_reg)); intel_encoder->type =INTEL_OUTPUT_DVO ; + intel_encoder->attached_port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); +switch (dvo->type) {case INTEL_DVO_CHIP_TMDS : intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) |
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
@@ -1962,6 +1962,7 @@ void intel_hdmi_init(struct drm_device *dev, } intel_encoder->type =INTEL_OUTPUT_HDMI ; + intel_encoder->attached_port = port;if (IS_CHERRYVIEW (dev)) {if (port ==PORT_D ) intel_encoder->crtc_mask =1 <<2 ;
drivers/gpu/drm/i915/intel_lvds.c +2 -1
@@ -1052,8 +1052,9 @@ void intel_lvds_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); - intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->attached_port =PORT_NONE ; intel_encoder->cloneable =0 ;if (HAS_PCH_SPLIT (dev)) intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 );
drivers/gpu/drm/i915/intel_tv.c +2 -0
@@ -1603,7 +1603,9 @@ intel_tv_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); + intel_encoder->type =INTEL_OUTPUT_TVOUT ; + intel_encoder->attached_port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); intel_encoder->cloneable =0 ; intel_encoder->base.possible_crtcs = ((1 <<0 ) | (1 <<1 ));
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 1/4] drm/i915: Store port enum in intel_encoder
Quoted 75 lines · Dhinakaran Pandiyan
Storing the port enum in
intel_encodermakes it convenient to know the port attached to an encoder. Moving the port information up fromintel_digital_porttointel_encoderavoids unecessaryintel_digital_portaccess and handles MST encoders cleanly without requiring conditional checks for them (thanks danvet).Signed-off-by Dhinakaran Pandiyan <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_ddi.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_tv.c | 2 ++ 10 files changed, 13 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -185,6 +185,7 @@ enum plane {#define sprite_name (p, s) ((p) * INTEL_INFO(dev)->num_sprites[(p)] + (s) + 'A')enum port { +PORT_NONE =-1 ,PORT_A =0 ,PORT_B ,PORT_C ,drivers/gpu/drm/i915/intel_ddi.c +1
-0@@ -2426,6 +2426,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) intel_dig_port->max_lanes = max_lanes; intel_encoder->type =INTEL_OUTPUT_UNKNOWN ; + intel_encoder->attached_port = port; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); intel_encoder->cloneable =0 ;drivers/gpu/drm/i915/intel_dp.c +1
-0@@ -5726,6 +5726,7 @@ bool intel_dp_init(struct drm_device *dev, intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); } intel_encoder->cloneable =0 ; + intel_encoder->attached_port = port; intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; dev_priv->hotplug.irq_port[port] = intel_dig_port;drivers/gpu/drm/i915/intel_dp_mst.c +1
-0@@ -540,6 +540,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe)); intel_encoder->type =INTEL_OUTPUT_DP_MST ; + intel_encoder->attached_port = intel_dig_port->port; intel_encoder->crtc_mask =0x7 ; intel_encoder->cloneable =0 ;drivers/gpu/drm/i915/intel_drv.h +0
-0
drivers/gpu/drm/i915/intel_drv.h struct intel_encoder { · line 205
Quoted 4 lines
drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -202,6 +202,7 @@ struct intel_encoder {struct drm_encoder base;enum intel_output_type type; +enum port attached_port;
Why the attached_ prefix? The intel_encoder _is_ the port (more or less at least). Also intel_sdvo.c is missing. Otherwise I think it makes sense. -Daniel
Quoted 73 lines
drivers/gpu/drm/i915/intel_drv.h +0
-0unsigned int cloneable;void (*hot_plug)(struct intel_encoder *); bool (*compute_config)(struct intel_encoder *,drivers/gpu/drm/i915/intel_dsi.c +1
-0@@ -1478,6 +1478,7 @@ void intel_dsi_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_encoder->attached_port = port;/* * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI * port C. BXT isn't limited like this. drivers/gpu/drm/i915/intel_dvo.c +2
-0@@ -511,7 +511,9 @@ void intel_dvo_init(struct drm_device *dev) "DVO %c", intel_dvo_port_name(dvo->dvo_reg)); intel_encoder->type =INTEL_OUTPUT_DVO ; + intel_encoder->attached_port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); +switch (dvo->type) {case INTEL_DVO_CHIP_TMDS : intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) |drivers/gpu/drm/i915/intel_hdmi.c +1
-0@@ -1962,6 +1962,7 @@ void intel_hdmi_init(struct drm_device *dev, } intel_encoder->type =INTEL_OUTPUT_HDMI ; + intel_encoder->attached_port = port;if (IS_CHERRYVIEW (dev)) {if (port ==PORT_D ) intel_encoder->crtc_mask =1 <<2 ;drivers/gpu/drm/i915/intel_lvds.c +2
-1@@ -1052,8 +1052,9 @@ void intel_lvds_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); - intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->attached_port =PORT_NONE ; intel_encoder->cloneable =0 ;if (HAS_PCH_SPLIT (dev)) intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 );drivers/gpu/drm/i915/intel_tv.c +2
-0@@ -1603,7 +1603,9 @@ intel_tv_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); + intel_encoder->type =INTEL_OUTPUT_TVOUT ; + intel_encoder->attached_port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); intel_encoder->cloneable =0 ; intel_encoder->base.possible_crtcs = ((1 <<0 ) | (1 <<1 ));Signature · 1 line
2.5.0
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 1/4] drm/i915: Store port enum in intel_encoder
Quoted 78 lines · Daniel Vetter
Quoted 77 lines · Dhinakaran Pandiyan
Storing the port enum in
intel_encodermakes it convenient to know the port attached to an encoder. Moving the port information up fromintel_digital_porttointel_encoderavoids unecessaryintel_digital_portaccess and handles MST encoders cleanly without requiring conditional checks for them (thanks danvet).Signed-off-by Dhinakaran Pandiyan <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_ddi.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_tv.c | 2 ++ 10 files changed, 13 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -185,6 +185,7 @@ enum plane {#define sprite_name (p, s) ((p) * INTEL_INFO(dev)->num_sprites[(p)] + (s) + 'A')enum port { +PORT_NONE =-1 ,PORT_A =0 ,PORT_B ,PORT_C ,drivers/gpu/drm/i915/intel_ddi.c +1
-0@@ -2426,6 +2426,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) intel_dig_port->max_lanes = max_lanes; intel_encoder->type =INTEL_OUTPUT_UNKNOWN ; + intel_encoder->attached_port = port; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); intel_encoder->cloneable =0 ;drivers/gpu/drm/i915/intel_dp.c +1
-0@@ -5726,6 +5726,7 @@ bool intel_dp_init(struct drm_device *dev, intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); } intel_encoder->cloneable =0 ; + intel_encoder->attached_port = port; intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; dev_priv->hotplug.irq_port[port] = intel_dig_port;drivers/gpu/drm/i915/intel_dp_mst.c +1
-0@@ -540,6 +540,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe)); intel_encoder->type =INTEL_OUTPUT_DP_MST ; + intel_encoder->attached_port = intel_dig_port->port; intel_encoder->crtc_mask =0x7 ; intel_encoder->cloneable =0 ;drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -202,6 +202,7 @@ struct intel_encoder {struct drm_encoder base;
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h struct intel_encoder { · line 205
Quoted 2 lines
drivers/gpu/drm/i915/intel_drv.h +1
-0enum intel_output_type type; +enum port attached_port;Why the
attached_prefix? Theintel_encoder_is_ the port (more or less at least). Alsointel_sdvo.cis missing. Otherwise I think it makes sense. -Daniel
I didn't realize that, will change.
Quoted 63 lines
Quoted 63 lines
drivers/gpu/drm/i915/intel_drv.h +0
-0unsigned int cloneable;void (*hot_plug)(struct intel_encoder *); bool (*compute_config)(struct intel_encoder *,drivers/gpu/drm/i915/intel_dsi.c +1
-0@@ -1478,6 +1478,7 @@ void intel_dsi_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_encoder->attached_port = port;/* * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI * port C. BXT isn't limited like this. drivers/gpu/drm/i915/intel_dvo.c +2
-0@@ -511,7 +511,9 @@ void intel_dvo_init(struct drm_device *dev) "DVO %c", intel_dvo_port_name(dvo->dvo_reg)); intel_encoder->type =INTEL_OUTPUT_DVO ; + intel_encoder->attached_port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); +switch (dvo->type) {case INTEL_DVO_CHIP_TMDS : intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) |drivers/gpu/drm/i915/intel_hdmi.c +1
-0@@ -1962,6 +1962,7 @@ void intel_hdmi_init(struct drm_device *dev, } intel_encoder->type =INTEL_OUTPUT_HDMI ; + intel_encoder->attached_port = port;if (IS_CHERRYVIEW (dev)) {if (port ==PORT_D ) intel_encoder->crtc_mask =1 <<2 ;drivers/gpu/drm/i915/intel_lvds.c +2
-1@@ -1052,8 +1052,9 @@ void intel_lvds_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); - intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->attached_port =PORT_NONE ; intel_encoder->cloneable =0 ;if (HAS_PCH_SPLIT (dev)) intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 );drivers/gpu/drm/i915/intel_tv.c +0
-0@@ -1603,7 +1603,9 @@ intel_tv_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;
Quoted 11 lines
Quoted 10 lines
drivers/gpu/drm/i915/intel_tv.c +2
-0intel_connector_attach_encoder (intel_connector, intel_encoder); + intel_encoder->type =INTEL_OUTPUT_TVOUT ; + intel_encoder->attached_port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); intel_encoder->cloneable =0 ; intel_encoder->base.possible_crtcs = ((1 <<0 ) | (1 <<1 ));Signature · 1 line
2.5.0
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
v4 cover Prep. for DP audio MST support
In reply to Daniel VetterThis series lays the groundwork for more DP MST audio work that will follow.
v2:
Different solution replacing the enc_to_dig_port() fix (Ville, Lyude). No changes to MST audio enabling and move audio_connector patches. Reordered the patches (Lyude)
v3:
Different solution to get port from encoder (danvet). Removed locals that are not needed any more.
Minor variable renaming clean up.
Rebased on dinq.
Retained r-b for "start adding dp mst audio" as it does not change.
v4:
Fixed missing port initialization in intel_sdvo.c Renamed the port enum member from 'attached_port' to 'port' Fixed commit message typos.
Dhinakaran Pandiyan (3):
drm/i915: Store port enum in intel_encoder drm/i915: Switch to using port stored in intel_encoder drm/i915: Move audio_connector to intel_encoder
Libin Yang (1):
drm/i915: start adding dp mst audio
drivers/gpu/drm/i915/i915_debugfs.c | 19 +++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_audio.c | 51 ++++++++++++++----------------------- drivers/gpu/drm/i915/intel_ddi.c | 21 +++++++++++---- drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 22 ++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 7 +++-- drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_sdvo.c | 1 + drivers/gpu/drm/i915/intel_tv.c | 2 ++ 13 files changed, 91 insertions(+), 41 deletions(-)
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/4 drm/i915: Store port enum in intel_encoder
Storing the port enum in intel_encoder makes it convenient to know the port attached to an encoder. Moving the port information up from intel_digital_port to intel_encoder avoids unecessary intel_digital_port access and handles MST encoders cleanly without requiring conditional checks for them (thanks danvet).
v2:
Renamed the port enum member from 'attached_port' to 'port' (danvet) Fixed missing initialization of port in intel_sdvo.c (danvet)
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_ddi.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_sdvo.c | 1 + drivers/gpu/drm/i915/intel_tv.c | 2 ++ 11 files changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -185,6 +185,7 @@ enum plane {#define sprite_name (p, s) ((p) * INTEL_INFO(dev)->num_sprites[(p)] + (s) + 'A')enum port { +PORT_NONE =-1 ,PORT_A =0 ,PORT_B ,PORT_C ,
drivers/gpu/drm/i915/intel_ddi.c +1 -0
@@ -2426,6 +2426,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) intel_dig_port->max_lanes = max_lanes; intel_encoder->type =INTEL_OUTPUT_UNKNOWN ; + intel_encoder->port = port; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); intel_encoder->cloneable =0 ;
drivers/gpu/drm/i915/intel_dp.c +1 -0
@@ -5726,6 +5726,7 @@ bool intel_dp_init(struct drm_device *dev, intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); } intel_encoder->cloneable =0 ; + intel_encoder->port = port; intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; dev_priv->hotplug.irq_port[port] = intel_dig_port;
drivers/gpu/drm/i915/intel_dp_mst.c +1 -0
@@ -540,6 +540,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe)); intel_encoder->type =INTEL_OUTPUT_DP_MST ; + intel_encoder->port = intel_dig_port->port; intel_encoder->crtc_mask =0x7 ; intel_encoder->cloneable =0 ;
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -202,6 +202,7 @@ struct intel_encoder {struct drm_encoder base;enum intel_output_type type; +enum port port;unsigned int cloneable;void (*hot_plug)(struct intel_encoder *); bool (*compute_config)(struct intel_encoder *,
drivers/gpu/drm/i915/intel_dsi.c +1 -0
@@ -1478,6 +1478,7 @@ void intel_dsi_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_encoder->port = port;/* * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI * port C. BXT isn't limited like this.
drivers/gpu/drm/i915/intel_dvo.c +2 -0
@@ -511,7 +511,9 @@ void intel_dvo_init(struct drm_device *dev) "DVO %c", intel_dvo_port_name(dvo->dvo_reg)); intel_encoder->type =INTEL_OUTPUT_DVO ; + intel_encoder->port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); +switch (dvo->type) {case INTEL_DVO_CHIP_TMDS : intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) |
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
@@ -1962,6 +1962,7 @@ void intel_hdmi_init(struct drm_device *dev, } intel_encoder->type =INTEL_OUTPUT_HDMI ; + intel_encoder->port = port;if (IS_CHERRYVIEW (dev)) {if (port ==PORT_D ) intel_encoder->crtc_mask =1 <<2 ;
drivers/gpu/drm/i915/intel_lvds.c +2 -1
@@ -1052,8 +1052,9 @@ void intel_lvds_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); - intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->port =PORT_NONE ; intel_encoder->cloneable =0 ;if (HAS_PCH_SPLIT (dev)) intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 );
drivers/gpu/drm/i915/intel_sdvo.c +1 -0
@@ -2973,6 +2973,7 @@ bool intel_sdvo_init(struct drm_device *dev,/* encoder type will be decided later */ intel_encoder = &intel_sdvo->base; intel_encoder->type =INTEL_OUTPUT_SDVO ; + intel_encoder->port = port;drm_encoder_init (dev, &intel_encoder->base, &intel_sdvo_enc_funcs,0 ,"SDVO %c" ,port_name (port));
drivers/gpu/drm/i915/intel_tv.c +2 -0
@@ -1603,7 +1603,9 @@ intel_tv_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); + intel_encoder->type =INTEL_OUTPUT_TVOUT ; + intel_encoder->port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); intel_encoder->cloneable =0 ; intel_encoder->base.possible_crtcs = ((1 <<0 ) | (1 <<1 ));
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 1/4] drm/i915: Store port enum in intel_encoder
IRC acked-by: Daniel Vetter <[email protected]>
Quoted 157 lines · Dhinakaran Pandiyan
Storing the port enum in
intel_encodermakes it convenient to know the port attached to an encoder. Moving the port information up fromintel_digital_porttointel_encoderavoids unecessaryintel_digital_portaccess and handles MST encoders cleanly without requiring conditional checks for them (thanks danvet).v2:
Renamed the port enum member from 'attached_port' to 'port' (danvet) Fixed missing initialization of port inintel_sdvo.c(danvet)Signed-off-by Dhinakaran Pandiyan <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_ddi.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_sdvo.c | 1 + drivers/gpu/drm/i915/intel_tv.c | 2 ++ 11 files changed, 14 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -185,6 +185,7 @@ enum plane {#define sprite_name (p, s) ((p) * INTEL_INFO(dev)->num_sprites[(p)] + (s) + 'A')enum port { +PORT_NONE =-1 ,PORT_A =0 ,PORT_B ,PORT_C ,drivers/gpu/drm/i915/intel_ddi.c +1
-0@@ -2426,6 +2426,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) intel_dig_port->max_lanes = max_lanes; intel_encoder->type =INTEL_OUTPUT_UNKNOWN ; + intel_encoder->port = port; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); intel_encoder->cloneable =0 ;drivers/gpu/drm/i915/intel_dp.c +1
-0@@ -5726,6 +5726,7 @@ bool intel_dp_init(struct drm_device *dev, intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); } intel_encoder->cloneable =0 ; + intel_encoder->port = port; intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; dev_priv->hotplug.irq_port[port] = intel_dig_port;drivers/gpu/drm/i915/intel_dp_mst.c +1
-0@@ -540,6 +540,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe)); intel_encoder->type =INTEL_OUTPUT_DP_MST ; + intel_encoder->port = intel_dig_port->port; intel_encoder->crtc_mask =0x7 ; intel_encoder->cloneable =0 ;drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -202,6 +202,7 @@ struct intel_encoder {struct drm_encoder base;enum intel_output_type type; +enum port port;unsigned int cloneable;void (*hot_plug)(struct intel_encoder *); bool (*compute_config)(struct intel_encoder *,drivers/gpu/drm/i915/intel_dsi.c +1
-0@@ -1478,6 +1478,7 @@ void intel_dsi_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_encoder->port = port;/* * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI * port C. BXT isn't limited like this. drivers/gpu/drm/i915/intel_dvo.c +2
-0@@ -511,7 +511,9 @@ void intel_dvo_init(struct drm_device *dev) "DVO %c", intel_dvo_port_name(dvo->dvo_reg)); intel_encoder->type =INTEL_OUTPUT_DVO ; + intel_encoder->port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); +switch (dvo->type) {case INTEL_DVO_CHIP_TMDS : intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) |drivers/gpu/drm/i915/intel_hdmi.c +1
-0@@ -1962,6 +1962,7 @@ void intel_hdmi_init(struct drm_device *dev, } intel_encoder->type =INTEL_OUTPUT_HDMI ; + intel_encoder->port = port;if (IS_CHERRYVIEW (dev)) {if (port ==PORT_D ) intel_encoder->crtc_mask =1 <<2 ;drivers/gpu/drm/i915/intel_lvds.c +2
-1@@ -1052,8 +1052,9 @@ void intel_lvds_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); - intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->port =PORT_NONE ; intel_encoder->cloneable =0 ;if (HAS_PCH_SPLIT (dev)) intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 );drivers/gpu/drm/i915/intel_sdvo.c +1
-0@@ -2973,6 +2973,7 @@ bool intel_sdvo_init(struct drm_device *dev,/* encoder type will be decided later */ intel_encoder = &intel_sdvo->base; intel_encoder->type =INTEL_OUTPUT_SDVO ; + intel_encoder->port = port;drm_encoder_init (dev, &intel_encoder->base, &intel_sdvo_enc_funcs,0 ,"SDVO %c" ,port_name (port));drivers/gpu/drm/i915/intel_tv.c +0
-0
drivers/gpu/drm/i915/intel_tv.c intel_tv_init(struct drm_device *dev) · line 1611
Quoted 9 lines
drivers/gpu/drm/i915/intel_tv.c +2
-0@@ -1603,7 +1603,9 @@ intel_tv_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); + intel_encoder->type =INTEL_OUTPUT_TVOUT ; + intel_encoder->port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); intel_encoder->cloneable =0 ; intel_encoder->base.possible_crtcs = ((1 <<0 ) | (1 <<1 ));
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 1/4] drm/i915: Store port enum in intel_encoder
In reply to Dhinakaran PandiyanQuoted 178 lines · Dhinakaran Pandiyan
Storing the port enum in
intel_encodermakes it convenient to know the port attached to an encoder. Moving the port information up fromintel_digital_porttointel_encoderavoids unecessaryintel_digital_portaccess and handles MST encoders cleanly without requiring conditional checks for them (thanks danvet).v2:
Renamed the port enum member from 'attached_port' to 'port' (danvet) Fixed missing initialization of port inintel_sdvo.c(danvet)Signed-off-by Dhinakaran Pandiyan <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/intel_ddi.c | 1 +
drivers/gpu/drm/i915/intel_dp.c | 1 +
drivers/gpu/drm/i915/intel_dp_mst.c | 1 +drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_sdvo.c | 1 + drivers/gpu/drm/i915/intel_tv.c | 2 ++ 11 files changed, 14 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +0
-0@@ -185,6 +185,7 @@ enum plane { #define sprite_name(p, s) ((p) * INTEL_INFO(dev)->num_sprites[(p)] + (s) + 'A')
enum port {drivers/gpu/drm/i915/i915_drv.h +1
-0+ PORT_NONE = -1,
PORT_A= 0,
PORT_B,
PORT_C,drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -2426,6 +2426,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) intel_dig_port->max_lanes = max_lanes;
intel_encoder->type=INTEL_OUTPUT_UNKNOWN;drivers/gpu/drm/i915/intel_ddi.c +1
-0+ intel_encoder->port = port;
intel_encoder->crtc_mask= (1 << 0) | (1 << 1) | (1 << 2);intel_encoder->cloneable= 0;drivers/gpu/drm/i915/intel_dp.c +1
-0@@ -5726,6 +5726,7 @@ bool intel_dp_init(struct drm_device *dev, intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2); } intel_encoder->cloneable = 0; + intel_encoder->port = port;
intel_dig_port->hpd_pulse=intel_dp_hpd_pulse; dev_priv->hotplug.irq_port[port] =intel_dig_port;drivers/gpu/drm/i915/intel_dp_mst.c +0
-0@@ -540,6 +540,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe));
intel_encoder->type=INTEL_OUTPUT_DP_MST;drivers/gpu/drm/i915/intel_dp_mst.c +1
-0+ intel_encoder->port = intel_dig_port->port;
intel_encoder->crtc_mask=0x7;
intel_encoder->cloneable= 0;drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -202,6 +202,7 @@ struct intel_encoder { struct drm_encoder base;
enumintel_output_typetype;drivers/gpu/drm/i915/intel_drv.h +1
-0+enum port port;unsigned int cloneable;
void (*hot_plug)(structintel_encoder*); bool (*compute_config)(structintel_encoder*,drivers/gpu/drm/i915/intel_dsi.c +0
-0@@ -1478,6 +1478,7 @@ void intel_dsi_init(struct drm_device *dev)
intel_connector->get_hw_state=intel_connector_get_hw_state;drivers/gpu/drm/i915/intel_dsi.c +1
-0+ intel_encoder->port = port;/*
* On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI
* port C. BXT isn't limited like this.drivers/gpu/drm/i915/intel_dvo.c +0
-0@@ -511,7 +511,9 @@ void intel_dvo_init(struct drm_device *dev)"DVO %c", intel_dvo_port_name(dvo-
Quoted 1 line
dvo_reg));
intel_encoder->type=INTEL_OUTPUT_DVO;drivers/gpu/drm/i915/intel_dvo.c +1
-0+ intel_encoder->port =PORT_NONE ;
intel_encoder->crtc_mask= (1 << 0) | (1 << 1);
+
switch (dvo->type) {
caseINTEL_DVO_CHIP_TMDS:
intel_encoder->cloneable= (1 <<INTEL_OUTPUT_ANALOG) |drivers/gpu/drm/i915/intel_hdmi.c +0
-0@@ -1962,6 +1962,7 @@ void intel_hdmi_init(struct drm_device *dev, }
intel_encoder->type=INTEL_OUTPUT_HDMI;drivers/gpu/drm/i915/intel_hdmi.c +1
-0+ intel_encoder->port = port;if (
IS_CHERRYVIEW(dev)) {
if (port ==PORT_D)intel_encoder->crtc_mask= 1 << 2;drivers/gpu/drm/i915/intel_lvds.c +0
-0@@ -1052,8 +1052,9 @@ void intel_lvds_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;
intel_connector_attach_encoder(intel_connector, intel_encoder);drivers/gpu/drm/i915/intel_lvds.c +0
-1- intel_encoder->type =INTEL_OUTPUT_LVDS ;drivers/gpu/drm/i915/intel_lvds.c +2
-0+ intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->port =PORT_NONE ;
intel_encoder->cloneable= 0;
if (HAS_PCH_SPLIT(dev))
intel_encoder->crtc_mask= (1 << 0) | (1 << 1) | (1 << 2);drivers/gpu/drm/i915/intel_sdvo.c +1
-0@@ -2973,6 +2973,7 @@ bool intel_sdvo_init(struct drm_device *dev, /* encoder type will be decided later */ intel_encoder = &intel_sdvo->base; intel_encoder->type = INTEL_OUTPUT_SDVO; + intel_encoder->port = port; drm_encoder_init(dev, &intel_encoder->base, &intel_sdvo_enc_funcs, 0, "SDVO %c", port_name(port));drivers/gpu/drm/i915/intel_tv.c +0
-0@@ -1603,7 +1603,9 @@ intel_tv_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;
intel_connector_attach_encoder(intel_connector, intel_encoder); +
intel_encoder->type=INTEL_OUTPUT_TVOUT;drivers/gpu/drm/i915/intel_tv.c +1
-0+ intel_encoder->port =PORT_NONE ;
Quoted 3 lines
intel_encoder->crtc_mask= (1 << 0) | (1 << 1);intel_encoder->cloneable= 0;intel_encoder->base.possible_crtcs= ((1 << 0) | (1 << 1));
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 1/4] drm/i915: Store port enum in intel_encoder
In reply to Dhinakaran PandiyanQuoted 13 lines · Dhinakaran Pandiyan
Storing the port enum in
intel_encodermakes it convenient to know the port attached to an encoder. Moving the port information up fromintel_digital_porttointel_encoderavoids unecessaryintel_digital_portaccess and handles MST encoders cleanly without requiring conditional checks for them (thanks danvet).v2:
Renamed the port enum member from 'attached_port' to 'port' (danvet) Fixed missing initialization of port inintel_sdvo.c(danvet)Signed-off-by Dhinakaran Pandiyan <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>
Quoted 12 lines
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_ddi.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_sdvo.c | 1 + drivers/gpu/drm/i915/intel_tv.c | 2 ++
Missing intel_crt.c at least.
Also we're going to want a patch to kill off the, now duplicated, information from intel_dig_port.
Quoted 143 lines
11 files changed, 14 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -185,6 +185,7 @@ enum plane {#define sprite_name (p, s) ((p) * INTEL_INFO(dev)->num_sprites[(p)] + (s) + 'A')enum port { +PORT_NONE =-1 ,PORT_A =0 ,PORT_B ,PORT_C ,drivers/gpu/drm/i915/intel_ddi.c +1
-0@@ -2426,6 +2426,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) intel_dig_port->max_lanes = max_lanes; intel_encoder->type =INTEL_OUTPUT_UNKNOWN ; + intel_encoder->port = port; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); intel_encoder->cloneable =0 ;drivers/gpu/drm/i915/intel_dp.c +1
-0@@ -5726,6 +5726,7 @@ bool intel_dp_init(struct drm_device *dev, intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); } intel_encoder->cloneable =0 ; + intel_encoder->port = port; intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; dev_priv->hotplug.irq_port[port] = intel_dig_port;drivers/gpu/drm/i915/intel_dp_mst.c +1
-0@@ -540,6 +540,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe)); intel_encoder->type =INTEL_OUTPUT_DP_MST ; + intel_encoder->port = intel_dig_port->port; intel_encoder->crtc_mask =0x7 ; intel_encoder->cloneable =0 ;drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -202,6 +202,7 @@ struct intel_encoder {struct drm_encoder base;enum intel_output_type type; +enum port port;unsigned int cloneable;void (*hot_plug)(struct intel_encoder *); bool (*compute_config)(struct intel_encoder *,drivers/gpu/drm/i915/intel_dsi.c +1
-0@@ -1478,6 +1478,7 @@ void intel_dsi_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_encoder->port = port;/* * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI * port C. BXT isn't limited like this. drivers/gpu/drm/i915/intel_dvo.c +2
-0@@ -511,7 +511,9 @@ void intel_dvo_init(struct drm_device *dev) "DVO %c", intel_dvo_port_name(dvo->dvo_reg)); intel_encoder->type =INTEL_OUTPUT_DVO ; + intel_encoder->port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); +switch (dvo->type) {case INTEL_DVO_CHIP_TMDS : intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) |drivers/gpu/drm/i915/intel_hdmi.c +1
-0@@ -1962,6 +1962,7 @@ void intel_hdmi_init(struct drm_device *dev, } intel_encoder->type =INTEL_OUTPUT_HDMI ; + intel_encoder->port = port;if (IS_CHERRYVIEW (dev)) {if (port ==PORT_D ) intel_encoder->crtc_mask =1 <<2 ;drivers/gpu/drm/i915/intel_lvds.c +2
-1@@ -1052,8 +1052,9 @@ void intel_lvds_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); - intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->port =PORT_NONE ; intel_encoder->cloneable =0 ;if (HAS_PCH_SPLIT (dev)) intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 );drivers/gpu/drm/i915/intel_sdvo.c +1
-0@@ -2973,6 +2973,7 @@ bool intel_sdvo_init(struct drm_device *dev,/* encoder type will be decided later */ intel_encoder = &intel_sdvo->base; intel_encoder->type =INTEL_OUTPUT_SDVO ; + intel_encoder->port = port;drm_encoder_init (dev, &intel_encoder->base, &intel_sdvo_enc_funcs,0 ,"SDVO %c" ,port_name (port));drivers/gpu/drm/i915/intel_tv.c +2
-0@@ -1603,7 +1603,9 @@ intel_tv_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); + intel_encoder->type =INTEL_OUTPUT_TVOUT ; + intel_encoder->port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); intel_encoder->cloneable =0 ; intel_encoder->base.possible_crtcs = ((1 <<0 ) | (1 <<1 ));Signature · 1 line
2.5.0
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 1/4] drm/i915: Store port enum in intel_encoder
Quoted 27 lines · Ville Syrjälä
Quoted 13 lines · Dhinakaran Pandiyan
Storing the port enum in
intel_encodermakes it convenient to know the port attached to an encoder. Moving the port information up fromintel_digital_porttointel_encoderavoids unecessaryintel_digital_portaccess and handles MST encoders cleanly without requiring conditional checks for them (thanks danvet).v2:
Renamed the port enum member from 'attached_port' to 'port' (danvet) Fixed missing initialization of port inintel_sdvo.c(danvet)Signed-off-by Dhinakaran Pandiyan <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjälä <[email protected]>Quoted 12 lines
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_ddi.c | 1 + drivers/gpu/drm/i915/intel_dp.c | 1 + drivers/gpu/drm/i915/intel_dp_mst.c | 1 + drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_dsi.c | 1 + drivers/gpu/drm/i915/intel_dvo.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 1 + drivers/gpu/drm/i915/intel_lvds.c | 3 ++- drivers/gpu/drm/i915/intel_sdvo.c | 1 + drivers/gpu/drm/i915/intel_tv.c | 2 ++
Quoted 2 lines
Missing
intel_crt.cat least.
My grep search string was inadequate, will fix this.
Thanks for the review. Can you also look at the the API change patch that you had R-B'd earlier? I removed your R-B as the patch changed.
Quoted 3 lines
Also we're going to want a patch to kill off the, now duplicated, information from
intel_dig_port.
Makes sense, I will work on it.
Quoted 134 lines
Quoted 134 lines
11 files changed, 14 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -185,6 +185,7 @@ enum plane {#define sprite_name (p, s) ((p) * INTEL_INFO(dev)->num_sprites[(p)] + (s) + 'A')enum port { +PORT_NONE =-1 ,PORT_A =0 ,PORT_B ,PORT_C ,drivers/gpu/drm/i915/intel_ddi.c +1
-0@@ -2426,6 +2426,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) intel_dig_port->max_lanes = max_lanes; intel_encoder->type =INTEL_OUTPUT_UNKNOWN ; + intel_encoder->port = port; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); intel_encoder->cloneable =0 ;drivers/gpu/drm/i915/intel_dp.c +1
-0@@ -5726,6 +5726,7 @@ bool intel_dp_init(struct drm_device *dev, intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); } intel_encoder->cloneable =0 ; + intel_encoder->port = port; intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; dev_priv->hotplug.irq_port[port] = intel_dig_port;drivers/gpu/drm/i915/intel_dp_mst.c +1
-0@@ -540,6 +540,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum DRM_MODE_ENCODER_DPMST, "DP-MST %c", pipe_name(pipe)); intel_encoder->type =INTEL_OUTPUT_DP_MST ; + intel_encoder->port = intel_dig_port->port; intel_encoder->crtc_mask =0x7 ; intel_encoder->cloneable =0 ;drivers/gpu/drm/i915/intel_drv.h +1
-0@@ -202,6 +202,7 @@ struct intel_encoder {struct drm_encoder base;enum intel_output_type type; +enum port port;unsigned int cloneable;void (*hot_plug)(struct intel_encoder *); bool (*compute_config)(struct intel_encoder *,drivers/gpu/drm/i915/intel_dsi.c +1
-0@@ -1478,6 +1478,7 @@ void intel_dsi_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state; + intel_encoder->port = port;/* * On BYT/CHV, pipe A maps to MIPI DSI port A, pipe B maps to MIPI DSI * port C. BXT isn't limited like this. drivers/gpu/drm/i915/intel_dvo.c +2
-0@@ -511,7 +511,9 @@ void intel_dvo_init(struct drm_device *dev) "DVO %c", intel_dvo_port_name(dvo->dvo_reg)); intel_encoder->type =INTEL_OUTPUT_DVO ; + intel_encoder->port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); +switch (dvo->type) {case INTEL_DVO_CHIP_TMDS : intel_encoder->cloneable = (1 << INTEL_OUTPUT_ANALOG) |drivers/gpu/drm/i915/intel_hdmi.c +1
-0@@ -1962,6 +1962,7 @@ void intel_hdmi_init(struct drm_device *dev, } intel_encoder->type =INTEL_OUTPUT_HDMI ; + intel_encoder->port = port;if (IS_CHERRYVIEW (dev)) {if (port ==PORT_D ) intel_encoder->crtc_mask =1 <<2 ;drivers/gpu/drm/i915/intel_lvds.c +2
-1@@ -1052,8 +1052,9 @@ void intel_lvds_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;intel_connector_attach_encoder (intel_connector, intel_encoder); - intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->type =INTEL_OUTPUT_LVDS ; + intel_encoder->port =PORT_NONE ; intel_encoder->cloneable =0 ;if (HAS_PCH_SPLIT (dev)) intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 );drivers/gpu/drm/i915/intel_sdvo.c +1
-0@@ -2973,6 +2973,7 @@ bool intel_sdvo_init(struct drm_device *dev,/* encoder type will be decided later */ intel_encoder = &intel_sdvo->base; intel_encoder->type =INTEL_OUTPUT_SDVO ; + intel_encoder->port = port;drm_encoder_init (dev, &intel_encoder->base, &intel_sdvo_enc_funcs,0 ,"SDVO %c" ,port_name (port));drivers/gpu/drm/i915/intel_tv.c +0
-0@@ -1603,7 +1603,9 @@ intel_tv_init(struct drm_device *dev) intel_connector->get_hw_state = intel_connector_get_hw_state;
Quoted 10 lines
Quoted 9 lines
drivers/gpu/drm/i915/intel_tv.c +2
-0intel_connector_attach_encoder (intel_connector, intel_encoder); + intel_encoder->type =INTEL_OUTPUT_TVOUT ; + intel_encoder->port =PORT_NONE ; intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ); intel_encoder->cloneable =0 ; intel_encoder->base.possible_crtcs = ((1 <<0 ) | (1 <<1 ));Signature · 1 line
2.5.0
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/4 drm/i915: Switch to using port stored in intel_encoder
In reply to Dhinakaran PandiyanNow that we have the port enum stored in intel_encoder, use that instead of dereferencing intel_dig_port. Saves us a few locals.
struct intel_encoder variables have been renamed to be consistent and convey type information.
--- drivers/gpu/drm/i915/intel_audio.c | 39 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/intel_audio.c +15 -24
@@ -276,17 +276,15 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder) }static void hsw_audio_codec_enable (struct drm_connector *connector, -struct intel_encoder *encoder, +struct intel_encoder *intel_encoder,const struct drm_display_mode *adjusted_mode) {struct drm_i915_private *dev_priv =to_i915 (connector->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (intel_encoder->base.crtc);enum pipe pipe = intel_crtc->pipe; +enum port port = intel_encoder->attached_port;struct i915_audio_component *acomp = dev_priv->audio_component;const uint8_t *eld = connector->eld; -struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port;uint32_t tmp;int len, i;int n, rate;
@@ -355,14 +353,12 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,mutex_unlock (&dev_priv->av_mutex); } -static void ilk_audio_codec_disable (struct intel_encoder *encoder) +static void ilk_audio_codec_disable (struct intel_encoder *intel_encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port; +struct drm_i915_private *dev_priv =to_i915 (intel_encoder->base.dev); +struct intel_crtc *intel_crtc =to_intel_crtc (intel_encoder->base.crtc);enum pipe pipe = intel_crtc->pipe; +enum port port = intel_encoder->attached_port;uint32_t tmp, eldv;i915_reg_t aud_config, aud_cntrl_st2;
@@ -402,18 +398,15 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder) }static void ilk_audio_codec_enable (struct drm_connector *connector, -struct intel_encoder *encoder, +struct intel_encoder *intel_encoder,const struct drm_display_mode *adjusted_mode) {struct drm_i915_private *dev_priv =to_i915 (connector->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port; +struct intel_crtc *intel_crtc =to_intel_crtc (intel_encoder->base.crtc);enum pipe pipe = intel_crtc->pipe; +enum port port = intel_encoder->attached_port;uint8_t *eld = connector->eld; -uint32_t eldv; -uint32_t tmp; +uint32_t tmp, eldv;int len, i;i915_reg_t hdmiw_hdmiedid, aud_config, aud_cntl_st, aud_cntrl_st2;
@@ -495,11 +488,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)struct intel_crtc *crtc =to_intel_crtc (encoder->crtc);const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;struct drm_connector *connector; -struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component;struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->attached_port; connector =drm_select_eld (encoder);if (!connector)
@@ -542,11 +534,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)void intel_audio_codec_disable (struct intel_encoder *intel_encoder) {struct drm_encoder *encoder = &intel_encoder->base; -struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component;struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->attached_port;if (dev_priv->display.audio_codec_disable) dev_priv->display.audio_codec_disable (intel_encoder);
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 2/4] drm/i915: Switch to using port stored in intel_encoder
Looks like a much better solution then the previous one.
Quoted 116 lines · Dhinakaran Pandiyan
Now that we have the port enum stored in
intel_encoder, use that instead of dereferencingintel_dig_port. Saves us a few locals.struct
intel_encodervariables have been renamed to be consistent and convey type information.Signed-off-by Dhinakaran Pandiyan <[email protected]>---
drivers/gpu/drm/i915/intel_audio.c | 39 +++++++++++++++--------------------
---1 file changed, 15 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/intel_audio.c +0
-0@@ -276,17 +276,15 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder) }
static void hsw_audio_codec_enable(structdrm_connector*connector,drivers/gpu/drm/i915/intel_audio.c +1
-1- struct intel_encoder *encoder, + struct intel_encoder *intel_encoder,const struct
drm_display_mode*adjusted_mode)
{
structdrm_i915_private*dev_priv=to_i915(connector->dev);drivers/gpu/drm/i915/intel_audio.c +1
-1-struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); + struct intel_crtc *intel_crtc = to_intel_crtc(intel_encoder-Quoted 1 line
base.crtc);
enum pipe pipe =
intel_crtc->pipe;drivers/gpu/drm/i915/intel_audio.c +1
-0+enum port port = intel_encoder->attached_port;struct
i915_audio_component*acomp =dev_priv->audio_component; constuint8_t*eld =connector->eld;drivers/gpu/drm/i915/intel_audio.c +0
-3-struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port;
uint32_ttmp;
int len, i;
int n, rate;drivers/gpu/drm/i915/intel_audio.c +0
-0@@ -355,14 +353,12 @@ static void hsw_audio_codec_enable(struct drm_connector *connector, mutex_unlock(&dev_priv->av_mutex); }drivers/gpu/drm/i915/intel_audio.c +1
-1-static void ilk_audio_codec_disable (struct intel_encoder *encoder) +static void ilk_audio_codec_disable (struct intel_encoder *intel_encoder){
drivers/gpu/drm/i915/intel_audio.c +2
-5-struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port; +struct drm_i915_private *dev_priv =to_i915 (intel_encoder->base.dev); + struct intel_crtc *intel_crtc = to_intel_crtc(intel_encoder-Quoted 1 line
base.crtc);
enum pipe pipe =
intel_crtc->pipe;drivers/gpu/drm/i915/intel_audio.c +1
-0+enum port port = intel_encoder->attached_port;
uint32_ttmp, eldv;
i915_reg_taud_config,aud_cntrl_st2;drivers/gpu/drm/i915/intel_audio.c +0
-0@@ -402,18 +398,15 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder) }
static void ilk_audio_codec_enable(structdrm_connector*connector,drivers/gpu/drm/i915/intel_audio.c +1
-1- struct intel_encoder *encoder, + struct intel_encoder *intel_encoder,const struct
drm_display_mode*adjusted_mode)
{
structdrm_i915_private*dev_priv=to_i915(connector->dev);drivers/gpu/drm/i915/intel_audio.c +1
-4-struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port; + struct intel_crtc *intel_crtc = to_intel_crtc(intel_encoder-Quoted 1 line
base.crtc);
enum pipe pipe =
intel_crtc->pipe;drivers/gpu/drm/i915/intel_audio.c +1
-0+enum port port = intel_encoder->attached_port;
uint8_t*eld =connector->eld;drivers/gpu/drm/i915/intel_audio.c +1
-2-uint32_t eldv; -uint32_t tmp; +uint32_t tmp, eldv;int len, i;
i915_reg_thdmiw_hdmiedid,aud_config,aud_cntl_st,aud_cntrl_st2;drivers/gpu/drm/i915/intel_audio.c +0
-0@@ -495,11 +488,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) struct intel_crtc *crtc = to_intel_crtc(encoder->crtc);const struct
drm_display_mode*adjusted_mode= &crtc->config-Quoted 1 line
base.adjusted_mode;
struct
drm_connector*connector;drivers/gpu/drm/i915/intel_audio.c +1
-2-struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct
i915_audio_component*acomp =dev_priv->audio_component; structintel_digital_port*intel_dig_port=enc_to_dig_port(encoder);drivers/gpu/drm/i915/intel_audio.c +1
-1-enum port port = intel_dig_port->port; +enum port port = intel_encoder->attached_port;
connector =drm_select_eld(encoder);
if (!connector)drivers/gpu/drm/i915/intel_audio.c +2
-3@@ -542,11 +534,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) void intel_audio_codec_disable(struct intel_encoder *intel_encoder) { struct drm_encoder *encoder = &intel_encoder->base; -struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev); struct i915_audio_component *acomp = dev_priv->audio_component; struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->attached_port;
Quoted 3 lines
if (dev_priv->display.audio_codec_disable)dev_priv->display.audio_codec_disable(intel_encoder);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 2/4] drm/i915: Switch to using port stored in intel_encoder
Just realized this patch needs s/attached_port/port, will send out another version.
Quoted 122 lines · Lyude Paul
Looks like a much better solution then the previous one.
Reviewed-by Lyude <[email protected]>Quoted 117 lines · Dhinakaran Pandiyan
Now that we have the port enum stored in
intel_encoder, use that instead of dereferencingintel_dig_port. Saves us a few locals.struct
intel_encodervariables have been renamed to be consistent and convey type information.Signed-off-by Dhinakaran Pandiyan <[email protected]>--- drivers/gpu/drm/i915/intel_audio.c | 39 +++++++++++++++-------------------- --- 1 file changed, 15 insertions(+), 24 deletions(-)drivers/gpu/drm/i915/intel_audio.c +3
-5@@ -276,17 +276,15 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder) }static void hsw_audio_codec_enable (struct drm_connector *connector, -struct intel_encoder *encoder, +struct intel_encoder *intel_encoder,const struct drm_display_mode *adjusted_mode) {struct drm_i915_private *dev_priv =to_i915 (connector->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (intel_encoder- >base.crtc);enum pipe pipe = intel_crtc->pipe; +enum port port = intel_encoder->attached_port;struct i915_audio_component *acomp = dev_priv->audio_component;const uint8_t *eld = connector->eld; -struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port;drivers/gpu/drm/i915/intel_audio.c +4
-6uint32_t tmp;int len, i;int n, rate;@@ -355,14 +353,12 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,mutex_unlock (&dev_priv->av_mutex); } -static void ilk_audio_codec_disable (struct intel_encoder *encoder) +static void ilk_audio_codec_disable (struct intel_encoder *intel_encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port; +struct drm_i915_private *dev_priv =to_i915 (intel_encoder->base.dev); +struct intel_crtc *intel_crtc =to_intel_crtc (intel_encoder- >base.crtc);enum pipe pipe = intel_crtc->pipe; +enum port port = intel_encoder->attached_port;uint32_t tmp, eldv;drivers/gpu/drm/i915/intel_audio.c +4
-7i915_reg_t aud_config, aud_cntrl_st2;@@ -402,18 +398,15 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder) }static void ilk_audio_codec_enable (struct drm_connector *connector, -struct intel_encoder *encoder, +struct intel_encoder *intel_encoder,const struct drm_display_mode *adjusted_mode) {struct drm_i915_private *dev_priv =to_i915 (connector->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port; +struct intel_crtc *intel_crtc =to_intel_crtc (intel_encoder- >base.crtc);enum pipe pipe = intel_crtc->pipe; +enum port port = intel_encoder->attached_port;uint8_t *eld = connector->eld; -uint32_t eldv; -uint32_t tmp; +uint32_t tmp, eldv;drivers/gpu/drm/i915/intel_audio.c +2
-3int len, i;i915_reg_t hdmiw_hdmiedid, aud_config, aud_cntl_st, aud_cntrl_st2;@@ -495,11 +488,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)struct intel_crtc *crtc =to_intel_crtc (encoder->crtc);const struct drm_display_mode *adjusted_mode = &crtc->config- >base.adjusted_mode;struct drm_connector *connector; -struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component;struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->attached_port;drivers/gpu/drm/i915/intel_audio.c +2
-3connector =drm_select_eld (encoder);if (!connector)@@ -542,11 +534,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)void intel_audio_codec_disable (struct intel_encoder *intel_encoder) {struct drm_encoder *encoder = &intel_encoder->base; -struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component;struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->attached_port;
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/i915/intel_audio.c +0
-0if (dev_priv->display.audio_codec_disable)
dev_priv->display.audio_codec_disable(intel_encoder);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 3/4 drm/i915: Move audio_connector to intel_encoder
In reply to Dhinakaran PandiyanWith DP MST, a digital_port can carry more than one audio stream. Hence, more than one audio_connector needs to be attached to intel_digital_port in such cases. However, each stream is associated with an unique encoder. So, instead of creating an array of audio_connectors per port, move audio_connector from struct intel_digital_port to struct intel_encoder. This also simplifies access to the right audio_connector from codec functions in intel_audio.c that receive intel_encoder.
v2: Removed locals that are not needed anymore.
--- drivers/gpu/drm/i915/intel_audio.c | 12 ++++-------- drivers/gpu/drm/i915/intel_drv.h | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_audio.c +4 -8
@@ -490,7 +490,6 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)struct drm_connector *connector;struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder);enum port port = intel_encoder->attached_port; connector =drm_select_eld (encoder);
@@ -515,7 +514,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) adjusted_mode);mutex_lock (&dev_priv->av_mutex); - intel_dig_port->audio_connector = connector; + intel_encoder->audio_connector = connector;/* referred in audio callbacks */ dev_priv->dig_port_map[port] = intel_encoder;mutex_unlock (&dev_priv->av_mutex);
@@ -536,14 +535,13 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)struct drm_encoder *encoder = &intel_encoder->base;struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder);enum port port = intel_encoder->attached_port;if (dev_priv->display.audio_codec_disable) dev_priv->display.audio_codec_disable (intel_encoder);mutex_lock (&dev_priv->av_mutex); - intel_dig_port->audio_connector =NULL ; + intel_encoder->audio_connector =NULL ; dev_priv->dig_port_map[port] =NULL ;mutex_unlock (&dev_priv->av_mutex);
@@ -704,7 +702,6 @@ static int i915_audio_component_get_eld(struct device *dev, int port, {struct drm_i915_private *dev_priv =dev_to_i915 (dev);struct intel_encoder *intel_encoder; -struct intel_digital_port *intel_dig_port;const u8 *eld;int ret = -EINVAL ;
@@ -713,10 +710,9 @@ static int i915_audio_component_get_eld(struct device *dev, int port,/* intel_encoder might be NULL for DP MST */ if (intel_encoder) { ret =0 ; - intel_dig_port =enc_to_dig_port (&intel_encoder->base); - *enabled = intel_dig_port->audio_connector !=NULL ; + *enabled = intel_encoder->audio_connector !=NULL ;if (*enabled) { - eld = intel_dig_port->audio_connector->eld; + eld = intel_encoder->audio_connector->eld; ret =drm_eld_size (eld);memcpy (buf, eld,min (max_bytes, ret)); }
drivers/gpu/drm/i915/intel_drv.h +2 -2
@@ -232,6 +232,8 @@ struct intel_encoder {void (*suspend)(struct intel_encoder *);int crtc_mask;enum hpd_pin hpd_pin; +/* for communication with audio component; protected by av_mutex */ +const struct drm_connector *audio_connector; };struct intel_panel {
@@ -948,8 +950,6 @@ struct intel_digital_port {enum irqreturn (*hpd_pulse)(struct intel_digital_port *,bool );bool release_cl2_override;uint8_t max_lanes; -/* for communication with audio component; protected by av_mutex */ -const struct drm_connector *audio_connector; };struct intel_dp_mst_encoder {
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 3/4] drm/i915: Move audio_connector to intel_encoder
Confirmed on IRC, Lyude is fine with carrying over R-B from previous version.
Quoted 88 lines · Dhinakaran Pandiyan
With DP MST, a
digital_portcan carry more than one audio stream. Hence, more than oneaudio_connectorneeds to be attached tointel_digital_portin such cases. However, each stream is associated with an unique encoder. So, instead of creating an array ofaudio_connectorsper port, moveaudio_connectorfrom structintel_digital_portto structintel_encoder. This also simplifies access to the rightaudio_connectorfrom codec functions inintel_audio.cthat receiveintel_encoder.v2: Removed locals that are not needed anymore.
Signed-off-by Dhinakaran Pandiyan <[email protected]>--- drivers/gpu/drm/i915/intel_audio.c | 12 ++++-------- drivers/gpu/drm/i915/intel_drv.h | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/intel_audio.c +4
-8@@ -490,7 +490,6 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)struct drm_connector *connector;struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder);enum port port = intel_encoder->attached_port; connector =drm_select_eld (encoder);@@ -515,7 +514,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) adjusted_mode);mutex_lock (&dev_priv->av_mutex); - intel_dig_port->audio_connector = connector; + intel_encoder->audio_connector = connector;/* referred in audio callbacks */ dev_priv->dig_port_map[port] = intel_encoder;mutex_unlock (&dev_priv->av_mutex);@@ -536,14 +535,13 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)struct drm_encoder *encoder = &intel_encoder->base;struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder);enum port port = intel_encoder->attached_port;if (dev_priv->display.audio_codec_disable) dev_priv->display.audio_codec_disable (intel_encoder);mutex_lock (&dev_priv->av_mutex); - intel_dig_port->audio_connector =NULL ; + intel_encoder->audio_connector =NULL ; dev_priv->dig_port_map[port] =NULL ;mutex_unlock (&dev_priv->av_mutex);@@ -704,7 +702,6 @@ static int i915_audio_component_get_eld(struct device *dev, int port, {struct drm_i915_private *dev_priv =dev_to_i915 (dev);struct intel_encoder *intel_encoder; -struct intel_digital_port *intel_dig_port;const u8 *eld;int ret = -EINVAL ;@@ -713,10 +710,9 @@ static int i915_audio_component_get_eld(struct device *dev, int port,/* intel_encoder might be NULL for DP MST */ if (intel_encoder) { ret =0 ; - intel_dig_port =enc_to_dig_port (&intel_encoder->base); - *enabled = intel_dig_port->audio_connector !=NULL ; + *enabled = intel_encoder->audio_connector !=NULL ;if (*enabled) { - eld = intel_dig_port->audio_connector->eld; + eld = intel_encoder->audio_connector->eld; ret =drm_eld_size (eld);memcpy (buf, eld,min (max_bytes, ret)); }drivers/gpu/drm/i915/intel_drv.h +2
-0@@ -232,6 +232,8 @@ struct intel_encoder {void (*suspend)(struct intel_encoder *);int crtc_mask;enum hpd_pin hpd_pin; +/* for communication with audio component; protected by av_mutex */ +const struct drm_connector *audio_connector; };struct intel_panel {
drivers/gpu/drm/i915/intel_drv.h struct intel_digital_port { · line 955
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h +0
-2@@ -948,8 +950,6 @@ struct intel_digital_port {enum irqreturn (*hpd_pulse)(struct intel_digital_port *,bool );bool release_cl2_override;uint8_t max_lanes; -/* for communication with audio component; protected by av_mutex */ -const struct drm_connector *audio_connector; };struct intel_dp_mst_encoder {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 3/4 drm/i915: Move audio_connector to intel_encoder
In reply to Dhinakaran PandiyanWith DP MST, a digital_port can carry more than one audio stream. Hence, more than one audio_connector needs to be attached to intel_digital_port in such cases. However, each stream is associated with an unique encoder. So, instead of creating an array of audio_connectors per port, move audio_connector from struct intel_digital_port to struct intel_encoder. This also simplifies access to the right audio_connector from codec functions in intel_audio.c that receive intel_encoder.
v2: Removed locals that are not needed anymore.
--- drivers/gpu/drm/i915/intel_audio.c | 12 ++++-------- drivers/gpu/drm/i915/intel_drv.h | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_audio.c +4 -8
@@ -490,7 +490,6 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)struct drm_connector *connector;struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder);enum port port = intel_encoder->attached_port; connector =drm_select_eld (encoder);
@@ -515,7 +514,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) adjusted_mode);mutex_lock (&dev_priv->av_mutex); - intel_dig_port->audio_connector = connector; + intel_encoder->audio_connector = connector;/* referred in audio callbacks */ dev_priv->dig_port_map[port] = intel_encoder;mutex_unlock (&dev_priv->av_mutex);
@@ -536,14 +535,13 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)struct drm_encoder *encoder = &intel_encoder->base;struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder);enum port port = intel_encoder->attached_port;if (dev_priv->display.audio_codec_disable) dev_priv->display.audio_codec_disable (intel_encoder);mutex_lock (&dev_priv->av_mutex); - intel_dig_port->audio_connector =NULL ; + intel_encoder->audio_connector =NULL ; dev_priv->dig_port_map[port] =NULL ;mutex_unlock (&dev_priv->av_mutex);
@@ -704,7 +702,6 @@ static int i915_audio_component_get_eld(struct device *dev, int port, {struct drm_i915_private *dev_priv =dev_to_i915 (dev);struct intel_encoder *intel_encoder; -struct intel_digital_port *intel_dig_port;const u8 *eld;int ret = -EINVAL ;
@@ -713,10 +710,9 @@ static int i915_audio_component_get_eld(struct device *dev, int port,/* intel_encoder might be NULL for DP MST */ if (intel_encoder) { ret =0 ; - intel_dig_port =enc_to_dig_port (&intel_encoder->base); - *enabled = intel_dig_port->audio_connector !=NULL ; + *enabled = intel_encoder->audio_connector !=NULL ;if (*enabled) { - eld = intel_dig_port->audio_connector->eld; + eld = intel_encoder->audio_connector->eld; ret =drm_eld_size (eld);memcpy (buf, eld,min (max_bytes, ret)); }
drivers/gpu/drm/i915/intel_drv.h +2 -2
@@ -232,6 +232,8 @@ struct intel_encoder {void (*suspend)(struct intel_encoder *);int crtc_mask;enum hpd_pin hpd_pin; +/* for communication with audio component; protected by av_mutex */ +const struct drm_connector *audio_connector; };struct intel_panel {
@@ -948,8 +950,6 @@ struct intel_digital_port {enum irqreturn (*hpd_pulse)(struct intel_digital_port *,bool );bool release_cl2_override;uint8_t max_lanes; -/* for communication with audio component; protected by av_mutex */ -const struct drm_connector *audio_connector; };struct intel_dp_mst_encoder {
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 4/4 drm/i915: start adding dp mst audio
In reply to Dhinakaran PandiyanFrom: Libin Yang <[email protected]>
(This patch is developed by Dave Airlie <[email protected]> originally)
This patch adds support for DP MST audio in i915.
Enable audio codec when DP MST is enabled if has_audio flag is set. Disable audio codec when DP MST is disabled if has_audio flag is set.
Another separated patches to support DP MST audio will be implemented in audio driver.
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++++----- drivers/gpu/drm/i915/intel_dp_mst.c | 21 +++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ 4 files changed, 56 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +18 -1
@@ -2925,6 +2925,20 @@ static void intel_dp_info(struct seq_file *m,intel_panel_info (m, &intel_connector->panel); } +static void intel_dp_mst_info (struct seq_file *m, +struct intel_connector *intel_connector) +{ +struct intel_encoder *intel_encoder = intel_connector->encoder; +struct intel_dp_mst_encoder *intel_mst = +enc_to_mst (&intel_encoder->base); +struct intel_digital_port *intel_dig_port = intel_mst->primary; +struct intel_dp *intel_dp = &intel_dig_port->dp; +bool has_audio =drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, + intel_connector->port); + +seq_printf (m,"\taudio support: %s\n" ,yesno (has_audio)); +} +static void intel_hdmi_info (struct seq_file *m,struct intel_connector *intel_connector) {
@@ -2967,7 +2981,10 @@ static void intel_connector_info(struct seq_file *m,switch (connector->connector_type) {case DRM_MODE_CONNECTOR_DisplayPort:case DRM_MODE_CONNECTOR_eDP: -intel_dp_info (m, intel_connector); +if (intel_encoder->type ==INTEL_OUTPUT_DP_MST ) +intel_dp_mst_info (m, intel_connector); +else +intel_dp_info (m, intel_connector);break ;case DRM_MODE_CONNECTOR_LVDS :if (intel_encoder->type ==INTEL_OUTPUT_LVDS )
drivers/gpu/drm/i915/intel_ddi.c +15 -5
@@ -2173,6 +2173,19 @@ void intel_ddi_fdi_disable(struct drm_crtc *crtc)I915_WRITE (FDI_RX_CTL (PIPE_A ), val); } +bool intel_ddi_is_audio_enabled (struct drm_i915_private *dev_priv, +struct intel_crtc *intel_crtc) +{ +u32 temp; + +if (intel_display_power_is_enabled (dev_priv,POWER_DOMAIN_AUDIO )) { + temp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); +if (temp &AUDIO_OUTPUT_ENABLE (intel_crtc->pipe)) +return true; + } +return false; +} +void intel_ddi_get_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config) {
@@ -2238,11 +2251,8 @@ void intel_ddi_get_config(struct intel_encoder *encoder,break ; } -if (intel_display_power_is_enabled (dev_priv,POWER_DOMAIN_AUDIO )) { - temp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); -if (temp &AUDIO_OUTPUT_ENABLE (intel_crtc->pipe)) - pipe_config->has_audio = true; - } + pipe_config->has_audio = +intel_ddi_is_audio_enabled (dev_priv, intel_crtc);if (encoder->type ==INTEL_OUTPUT_EDP && dev_priv->vbt.edp.bpp && pipe_config->pipe_bpp > dev_priv->vbt.edp.bpp) {
drivers/gpu/drm/i915/intel_dp_mst.c +21 -0
@@ -76,6 +76,8 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,return false; } +if (drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, found->port)) + pipe_config->has_audio = true; mst_pbn =drm_dp_calc_pbn_mode (adjusted_mode->crtc_clock, bpp); pipe_config->pbn = mst_pbn;
@@ -97,6 +99,10 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder)struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp; +struct drm_device *dev = encoder->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_crtc *crtc = encoder->base.crtc; +struct intel_crtc *intel_crtc =to_intel_crtc (crtc);int ret;DRM_DEBUG_KMS ("%d\n" , intel_dp->active_mst_links);
@@ -107,6 +113,10 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder)if (ret) {DRM_ERROR ("failed to update payload %d\n" , ret); } +if (intel_crtc->config->has_audio) { +intel_audio_codec_disable (encoder); +intel_display_power_put (dev_priv,POWER_DOMAIN_AUDIO ); + } }static void intel_mst_post_disable_dp (struct intel_encoder *encoder)
@@ -207,7 +217,9 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder)struct intel_dp *intel_dp = &intel_dig_port->dp;struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc);enum port port = intel_dig_port->port; +enum pipe pipe = crtc->pipe;int ret;DRM_DEBUG_KMS ("%d\n" , intel_dp->active_mst_links);
@@ -222,6 +234,12 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder) ret =drm_dp_check_act_status (&intel_dp->mst_mgr); ret =drm_dp_update_payload_part2 (&intel_dp->mst_mgr); +if (crtc->config->has_audio) { +DRM_DEBUG_DRIVER ("Enabling DP audio on pipe %c\n" , +pipe_name (pipe)); +intel_display_power_get (dev_priv,POWER_DOMAIN_AUDIO ); +intel_audio_codec_enable (encoder); + } } static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
@@ -245,6 +263,9 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;u32 temp, flags =0 ; + pipe_config->has_audio = +intel_ddi_is_audio_enabled (dev_priv, crtc); + temp =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder));if (temp &TRANS_DDI_PHSYNC ) flags |=DRM_MODE_FLAG_PHSYNC ;
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -1142,6 +1142,8 @@ void intel_ddi_set_pipe_settings(struct drm_crtc *crtc);void intel_ddi_prepare_link_retrain (struct intel_dp *intel_dp);bool intel_ddi_connector_get_hw_state (struct intel_connector *intel_connector);void intel_ddi_fdi_disable (struct drm_crtc *crtc); +bool intel_ddi_is_audio_enabled (struct drm_i915_private *dev_priv, +struct intel_crtc *intel_crtc);void intel_ddi_get_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config); struct intel_encoder *
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 4/4] drm/i915: start adding dp mst audio
This looks fine to me.
Quoted 207 lines · Dhinakaran Pandiyan
From: Libin Yang <[email protected]>
(This patch is developed by Dave Airlie <[email protected]> originally)
This patch adds support for DP MST audio in i915.
Enable audio codec when DP MST is enabled if
has_audioflag is set. Disable audio codec when DP MST is disabled ifhas_audioflag is set.Another separated patches to support DP MST audio will be implemented in audio driver.
Signed-off-by Libin Yang <[email protected]>Reviewed-by Lyude <[email protected]>---
drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++++-----drivers/gpu/drm/i915/intel_dp_mst.c| 21 +++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++4 files changed, 56 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2925,6 +2925,20 @@ static void intel_dp_info(struct seq_file *m, intel_panel_info(m, &intel_connector->panel); }drivers/gpu/drm/i915/i915_debugfs.c +4
-0+static void intel_dp_mst_info (struct seq_file *m, + struct intel_connector *intel_connector) +{ + struct intel_encoder *intel_encoder = intel_connector-Quoted 1 line
encoder;
drivers/gpu/drm/i915/i915_debugfs.c +3
-0+struct intel_dp_mst_encoder *intel_mst = +enc_to_mst (&intel_encoder->base); + struct intel_digital_port *intel_dig_port = intel_mst-Quoted 1 line
primary;
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+struct intel_dp *intel_dp = &intel_dig_port->dp; + bool has_audio = drm_dp_mst_port_has_audio(&intel_dp-Quoted 1 line
mst_mgr,drivers/gpu/drm/i915/i915_debugfs.c +5
-0+ intel_connector->port); + +seq_printf (m,"\taudio support: %s\n" ,yesno (has_audio)); +} +static void intel_hdmi_info(struct
seq_file*m,
structintel_connector*intel_connector) {drivers/gpu/drm/i915/i915_debugfs.c +0
-0@@ -2967,7 +2981,10 @@ static void intel_connector_info(struct seq_file *m, switch (connector->connector_type) {case
DRM_MODE_CONNECTOR_DisplayPort:
caseDRM_MODE_CONNECTOR_eDP:drivers/gpu/drm/i915/i915_debugfs.c +4
-1-intel_dp_info (m, intel_connector); +if (intel_encoder->type ==INTEL_OUTPUT_DP_MST ) +intel_dp_mst_info (m, intel_connector); +else +intel_dp_info (m, intel_connector);break;
caseDRM_MODE_CONNECTOR_LVDS:
if (intel_encoder->type==INTEL_OUTPUT_LVDS)drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -2173,6 +2173,19 @@ void intel_ddi_fdi_disable(struct drm_crtc *crtc) I915_WRITE(FDI_RX_CTL(PIPE_A), val); }drivers/gpu/drm/i915/intel_ddi.c +6
-0+bool intel_ddi_is_audio_enabled (struct drm_i915_private *dev_priv, + struct intel_crtc *intel_crtc) +{ +u32 temp; + + if (intel_display_power_is_enabled(dev_priv,
POWER_DOMAIN_AUDIO)) {drivers/gpu/drm/i915/intel_ddi.c +7
-0+ temp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); +if (temp &AUDIO_OUTPUT_ENABLE (intel_crtc->pipe)) +return true; + } +return false; +} +void
intel_ddi_get_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config){drivers/gpu/drm/i915/intel_ddi.c +0
-0@@ -2238,11 +2251,8 @@ void intel_ddi_get_config(struct intel_encoder *encoder, break; }drivers/gpu/drm/i915/intel_ddi.c +0
-1- if (intel_display_power_is_enabled(dev_priv,
POWER_DOMAIN_AUDIO)) {drivers/gpu/drm/i915/intel_ddi.c +2
-4- temp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); -if (temp &AUDIO_OUTPUT_ENABLE (intel_crtc->pipe)) - pipe_config->has_audio = true; - } + pipe_config->has_audio = +intel_ddi_is_audio_enabled (dev_priv, intel_crtc);
if (encoder->type==INTEL_OUTPUT_EDP&& dev_priv-Quoted 1 line
vbt.edp.bpp &&
pipe_config->pipe_bpp >
dev_priv->vbt.edp.bpp) {drivers/gpu/drm/i915/intel_dp_mst.c +0
-0@@ -76,6 +76,8 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder, return false; }drivers/gpu/drm/i915/intel_dp_mst.c +1
-0+ if (drm_dp_mst_port_has_audio(&intel_dp->mst_mgr, found-Quoted 1 line
port))
drivers/gpu/drm/i915/intel_dp_mst.c +1
-0+ pipe_config->has_audio = true;
mst_pbn=drm_dp_calc_pbn_mode(adjusted_mode->crtc_clock, bpp);
pipe_config->pbn=mst_pbn;drivers/gpu/drm/i915/intel_dp_mst.c +0
-0@@ -97,6 +99,10 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder)struct
intel_dp_mst_encoder*intel_mst=enc_to_mst(&encoder->base);
structintel_digital_port*intel_dig_port= intel_mst-Quoted 1 line
primary;
struct
intel_dp*intel_dp=&intel_dig_port->dp;drivers/gpu/drm/i915/intel_dp_mst.c +4
-0+struct drm_device *dev = encoder->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_crtc *crtc = encoder->base.crtc; +struct intel_crtc *intel_crtc =to_intel_crtc (crtc);int ret;
DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);drivers/gpu/drm/i915/intel_dp_mst.c +4
-0@@ -107,6 +113,10 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder) if (ret) { DRM_ERROR("failed to update payload %d\n", ret); } +if (intel_crtc->config->has_audio) { +intel_audio_codec_disable (encoder); +intel_display_power_put (dev_priv,POWER_DOMAIN_AUDIO ); + } }
static voidintel_mst_post_disable_dp(struct intel_encoder *encoder)drivers/gpu/drm/i915/intel_dp_mst.c +2
-0@@ -207,7 +217,9 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder) struct intel_dp *intel_dp = &intel_dig_port->dp; struct drm_device *dev = intel_dig_port->base.base.dev; struct drm_i915_private *dev_priv = to_i915(dev); +struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); enum port port = intel_dig_port->port; +enum pipe pipe = crtc->pipe; int ret;
DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);drivers/gpu/drm/i915/intel_dp_mst.c +0
-0@@ -222,6 +234,12 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder) ret = drm_dp_check_act_status(&intel_dp->mst_mgr);
ret =drm_dp_update_payload_part2(&intel_dp->mst_mgr);drivers/gpu/drm/i915/intel_dp_mst.c +4
-0+if (crtc->config->has_audio) { +DRM_DEBUG_DRIVER ("Enabling DP audio on pipe %c\n" , + pipe_name(pipe)); + intel_display_power_get(dev_priv,
POWER_DOMAIN_AUDIO);drivers/gpu/drm/i915/intel_dp_mst.c +2
-0+intel_audio_codec_enable (encoder); + }}
static bool intel_dp_mst_enc_get_hw_state(structintel_encoder*encoder,drivers/gpu/drm/i915/intel_dp_mst.c +0
-0@@ -245,6 +263,9 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,enum transcoder
cpu_transcoder= pipe_config-Quoted 1 line
cpu_transcoder;u32 temp, flags = 0;
drivers/gpu/drm/i915/intel_dp_mst.c +3
-0+ pipe_config->has_audio = +intel_ddi_is_audio_enabled (dev_priv, crtc); +temp = I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder)); if (temp &
TRANS_DDI_PHSYNC)
flags |=DRM_MODE_FLAG_PHSYNC;drivers/gpu/drm/i915/intel_drv.h +0
-0@@ -1142,6 +1142,8 @@ void intel_ddi_set_pipe_settings(struct drm_crtc *crtc); void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp);bool
intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector);
voidintel_ddi_fdi_disable(struct drm_crtc *crtc);drivers/gpu/drm/i915/intel_drv.h +2
-0+bool intel_ddi_is_audio_enabled (struct drm_i915_private *dev_priv, + struct intel_crtc *intel_crtc);void
intel_ddi_get_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config); structintel_encoder*
Signature · 6 lines
Cheers, Lyude _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/4 drm/i915: Switch to using port stored in intel_encoder
In reply to Dhinakaran PandiyanNow that we have the port enum stored in intel_encoder use that instead of dereferencing intel_dig_port. Saves us a few locals.
struct intel_encoder variables have been renamed to be consistent and convey type information.
--- drivers/gpu/drm/i915/intel_audio.c | 39 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/intel_audio.c +15 -24
@@ -276,17 +276,15 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder) }static void hsw_audio_codec_enable (struct drm_connector *connector, -struct intel_encoder *encoder, +struct intel_encoder *intel_encoder,const struct drm_display_mode *adjusted_mode) {struct drm_i915_private *dev_priv =to_i915 (connector->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (intel_encoder->base.crtc);enum pipe pipe = intel_crtc->pipe; +enum port port = intel_encoder->attached_port;struct i915_audio_component *acomp = dev_priv->audio_component;const uint8_t *eld = connector->eld; -struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port;uint32_t tmp;int len, i;int n, rate;
@@ -355,14 +353,12 @@ static void hsw_audio_codec_enable(struct drm_connector *connector,mutex_unlock (&dev_priv->av_mutex); } -static void ilk_audio_codec_disable (struct intel_encoder *encoder) +static void ilk_audio_codec_disable (struct intel_encoder *intel_encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port; +struct drm_i915_private *dev_priv =to_i915 (intel_encoder->base.dev); +struct intel_crtc *intel_crtc =to_intel_crtc (intel_encoder->base.crtc);enum pipe pipe = intel_crtc->pipe; +enum port port = intel_encoder->attached_port;uint32_t tmp, eldv;i915_reg_t aud_config, aud_cntrl_st2;
@@ -402,18 +398,15 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder) }static void ilk_audio_codec_enable (struct drm_connector *connector, -struct intel_encoder *encoder, +struct intel_encoder *intel_encoder,const struct drm_display_mode *adjusted_mode) {struct drm_i915_private *dev_priv =to_i915 (connector->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); -struct intel_digital_port *intel_dig_port = -enc_to_dig_port (&encoder->base); -enum port port = intel_dig_port->port; +struct intel_crtc *intel_crtc =to_intel_crtc (intel_encoder->base.crtc);enum pipe pipe = intel_crtc->pipe; +enum port port = intel_encoder->attached_port;uint8_t *eld = connector->eld; -uint32_t eldv; -uint32_t tmp; +uint32_t tmp, eldv;int len, i;i915_reg_t hdmiw_hdmiedid, aud_config, aud_cntl_st, aud_cntrl_st2;
@@ -495,11 +488,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)struct intel_crtc *crtc =to_intel_crtc (encoder->crtc);const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;struct drm_connector *connector; -struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component;struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->attached_port; connector =drm_select_eld (encoder);if (!connector)
@@ -542,11 +534,10 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)void intel_audio_codec_disable (struct intel_encoder *intel_encoder) {struct drm_encoder *encoder = &intel_encoder->base; -struct drm_device *dev = encoder->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component;struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->attached_port;if (dev_priv->display.audio_codec_disable) dev_priv->display.audio_codec_disable (intel_encoder);
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/4 drm/i915: Move audio_connector to intel_encoder
In reply to Dhinakaran PandiyanWith DP MST, a digital_port can carry more than one audio stream. Hence, more than one audio_connector needs to be attached to intel_digital_port in such cases. However, each stream is associated with an unique encoder. So, instead of creating an array of audio_connectors per port, move audio_connector from struct intel_digital_port to struct intel_encoder. This also simplifies access to the right audio_connector from codec functions in intel_audio.c that receive intel_encoder.
v2: Removed local that are needed anymore.
--- drivers/gpu/drm/i915/intel_audio.c | 12 ++++-------- drivers/gpu/drm/i915/intel_drv.h | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_audio.c +4 -8
@@ -490,7 +490,6 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder)struct drm_connector *connector;struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder);enum port port = intel_encoder->attached_port; connector =drm_select_eld (encoder);
@@ -515,7 +514,7 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder) adjusted_mode);mutex_lock (&dev_priv->av_mutex); - intel_dig_port->audio_connector = connector; + intel_encoder->audio_connector = connector;/* referred in audio callbacks */ dev_priv->dig_port_map[port] = intel_encoder;mutex_unlock (&dev_priv->av_mutex);
@@ -536,14 +535,13 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)struct drm_encoder *encoder = &intel_encoder->base;struct drm_i915_private *dev_priv =to_i915 (encoder->dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder);enum port port = intel_encoder->attached_port;if (dev_priv->display.audio_codec_disable) dev_priv->display.audio_codec_disable (intel_encoder);mutex_lock (&dev_priv->av_mutex); - intel_dig_port->audio_connector =NULL ; + intel_encoder->audio_connector =NULL ; dev_priv->dig_port_map[port] =NULL ;mutex_unlock (&dev_priv->av_mutex);
@@ -704,7 +702,6 @@ static int i915_audio_component_get_eld(struct device *dev, int port, {struct drm_i915_private *dev_priv =dev_to_i915 (dev);struct intel_encoder *intel_encoder; -struct intel_digital_port *intel_dig_port;const u8 *eld;int ret = -EINVAL ;
@@ -713,10 +710,9 @@ static int i915_audio_component_get_eld(struct device *dev, int port,/* intel_encoder might be NULL for DP MST */ if (intel_encoder) { ret =0 ; - intel_dig_port =enc_to_dig_port (&intel_encoder->base); - *enabled = intel_dig_port->audio_connector !=NULL ; + *enabled = intel_encoder->audio_connector !=NULL ;if (*enabled) { - eld = intel_dig_port->audio_connector->eld; + eld = intel_encoder->audio_connector->eld; ret =drm_eld_size (eld);memcpy (buf, eld,min (max_bytes, ret)); }
drivers/gpu/drm/i915/intel_drv.h +2 -2
@@ -232,6 +232,8 @@ struct intel_encoder {void (*suspend)(struct intel_encoder *);int crtc_mask;enum hpd_pin hpd_pin; +/* for communication with audio component; protected by av_mutex */ +const struct drm_connector *audio_connector; };struct intel_panel {
@@ -948,8 +950,6 @@ struct intel_digital_port {enum irqreturn (*hpd_pulse)(struct intel_digital_port *,bool );bool release_cl2_override;uint8_t max_lanes; -/* for communication with audio component; protected by av_mutex */ -const struct drm_connector *audio_connector; };struct intel_dp_mst_encoder {
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/4 drm/i915: start adding dp mst audio
In reply to Dhinakaran PandiyanFrom: Libin Yang <[email protected]>
(This patch is developed by Dave Airlie <[email protected]> originally)
This patch adds support for DP MST audio in i915.
Enable audio codec when DP MST is enabled if has_audio flag is set. Disable audio codec when DP MST is disabled if has_audio flag is set.
Another separated patches to support DP MST audio will be implemented in audio driver.
--- drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++++++++++++- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++++----- drivers/gpu/drm/i915/intel_dp_mst.c | 21 +++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 2 ++ 4 files changed, 56 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +18 -1
@@ -2925,6 +2925,20 @@ static void intel_dp_info(struct seq_file *m,intel_panel_info (m, &intel_connector->panel); } +static void intel_dp_mst_info (struct seq_file *m, +struct intel_connector *intel_connector) +{ +struct intel_encoder *intel_encoder = intel_connector->encoder; +struct intel_dp_mst_encoder *intel_mst = +enc_to_mst (&intel_encoder->base); +struct intel_digital_port *intel_dig_port = intel_mst->primary; +struct intel_dp *intel_dp = &intel_dig_port->dp; +bool has_audio =drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, + intel_connector->port); + +seq_printf (m,"\taudio support: %s\n" ,yesno (has_audio)); +} +static void intel_hdmi_info (struct seq_file *m,struct intel_connector *intel_connector) {
@@ -2967,7 +2981,10 @@ static void intel_connector_info(struct seq_file *m,switch (connector->connector_type) {case DRM_MODE_CONNECTOR_DisplayPort:case DRM_MODE_CONNECTOR_eDP: -intel_dp_info (m, intel_connector); +if (intel_encoder->type ==INTEL_OUTPUT_DP_MST ) +intel_dp_mst_info (m, intel_connector); +else +intel_dp_info (m, intel_connector);break ;case DRM_MODE_CONNECTOR_LVDS :if (intel_encoder->type ==INTEL_OUTPUT_LVDS )
drivers/gpu/drm/i915/intel_ddi.c +15 -5
@@ -2173,6 +2173,19 @@ void intel_ddi_fdi_disable(struct drm_crtc *crtc)I915_WRITE (FDI_RX_CTL (PIPE_A ), val); } +bool intel_ddi_is_audio_enabled (struct drm_i915_private *dev_priv, +struct intel_crtc *intel_crtc) +{ +u32 temp; + +if (intel_display_power_is_enabled (dev_priv,POWER_DOMAIN_AUDIO )) { + temp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); +if (temp &AUDIO_OUTPUT_ENABLE (intel_crtc->pipe)) +return true; + } +return false; +} +void intel_ddi_get_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config) {
@@ -2238,11 +2251,8 @@ void intel_ddi_get_config(struct intel_encoder *encoder,break ; } -if (intel_display_power_is_enabled (dev_priv,POWER_DOMAIN_AUDIO )) { - temp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); -if (temp &AUDIO_OUTPUT_ENABLE (intel_crtc->pipe)) - pipe_config->has_audio = true; - } + pipe_config->has_audio = +intel_ddi_is_audio_enabled (dev_priv, intel_crtc);if (encoder->type ==INTEL_OUTPUT_EDP && dev_priv->vbt.edp.bpp && pipe_config->pipe_bpp > dev_priv->vbt.edp.bpp) {
drivers/gpu/drm/i915/intel_dp_mst.c +21 -0
@@ -76,6 +76,8 @@ static bool intel_dp_mst_compute_config(struct intel_encoder *encoder,return false; } +if (drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, found->port)) + pipe_config->has_audio = true; mst_pbn =drm_dp_calc_pbn_mode (adjusted_mode->crtc_clock, bpp); pipe_config->pbn = mst_pbn;
@@ -97,6 +99,10 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder)struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp; +struct drm_device *dev = encoder->base.dev; +struct drm_i915_private *dev_priv = dev->dev_private; +struct drm_crtc *crtc = encoder->base.crtc; +struct intel_crtc *intel_crtc =to_intel_crtc (crtc);int ret;DRM_DEBUG_KMS ("%d\n" , intel_dp->active_mst_links);
@@ -107,6 +113,10 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder)if (ret) {DRM_ERROR ("failed to update payload %d\n" , ret); } +if (intel_crtc->config->has_audio) { +intel_audio_codec_disable (encoder); +intel_display_power_put (dev_priv,POWER_DOMAIN_AUDIO ); + } }static void intel_mst_post_disable_dp (struct intel_encoder *encoder)
@@ -207,7 +217,9 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder)struct intel_dp *intel_dp = &intel_dig_port->dp;struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc);enum port port = intel_dig_port->port; +enum pipe pipe = crtc->pipe;int ret;DRM_DEBUG_KMS ("%d\n" , intel_dp->active_mst_links);
@@ -222,6 +234,12 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder) ret =drm_dp_check_act_status (&intel_dp->mst_mgr); ret =drm_dp_update_payload_part2 (&intel_dp->mst_mgr); +if (crtc->config->has_audio) { +DRM_DEBUG_DRIVER ("Enabling DP audio on pipe %c\n" , +pipe_name (pipe)); +intel_display_power_get (dev_priv,POWER_DOMAIN_AUDIO ); +intel_audio_codec_enable (encoder); + } } static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
@@ -245,6 +263,9 @@ static void intel_dp_mst_enc_get_config(struct intel_encoder *encoder,enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;u32 temp, flags =0 ; + pipe_config->has_audio = +intel_ddi_is_audio_enabled (dev_priv, crtc); + temp =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder));if (temp &TRANS_DDI_PHSYNC ) flags |=DRM_MODE_FLAG_PHSYNC ;
drivers/gpu/drm/i915/intel_drv.h +2 -0
@@ -1142,6 +1142,8 @@ void intel_ddi_set_pipe_settings(struct drm_crtc *crtc);void intel_ddi_prepare_link_retrain (struct intel_dp *intel_dp);bool intel_ddi_connector_get_hw_state (struct intel_connector *intel_connector);void intel_ddi_fdi_disable (struct drm_crtc *crtc); +bool intel_ddi_is_audio_enabled (struct drm_i915_private *dev_priv, +struct intel_crtc *intel_crtc);void intel_ddi_get_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config); struct intel_encoder *
Signature · 6 lines
2.5.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for Prep. for DP audio MST support (rev2)
In reply to Dhinakaran Pandiyan== Series Details ==
== Series Details ==
Series: Prep. for DP audio MST support (rev2)
URL : https://patchwork.freedesktop.org/series/11129/
State : failure
== Summary ==
Series 11129v2 Prep. for DP audio MST support
http://patchwork.freedesktop.org/api/1.0/series/11129/revisions/2/mbox/
Test gem_exec_suspend:
Subgroup basic-s3:
dmesg-warn -> INCOMPLETE (fi-hsw-4770k)
Test kms_cursor_legacy:
Subgroup basic-flip-vs-cursor-legacy:
pass -> FAIL (fi-skl-6700k)
Subgroup basic-flip-vs-cursor-varying-size:
pass -> FAIL (fi-skl-6700k)
fail -> PASS (fi-hsw-4770r)fi-bdw-5557u total:249 pass:232 dwarn:0 dfail:0 fail:1 skip:16 fi-bsw-n3050 total:249 pass:202 dwarn:0 dfail:0 fail:3 skip:44 fi-byt-n2820 total:249 pass:204 dwarn:0 dfail:0 fail:4 skip:41 fi-hsw-4770k total:107 pass:91 dwarn:0 dfail:0 fail:0 skip:15 fi-hsw-4770r total:249 pass:222 dwarn:0 dfail:0 fail:1 skip:26 fi-ivb-3520m total:249 pass:217 dwarn:0 dfail:0 fail:1 skip:31 fi-skl-6260u total:249 pass:234 dwarn:0 dfail:0 fail:1 skip:14 fi-skl-6700k total:249 pass:214 dwarn:4 dfail:0 fail:3 skip:28 fi-snb-2520m total:249 pass:201 dwarn:4 dfail:0 fail:2 skip:42 fi-snb-2600 total:249 pass:202 dwarn:4 dfail:0 fail:1 skip:42
Results at /archive/results/CI_IGT_test/Patchwork_2414/
74607c2ff95614c1ace6a7207a2960ecc1cec95c drm-intel-nightly: 2016y-08m-23d-19h-46m-16s UTC integration manifest f7d8bf1 drm/i915: Switch to using port stored in intel_encoder
50a0bdf drm/i915: Store port enum in intel_encoder
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx