drm/i915: Make infoframe code available to (e)DP ports
Subsystems (3)
v3 cover drm/i915: Make infoframe code available to (e)DP ports
From: Ville Syrjälä <[email protected]>
A rebased reposting of the dig_port infoframe series.
Notable changes since last time:
* Dealt with the new intel_sdvo_connector_state
* Annotated the SDP types with the DP spec version information
* Fixed the kernel docs for the PSR enable/disable funcs
Ville Syrjälä (8):
drm/dp: Add defines for DP SDP types
drm/i915: Check has_infoframes when enabling infoframes drm/i915: Disable infoframes when shutting down DDI HDMI drm/i915: Move infoframe vfuncs into intel_digital_port drm/i915: Init infoframe vfuncs for DP encoders as well drm/i915: Plumb crtc_state to PSR enable/disable
drm/i915: Remove mostly duplicated video DIP handling from PSR code drm/i915: Constify states passed to enable/disable/etc. encoder hooks
drivers/gpu/drm/i915/intel_crt.c | 22 ++--- drivers/gpu/drm/i915/intel_ddi.c | 70 ++++++++------ drivers/gpu/drm/i915/intel_dp.c | 71 +++++++------- drivers/gpu/drm/i915/intel_dp_mst.c | 16 ++-- drivers/gpu/drm/i915/intel_drv.h | 60 ++++++------ drivers/gpu/drm/i915/intel_dsi.c | 22 ++--- drivers/gpu/drm/i915/intel_dvo.c | 12 +-- drivers/gpu/drm/i915/intel_hdmi.c | 183 ++++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_lvds.c | 24 ++--- drivers/gpu/drm/i915/intel_psr.c | 118 ++++++++++------------- drivers/gpu/drm/i915/intel_sdvo.c | 40 ++++---- drivers/gpu/drm/i915/intel_tv.c | 14 +-- include/drm/drm_dp_helper.h | 12 +++ 13 files changed, 343 insertions(+), 321 deletions(-)
Signature · 6 lines
2.13.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/8 drm/dp: Add defines for DP SDP types
From: Ville Syrjälä <[email protected]>
Add defines for the secondary data packet (SDP) types from the spec. These are the DP specific ones, and in addition HDMI infoframe types (see enum hdmi_infoframe_type) are also valid SDP types.
v2: Add more SDP types
v3: Note the DP version that added each SDP type (Rodrigo)
--- include/drm/drm_dp_helper.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/drm/drm_dp_helper.h +12 -0
@@ -871,6 +871,18 @@ void drm_dp_link_train_channel_eq_delay(const u8 dpcd[DP_RECEIVER_CAP_SIZE]);u8 drm_dp_link_rate_to_bw_code (int link_rate);int drm_dp_bw_code_to_link_rate (u8 link_bw); +#define DP_SDP_AUDIO_TIMESTAMP 0x01 +#define DP_SDP_AUDIO_STREAM 0x02 +#define DP_SDP_EXTENSION 0x04/* DP 1.1 */ +#define DP_SDP_AUDIO_COPYMANAGEMENT 0x05/* DP 1.2 */ +#define DP_SDP_ISRC 0x06/* DP 1.2 */ +#define DP_SDP_VSC 0x07/* DP 1.2 */ +#define DP_SDP_CAMERA_GENERIC (i) (0x08 + (i))/* 0-7, DP 1.3 */ +#define DP_SDP_PPS 0x10/* DP 1.4 */ +#define DP_SDP_VSC_EXT_VESA 0x20/* DP 1.4 */ +#define DP_SDP_VSC_EXT_CEA 0x21/* DP 1.4 */ +/* 0x80+ CEA-861 infoframe types */ +struct edp_sdp_header {u8 HB0;/* Secondary Data Packet ID */ u8 HB1;/* Secondary Data Packet Type */
Signature · 6 lines
2.13.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/8 drm/i915: Check has_infoframes when enabling infoframes
In reply to [email protected]From: Ville Syrjälä <[email protected]>
has_infoframe is what tells us whether infoframes should be enabled, so let's pass that instead of has_hdmi_sink to .set_infoframes().
--- drivers/gpu/drm/i915/intel_ddi.c | 6 +++--- drivers/gpu/drm/i915/intel_hdmi.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +3 -3
@@ -2150,7 +2150,7 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder, }static void intel_ddi_pre_enable_hdmi (struct intel_encoder *encoder, -bool has_hdmi_sink, +bool has_infoframe,const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state,struct intel_shared_dpll *pll)
@@ -2177,7 +2177,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,cnl_ddi_vswing_sequence (encoder, level); intel_hdmi->set_infoframes (drm_encoder, - has_hdmi_sink, + has_infoframe, crtc_state, conn_state); }
@@ -2197,7 +2197,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *encoder, }if (type ==INTEL_OUTPUT_HDMI ) {intel_ddi_pre_enable_hdmi (encoder, - pipe_config->has_hdmi_sink, + pipe_config->has_infoframe, pipe_config, conn_state, pipe_config->shared_dpll); }
drivers/gpu/drm/i915/intel_hdmi.c +3 -3
@@ -1650,7 +1650,7 @@ static void intel_hdmi_pre_enable(struct intel_encoder *encoder,intel_hdmi_prepare (encoder, pipe_config); intel_hdmi->set_infoframes (&encoder->base, - pipe_config->has_hdmi_sink, + pipe_config->has_infoframe, pipe_config, conn_state); }
@@ -1670,7 +1670,7 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder, 0x2b247878); intel_hdmi->set_infoframes (&encoder->base, - pipe_config->has_hdmi_sink, + pipe_config->has_infoframe, pipe_config, conn_state);g4x_enable_hdmi (encoder, pipe_config, conn_state);
@@ -1742,7 +1742,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder,chv_set_phy_signal_level (encoder,128 ,102 , false); intel_hdmi->set_infoframes (&encoder->base, - pipe_config->has_hdmi_sink, + pipe_config->has_infoframe, pipe_config, conn_state);g4x_enable_hdmi (encoder, pipe_config, conn_state);
Signature · 6 lines
2.13.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/8 drm/i915: Disable infoframes when shutting down DDI HDMI
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Disabling the video DIP when shutting the port down seems like a good idea.
Bspec says:
"When disabling both the DIP port and DIP transmission,
first disable the port and then disable DIP."
and
"Restriction : GCP is only supported with HDMI when the bits per color is
not equal to 8. GCP must be enabled prior to enabling TRANS_DDI_FUNC_CTL for HDMI with bits per color not equal to 8 and disabled after disabling TRANS_DDI_FUNC_CTL"
So let's do it in the .post_disable() hook.
--- drivers/gpu/drm/i915/intel_ddi.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +13 -3
@@ -2211,7 +2211,6 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->dev);enum port port =intel_ddi_get_encoder_port (intel_encoder);struct intel_digital_port *dig_port =enc_to_dig_port (encoder); -struct intel_dp *intel_dp =NULL ;int type = intel_encoder->type;uint32_t val;bool wait = false;
@@ -2219,7 +2218,8 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder,/* old_crtc_state and old_conn_state are NULL when called from DP_MST */ if (type ==INTEL_OUTPUT_DP || type ==INTEL_OUTPUT_EDP ) { - intel_dp =enc_to_intel_dp (encoder); +struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_OFF ); }
@@ -2238,7 +2238,17 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder,if (wait)intel_wait_ddi_buf_idle (dev_priv, port); -if (intel_dp) { +if (type ==INTEL_OUTPUT_HDMI ) { +struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder); + + intel_hdmi->set_infoframes (encoder, false, + old_crtc_state, old_conn_state); + } + +if (type ==INTEL_OUTPUT_DP || type ==INTEL_OUTPUT_EDP ) { +struct intel_dp *intel_dp =enc_to_intel_dp (encoder); + +intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_OFF );intel_edp_panel_vdd_on (intel_dp);intel_edp_panel_off (intel_dp); }
Signature · 6 lines
2.13.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/8 drm/i915: Disable infoframes when shutting down DDI HDMI
From: Ville Syrjälä <[email protected]>
Disabling the video DIP when shutting the port down seems like a good idea.
Bspec says:
"When disabling both the DIP port and DIP transmission,
first disable the port and then disable DIP."
and
"Restriction : GCP is only supported with HDMI when the bits per color is
not equal to 8. GCP must be enabled prior to enabling TRANS_DDI_FUNC_CTL for HDMI with bits per color not equal to 8 and disabled after disabling TRANS_DDI_FUNC_CTL"
So let's do it in the .post_disable() hook.
v2: Remove double "dpms off" caused by rebase fail
--- drivers/gpu/drm/i915/intel_ddi.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +12 -3
@@ -2211,7 +2211,6 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->dev);enum port port =intel_ddi_get_encoder_port (intel_encoder);struct intel_digital_port *dig_port =enc_to_dig_port (encoder); -struct intel_dp *intel_dp =NULL ;int type = intel_encoder->type;uint32_t val;bool wait = false;
@@ -2219,7 +2218,8 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder,/* old_crtc_state and old_conn_state are NULL when called from DP_MST */ if (type ==INTEL_OUTPUT_DP || type ==INTEL_OUTPUT_EDP ) { - intel_dp =enc_to_intel_dp (encoder); +struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_OFF ); }
@@ -2238,7 +2238,16 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder,if (wait)intel_wait_ddi_buf_idle (dev_priv, port); -if (intel_dp) { +if (type ==INTEL_OUTPUT_HDMI ) { +struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder); + + intel_hdmi->set_infoframes (encoder, false, + old_crtc_state, old_conn_state); + } + +if (type ==INTEL_OUTPUT_DP || type ==INTEL_OUTPUT_EDP ) { +struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +intel_edp_panel_vdd_on (intel_dp);intel_edp_panel_off (intel_dp); }
Signature · 6 lines
2.13.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/8 drm/i915: Move infoframe vfuncs into intel_digital_port
In reply to [email protected]From: Ville Syrjälä <[email protected]>
DP ports will also want to utilize the video DIP for SDP transmission. So let's move the vfuncs into the dig_port.
v2: Rebase due to DDI changes
--- drivers/gpu/drm/i915/intel_ddi.c | 22 ++++++------- drivers/gpu/drm/i915/intel_drv.h | 21 +++++++------ drivers/gpu/drm/i915/intel_hdmi.c | 65 ++++++++++++++++++++------------------- 3 files changed, 55 insertions(+), 53 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +10 -12
@@ -2155,9 +2155,9 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,const struct drm_connector_state *conn_state, struct intel_shared_dpll *pll) { - struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); + struct intel_digital_port *intel_dig_port = enc_to_dig_port(&encoder->base); +struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct drm_encoder *drm_encoder = &encoder->base;enum port port =intel_ddi_get_encoder_port (encoder);int level =intel_ddi_hdmi_level (dev_priv, port);struct intel_digital_port *dig_port =enc_to_dig_port (&encoder->base);
@@ -2176,9 +2176,9 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,else if (IS_CANNONLAKE (dev_priv))cnl_ddi_vswing_sequence (encoder, level); - intel_hdmi->set_infoframes (drm_encoder, - has_infoframe, - crtc_state, conn_state); + intel_dig_port->set_infoframes (&encoder->base, + has_infoframe, + crtc_state, conn_state); } static void intel_ddi_pre_enable(struct intel_encoder *encoder,
@@ -2239,10 +2239,8 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder,intel_wait_ddi_buf_idle (dev_priv, port);if (type ==INTEL_OUTPUT_HDMI ) { -struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder); - - intel_hdmi->set_infoframes (encoder, false, - old_crtc_state, old_conn_state); + dig_port->set_infoframes (encoder, false, + old_crtc_state, old_conn_state); }if (type ==INTEL_OUTPUT_DP || type ==INTEL_OUTPUT_EDP ) {
@@ -2445,7 +2443,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);enum transcoder cpu_transcoder = pipe_config->cpu_transcoder; -struct intel_hdmi *intel_hdmi; +struct intel_digital_port *intel_dig_port;u32 temp, flags =0 ;/* XXX: DSI transcoder paranoia */
@@ -2484,9 +2482,9 @@ void intel_ddi_get_config(struct intel_encoder *encoder,switch (temp &TRANS_DDI_MODE_SELECT_MASK ) {case TRANS_DDI_MODE_SELECT_HDMI : pipe_config->has_hdmi_sink = true; - intel_hdmi =enc_to_intel_hdmi (&encoder->base); + intel_dig_port =enc_to_dig_port (&encoder->base); -if (intel_hdmi->infoframe_enabled (&encoder->base, pipe_config)) +if (intel_dig_port->infoframe_enabled (&encoder->base, pipe_config)) pipe_config->has_infoframe = true; if ((temp & TRANS_DDI_HDMI_SCRAMBLING_MASK) ==
drivers/gpu/drm/i915/intel_drv.h +11 -10
@@ -909,16 +909,6 @@ struct intel_hdmi {bool has_audio;bool rgb_quant_range_selectable;struct intel_connector *attached_connector; -void (*write_infoframe)(struct drm_encoder *encoder, -const struct intel_crtc_state *crtc_state, -enum hdmi_infoframe_type type, -const void *frame,ssize_t len); -void (*set_infoframes)(struct drm_encoder *encoder, -bool enable, -const struct intel_crtc_state *crtc_state, -const struct drm_connector_state *conn_state); -bool (*infoframe_enabled)(struct drm_encoder *encoder, -const struct intel_crtc_state *pipe_config); };struct intel_dp_mst_encoder ;
@@ -1069,6 +1059,17 @@ struct intel_digital_port {bool release_cl2_override;uint8_t max_lanes;enum intel_display_power_domain ddi_io_power_domain; + +void (*write_infoframe)(struct drm_encoder *encoder, +const struct intel_crtc_state *crtc_state, +enum hdmi_infoframe_type type, +const void *frame,ssize_t len); +void (*set_infoframes)(struct drm_encoder *encoder, +bool enable, +const struct intel_crtc_state *crtc_state, +const struct drm_connector_state *conn_state); +bool (*infoframe_enabled)(struct drm_encoder *encoder, +const struct intel_crtc_state *pipe_config); };struct intel_dp_mst_encoder {
drivers/gpu/drm/i915/intel_hdmi.c +34 -31
144 lines not on this page · raw message
Signature · 6 lines
2.13.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 5/8 drm/i915: Init infoframe vfuncs for DP encoders as well
In reply to [email protected]From: Ville Syrjälä <[email protected]>
DP ports may want to use the video DIP for SDP transmission, so let's initialize the vfuncs for DP encoders as well. The only exception is port A eDP prior to HSW as that one doesn't have a video DIP instance.
--- drivers/gpu/drm/i915/intel_ddi.c | 2 ++ drivers/gpu/drm/i915/intel_dp.c | 3 +++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 52 ++++++++++++++++++++++----------------- 4 files changed, 36 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +2 -0
@@ -2737,6 +2737,8 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) intel_encoder->crtc_mask = (1 <<0 ) | (1 <<1 ) | (1 <<2 ); intel_encoder->cloneable =0 ; +intel_infoframe_init (intel_dig_port); +if (init_dp) {if (!intel_ddi_init_dp_connector (intel_dig_port)) goto err;
drivers/gpu/drm/i915/intel_dp.c +3 -0
@@ -6186,6 +6186,9 @@ bool intel_dp_init(struct drm_i915_private *dev_priv, intel_dig_port->hpd_pulse = intel_dp_hpd_pulse; dev_priv->hotplug.irq_port[port] = intel_dig_port; +if (port !=PORT_A ) +intel_infoframe_init (intel_dig_port); +if (!intel_dp_init_connector (intel_dig_port, intel_connector)) goto err_init_connector;
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1649,6 +1649,7 @@ void intel_hdmi_handle_sink_scrambling(struct intel_encoder *intel_encoder,bool high_tmds_clock_ratio, bool scrambling);void intel_dp_dual_mode_set_tmds_output (struct intel_hdmi *hdmi,bool enable); +void intel_infoframe_init (struct intel_digital_port *intel_dig_port);/* intel_lvds.c */
drivers/gpu/drm/i915/intel_hdmi.c +30 -22
69 lines not on this page · raw message
Signature · 6 lines
2.13.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/8 drm/i915: Plumb crtc_state to PSR enable/disable
In reply to [email protected]From: Ville Syrjälä <[email protected]>
The PSR enable/disable need to know things about the crtc state, so plumb it through. This will become even more important when we start to reuse the generic infoframe code for the VSC DIP programming as the infoframe code wants the crtc state as well.
v2: Fix kernel docs
--- drivers/gpu/drm/i915/intel_ddi.c | 4 +- drivers/gpu/drm/i915/intel_dp.c | 4 +- drivers/gpu/drm/i915/intel_drv.h | 6 ++- drivers/gpu/drm/i915/intel_psr.c | 79 +++++++++++++++++++++------------------- 4 files changed, 50 insertions(+), 43 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +2 -2
@@ -2336,7 +2336,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder,intel_dp_stop_link_train (intel_dp);intel_edp_backlight_on (pipe_config, conn_state); -intel_psr_enable (intel_dp); +intel_psr_enable (intel_dp, pipe_config);intel_edp_drrs_enable (intel_dp, pipe_config); }
@@ -2364,7 +2364,7 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder,struct intel_dp *intel_dp =enc_to_intel_dp (encoder);intel_edp_drrs_disable (intel_dp, old_crtc_state); -intel_psr_disable (intel_dp); +intel_psr_disable (intel_dp, old_crtc_state);intel_edp_backlight_off (old_conn_state); } }
drivers/gpu/drm/i915/intel_dp.c +2 -2
@@ -2698,7 +2698,7 @@ static void intel_disable_dp(struct intel_encoder *encoder,intel_audio_codec_disable (encoder);if (HAS_PSR (dev_priv) && !HAS_DDI (dev_priv)) -intel_psr_disable (intel_dp); +intel_psr_disable (intel_dp, old_crtc_state);/* Make sure the panel is off before trying to change the mode. But also * ensure that we have vdd while we switch off the panel. */
@@ -2928,7 +2928,7 @@ static void vlv_enable_dp(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);intel_edp_backlight_on (pipe_config, conn_state); -intel_psr_enable (intel_dp); +intel_psr_enable (intel_dp, pipe_config); } static void g4x_pre_enable_dp(struct intel_encoder *encoder,
drivers/gpu/drm/i915/intel_drv.h +4 -2
@@ -1721,8 +1721,10 @@ static inline void intel_backlight_device_unregister(struct intel_connector *con/* intel_psr.c */ -void intel_psr_enable (struct intel_dp *intel_dp); -void intel_psr_disable (struct intel_dp *intel_dp); +void intel_psr_enable (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state); +void intel_psr_disable (struct intel_dp *intel_dp, +const struct intel_crtc_state *old_crtc_state);void intel_psr_invalidate (struct drm_i915_private *dev_priv,unsigned frontbuffer_bits); void intel_psr_flush(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_psr.c +42 -37
197 lines not on this page · raw message
Signature · 6 lines
2.13.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 7/8 drm/i915: Remove mostly duplicated video DIP handling from PSR code
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Now that the infoframe hooks are part of the intel_dig_port, we can use the normal .write_infoframe() hook to update the VSC SDP. We do need to deal with the size difference between the VSC DIP and the others though.
Another minor snag is that the compiler will complain to use if we keep using enum hdmi_infoframe_type type and passing in the DP define instead, so et's just change to unsigned int all over for the inforframe type.
--- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_hdmi.c | 26 ++++++++++++++++---------- drivers/gpu/drm/i915/intel_psr.c | 39 ++++++--------------------------------- 3 files changed, 23 insertions(+), 44 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1062,7 +1062,7 @@ struct intel_digital_port {void (*write_infoframe)(struct drm_encoder *encoder,const struct intel_crtc_state *crtc_state, -enum hdmi_infoframe_type type, +unsigned int type,const void *frame,ssize_t len); void (*set_infoframes)(struct drm_encoder *encoder, bool enable,
drivers/gpu/drm/i915/intel_hdmi.c +16 -10
@@ -70,7 +70,7 @@ static struct intel_hdmi *intel_attached_hdmi(struct drm_connector *connector)return enc_to_intel_hdmi (&intel_attached_encoder (connector)->base); } -static u32 g4x_infoframe_index (enum hdmi_infoframe_type type) +static u32 g4x_infoframe_index (unsigned int type) {switch (type) {case HDMI_INFOFRAME_TYPE_AVI :
@@ -85,7 +85,7 @@ static u32 g4x_infoframe_index(enum hdmi_infoframe_type type) } } -static u32 g4x_infoframe_enable (enum hdmi_infoframe_type type) +static u32 g4x_infoframe_enable (unsigned int type) {switch (type) {case HDMI_INFOFRAME_TYPE_AVI :
@@ -100,9 +100,11 @@ static u32 g4x_infoframe_enable(enum hdmi_infoframe_type type) } } -static u32 hsw_infoframe_enable (enum hdmi_infoframe_type type) +static u32 hsw_infoframe_enable (unsigned int type) {switch (type) { +case DP_SDP_VSC : +return VIDEO_DIP_ENABLE_VSC_HSW ;case HDMI_INFOFRAME_TYPE_AVI :return VIDEO_DIP_ENABLE_AVI_HSW ;case HDMI_INFOFRAME_TYPE_SPD :
@@ -118,10 +120,12 @@ static u32 hsw_infoframe_enable(enum hdmi_infoframe_type type)static i915_reg_t hsw_dip_data_reg (struct drm_i915_private *dev_priv,enum transcoder cpu_transcoder, -enum hdmi_infoframe_type type, +unsigned int type,int i) {switch (type) { +case DP_SDP_VSC : +return HSW_TVIDEO_DIP_VSC_DATA (cpu_transcoder, i);case HDMI_INFOFRAME_TYPE_AVI :return HSW_TVIDEO_DIP_AVI_DATA (cpu_transcoder, i);case HDMI_INFOFRAME_TYPE_SPD :
@@ -136,7 +140,7 @@ hsw_dip_data_reg(struct drm_i915_private *dev_priv,static void g4x_write_infoframe (struct drm_encoder *encoder,const struct intel_crtc_state *crtc_state, -enum hdmi_infoframe_type type, +unsigned int type,const void *frame,ssize_t len) {const uint32_t *data = frame;
@@ -191,7 +195,7 @@ static bool g4x_infoframe_enabled(struct drm_encoder *encoder,static void ibx_write_infoframe (struct drm_encoder *encoder,const struct intel_crtc_state *crtc_state, -enum hdmi_infoframe_type type, +unsigned int type,const void *frame,ssize_t len) {const uint32_t *data = frame;
@@ -251,7 +255,7 @@ static bool ibx_infoframe_enabled(struct drm_encoder *encoder,static void cpt_write_infoframe (struct drm_encoder *encoder,const struct intel_crtc_state *crtc_state, -enum hdmi_infoframe_type type, +unsigned int type,const void *frame,ssize_t len) {const uint32_t *data = frame;
@@ -309,7 +313,7 @@ static bool cpt_infoframe_enabled(struct drm_encoder *encoder,static void vlv_write_infoframe (struct drm_encoder *encoder,const struct intel_crtc_state *crtc_state, -enum hdmi_infoframe_type type, +unsigned int type,const void *frame,ssize_t len) {const uint32_t *data = frame;
@@ -368,7 +372,7 @@ static bool vlv_infoframe_enabled(struct drm_encoder *encoder,static void hsw_write_infoframe (struct drm_encoder *encoder,const struct intel_crtc_state *crtc_state, -enum hdmi_infoframe_type type, +unsigned int type,const void *frame,ssize_t len) {const uint32_t *data = frame;
@@ -377,6 +381,8 @@ static void hsw_write_infoframe(struct drm_encoder *encoder,enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;i915_reg_t ctl_reg =HSW_TVIDEO_DIP_CTL (cpu_transcoder);i915_reg_t data_reg; +int data_size = type ==DP_SDP_VSC ? +VIDEO_DIP_VSC_DATA_SIZE :VIDEO_DIP_DATA_SIZE ;int i;u32 val =I915_READ (ctl_reg);
@@ -392,7 +398,7 @@ static void hsw_write_infoframe(struct drm_encoder *encoder, data++; }/* Write every possible data byte to force correct ECC calculation. */ -for (; i <VIDEO_DIP_DATA_SIZE ; i +=4 ) +for (; i < data_size; i +=4 )I915_WRITE (hsw_dip_data_reg (dev_priv, cpu_transcoder, type, i >>2 ),0 );mmiowb ();
drivers/gpu/drm/i915/intel_psr.c +6 -33
@@ -72,37 +72,6 @@ static bool vlv_is_psr_active_on_pipe(struct drm_device *dev, int pipe) (val ==VLV_EDP_PSR_ACTIVE_SF_UPDATE ); } -static void intel_psr_write_vsc (struct intel_dp *intel_dp, -const struct edp_vsc_psr *vsc_psr) -{ -struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc =to_intel_crtc (dig_port->base.base.crtc); -enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; -i915_reg_t ctl_reg =HSW_TVIDEO_DIP_CTL (cpu_transcoder); -uint32_t *data = (uint32_t *) vsc_psr; -unsigned int i; - -/* As per BSPec (Pipe Video Data Island Packet), we need to disable -the video DIP being updated before program video DIP data buffer -registers for DIP being updated. */ -I915_WRITE (ctl_reg,0 ); -POSTING_READ (ctl_reg); - -for (i =0 ; i <sizeof (*vsc_psr); i +=4 ) { -I915_WRITE (HSW_TVIDEO_DIP_VSC_DATA (cpu_transcoder, - i >>2 ), *data); - data++; - } -for (; i <VIDEO_DIP_VSC_DATA_SIZE ; i +=4 ) -I915_WRITE (HSW_TVIDEO_DIP_VSC_DATA (cpu_transcoder, - i >>2 ),0 ); - -I915_WRITE (ctl_reg,VIDEO_DIP_ENABLE_VSC_HSW ); -POSTING_READ (ctl_reg); -} -static void vlv_psr_setup_vsc (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state) {
@@ -140,12 +109,14 @@ static void skl_psr_setup_su_vsc(struct intel_dp *intel_dp, psr_vsc.sdp_header.HB3 =0xc ; } -intel_psr_write_vsc (intel_dp, &psr_vsc); + intel_dig_port->write_infoframe (&intel_dig_port->base.base, crtc_state, +DP_SDP_VSC , &psr_vsc,sizeof (psr_vsc)); }static void hsw_psr_setup_vsc (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state) { +struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct edp_vsc_psr psr_vsc;/* Prepare VSC packet as per EDP 1.3 spec, Table 3.10 */
@@ -154,7 +125,9 @@ static void hsw_psr_setup_vsc(struct intel_dp *intel_dp, psr_vsc.sdp_header.HB1 =0x7 ; psr_vsc.sdp_header.HB2 =0x2 ; psr_vsc.sdp_header.HB3 =0x8 ; -intel_psr_write_vsc (intel_dp, &psr_vsc); + + intel_dig_port->write_infoframe (&intel_dig_port->base.base, crtc_state, +DP_SDP_VSC , &psr_vsc,sizeof (psr_vsc)); }static void vlv_psr_enable_sink (struct intel_dp *intel_dp)
Signature · 6 lines
2.13.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 8/8 drm/i915: Constify states passed to enable/disable/etc. encoder hooks
In reply to [email protected]From: Ville Syrjälä <[email protected]>
The enable/disable/etc. encoder hooks aren't supposed to alter the state(s), so pass them as const. Unfortunately C lacks any kind of deep const thingy, so this can't catch all abuses. But at least it acts as a hint to the reader telling them not to mess about with the state(s).
v2: Update intel_tv_mode_find() and ironlake_edp_pll_on() as well
v3: Deal with intel_sdvo_connector_state
--- drivers/gpu/drm/i915/intel_crt.c | 22 ++++++------ drivers/gpu/drm/i915/intel_ddi.c | 30 ++++++++-------- drivers/gpu/drm/i915/intel_dp.c | 64 ++++++++++++++++----------------- drivers/gpu/drm/i915/intel_dp_mst.c | 16 ++++----- drivers/gpu/drm/i915/intel_drv.h | 32 ++++++++--------- drivers/gpu/drm/i915/intel_dsi.c | 22 ++++++------ drivers/gpu/drm/i915/intel_dvo.c | 12 +++---- drivers/gpu/drm/i915/intel_hdmi.c | 70 ++++++++++++++++++------------------- drivers/gpu/drm/i915/intel_lvds.c | 24 ++++++------- drivers/gpu/drm/i915/intel_sdvo.c | 40 ++++++++++----------- drivers/gpu/drm/i915/intel_tv.c | 14 ++++---- 11 files changed, 172 insertions(+), 174 deletions(-)
drivers/gpu/drm/i915/intel_crt.c +11 -11
@@ -143,7 +143,7 @@ static void hsw_crt_get_config(struct intel_encoder *encoder,/* Note: The caller is required to filter out dpms modes not supported by the * platform. */ static void intel_crt_set_dpms (struct intel_encoder *encoder, -struct intel_crtc_state *crtc_state, +const struct intel_crtc_state *crtc_state,int mode) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);
@@ -194,28 +194,28 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, }static void intel_disable_crt (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {intel_crt_set_dpms (encoder, old_crtc_state,DRM_MODE_DPMS_OFF ); }static void pch_disable_crt (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) { }static void pch_post_disable_crt (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {intel_disable_crt (encoder, old_crtc_state, old_conn_state); }static void hsw_post_disable_crt (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);
@@ -228,8 +228,8 @@ static void hsw_post_disable_crt(struct intel_encoder *encoder, }static void intel_enable_crt (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {intel_crt_set_dpms (encoder, pipe_config,DRM_MODE_DPMS_ON ); }
drivers/gpu/drm/i915/intel_ddi.c +15 -15
@@ -785,7 +785,7 @@ static void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,DRM_ERROR ("Timeout waiting for DDI BUF %c idle bit\n" ,port_name (port)); } -static uint32_t hsw_pll_to_ddi_pll_sel (struct intel_shared_dpll *pll) +static uint32_t hsw_pll_to_ddi_pll_sel (const struct intel_shared_dpll *pll) {switch (pll->id) {case DPLL_ID_WRPLL1 :
@@ -2080,7 +2080,7 @@ uint32_t ddi_signal_levels(struct intel_dp *intel_dp) }static void intel_ddi_clk_select (struct intel_encoder *encoder, -struct intel_shared_dpll *pll) +const struct intel_shared_dpll *pll) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port =intel_ddi_get_encoder_port (encoder);
@@ -2153,7 +2153,7 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,bool has_infoframe, const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state, - struct intel_shared_dpll *pll) + const struct intel_shared_dpll *pll) { struct intel_digital_port *intel_dig_port = enc_to_dig_port(&encoder->base);struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;
@@ -2182,8 +2182,8 @@ static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder, }static void intel_ddi_pre_enable (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {int type = encoder->type;
@@ -2204,8 +2204,8 @@ static void intel_ddi_pre_enable(struct intel_encoder *encoder, }static void intel_ddi_post_disable (struct intel_encoder *intel_encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {struct drm_encoder *encoder = &intel_encoder->base;struct drm_i915_private *dev_priv =to_i915 (encoder->dev);
@@ -2271,8 +2271,8 @@ static void intel_ddi_post_disable(struct intel_encoder *intel_encoder, }void intel_ddi_fdi_post_disable (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);uint32_t val;
@@ -2304,8 +2304,8 @@ void intel_ddi_fdi_post_disable(struct intel_encoder *encoder, }static void intel_enable_ddi (struct intel_encoder *intel_encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {struct drm_encoder *encoder = &intel_encoder->base;struct drm_i915_private *dev_priv =to_i915 (encoder->dev);
@@ -2345,8 +2345,8 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder, }static void intel_disable_ddi (struct intel_encoder *intel_encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {struct drm_encoder *encoder = &intel_encoder->base;int type = intel_encoder->type;
@@ -2370,8 +2370,8 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder, }static void bxt_ddi_pre_pll_enable (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {uint8_t mask = pipe_config->lane_lat_optim_mask;
drivers/gpu/drm/i915/intel_dp.c +32 -32
178 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp_mst.c +8 -8
@@ -123,8 +123,8 @@ static int intel_dp_mst_atomic_check(struct drm_connector *connector, }static void intel_mst_disable_dp (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;
@@ -146,8 +146,8 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder, }static void intel_mst_post_disable_dp (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;
@@ -176,8 +176,8 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, }static void intel_mst_pre_enable_dp (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;
@@ -219,8 +219,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, }static void intel_mst_enable_dp (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_digital_port *intel_dig_port = intel_mst->primary;
drivers/gpu/drm/i915/intel_drv.h +16 -16
@@ -220,23 +220,23 @@ struct intel_encoder { struct intel_crtc_state *, struct drm_connector_state *);void (*pre_pll_enable)(struct intel_encoder *, -struct intel_crtc_state *, -struct drm_connector_state *); +const struct intel_crtc_state *, +const struct drm_connector_state *);void (*pre_enable)(struct intel_encoder *, -struct intel_crtc_state *, -struct drm_connector_state *); +const struct intel_crtc_state *, +const struct drm_connector_state *);void (*enable)(struct intel_encoder *, -struct intel_crtc_state *, -struct drm_connector_state *); +const struct intel_crtc_state *, +const struct drm_connector_state *);void (*disable)(struct intel_encoder *, -struct intel_crtc_state *, -struct drm_connector_state *); +const struct intel_crtc_state *, +const struct drm_connector_state *);void (*post_disable)(struct intel_encoder *, -struct intel_crtc_state *, -struct drm_connector_state *); +const struct intel_crtc_state *, +const struct drm_connector_state *);void (*post_pll_disable)(struct intel_encoder *, -struct intel_crtc_state *, -struct drm_connector_state *); +const struct intel_crtc_state *, +const struct drm_connector_state *);/* Read out the current hw state of this connector, returning true if * the encoder is active. If the encoder is enabled it also set the pipe * it is connected to in the pipe parameter. */
@@ -1247,8 +1247,8 @@ void intel_crt_reset(struct drm_encoder *encoder);/* intel_ddi.c */ void intel_ddi_fdi_post_disable (struct intel_encoder *intel_encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state); +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state);void hsw_fdi_link_train (struct intel_crtc *crtc,const struct intel_crtc_state *crtc_state);void intel_ddi_init (struct drm_i915_private *dev_priv,enum port port);
@@ -1519,9 +1519,9 @@ void intel_power_sequencer_reset(struct drm_i915_private *dev_priv);uint32_t intel_dp_pack_aux (const uint8_t *src,int src_bytes);void intel_plane_destroy (struct drm_plane *plane);void intel_edp_drrs_enable (struct intel_dp *intel_dp, -struct intel_crtc_state *crtc_state); +const struct intel_crtc_state *crtc_state);void intel_edp_drrs_disable (struct intel_dp *intel_dp, -struct intel_crtc_state *crtc_state); +const struct intel_crtc_state *crtc_state);void intel_edp_drrs_invalidate (struct drm_i915_private *dev_priv,unsigned int frontbuffer_bits); void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_dsi.c +11 -11
@@ -731,7 +731,7 @@ static void intel_dsi_port_disable(struct intel_encoder *encoder) }static void intel_dsi_prepare (struct intel_encoder *intel_encoder, -struct intel_crtc_state *pipe_config); +const struct intel_crtc_state *pipe_config);static void intel_dsi_unprepare (struct intel_encoder *encoder);static void intel_dsi_msleep (struct intel_dsi *intel_dsi,int msec)
@@ -783,8 +783,8 @@ static void intel_dsi_msleep(struct intel_dsi *intel_dsi, int msec)*/ static void intel_dsi_pre_enable (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);
@@ -878,8 +878,8 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder,* the pre_enable hook. */ static void intel_dsi_enable_nop (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {DRM_DEBUG_KMS ("\n" ); }
@@ -889,8 +889,8 @@ static void intel_dsi_enable_nop(struct intel_encoder *encoder,* the post_disable hook. */ static void intel_dsi_disable (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;
@@ -936,8 +936,8 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder) }static void intel_dsi_post_disable (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);
@@ -1077,7 +1077,7 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder, }static void bxt_dsi_get_pipe_config (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config) +struct intel_crtc_state *pipe_config) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -1381,7 +1381,7 @@ static u32 pixel_format_to_reg(enum mipi_dsi_pixel_format fmt) }static void intel_dsi_prepare (struct intel_encoder *intel_encoder, -struct intel_crtc_state *pipe_config) +const struct intel_crtc_state *pipe_config) {struct drm_encoder *encoder = &intel_encoder->base;struct drm_device *dev = encoder->dev;
drivers/gpu/drm/i915/intel_dvo.c +6 -6
@@ -175,8 +175,8 @@ static void intel_dvo_get_config(struct intel_encoder *encoder, }static void intel_disable_dvo (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dvo *intel_dvo =enc_to_dvo (encoder);
@@ -189,8 +189,8 @@ static void intel_disable_dvo(struct intel_encoder *encoder, }static void intel_enable_dvo (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dvo *intel_dvo =enc_to_dvo (encoder);
@@ -258,8 +258,8 @@ static bool intel_dvo_compute_config(struct intel_encoder *encoder, }static void intel_dvo_pre_enable (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);
drivers/gpu/drm/i915/intel_hdmi.c +35 -35
175 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lvds.c +12 -12
@@ -229,8 +229,8 @@ static void intel_lvds_pps_init_hw(struct drm_i915_private *dev_priv, }static void intel_pre_enable_lvds (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);
@@ -306,8 +306,8 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder,* Sets the power state for the panel. */ static void intel_enable_lvds (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {struct drm_device *dev = encoder->base.dev;struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base);
@@ -324,8 +324,8 @@ static void intel_enable_lvds(struct intel_encoder *encoder, }static void intel_disable_lvds (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);
@@ -339,8 +339,8 @@ static void intel_disable_lvds(struct intel_encoder *encoder, }static void gmch_disable_lvds (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {intel_panel_disable_backlight (old_conn_state);
@@ -349,15 +349,15 @@ static void gmch_disable_lvds(struct intel_encoder *encoder, }static void pch_disable_lvds (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {intel_panel_disable_backlight (old_conn_state); }static void pch_post_disable_lvds (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {intel_disable_lvds (encoder, old_crtc_state, old_conn_state); }
drivers/gpu/drm/i915/intel_sdvo.c +19 -21
@@ -201,11 +201,8 @@ to_intel_sdvo_connector(struct drm_connector *connector) return container_of(connector, struct intel_sdvo_connector, base.base); } -static struct intel_sdvo_connector_state * -to_intel_sdvo_connector_state (struct drm_connector_state *conn_state) -{ - return container_of(conn_state, struct intel_sdvo_connector_state, base.base); -} +#define to_intel_sdvo_connector_state (conn_state) \ + container_of((conn_state), struct intel_sdvo_connector_state, base.base)static bool intel_sdvo_output_setup (struct intel_sdvo *intel_sdvo,uint16_t flags);
@@ -998,7 +995,7 @@ static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo, }static bool intel_sdvo_set_avi_infoframe (struct intel_sdvo *intel_sdvo, -struct intel_crtc_state *pipe_config) +const struct intel_crtc_state *pipe_config) {uint8_t sdvo_data[HDMI_INFOFRAME_SIZE (AVI )];union hdmi_infoframe frame;
@@ -1032,7 +1029,7 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo, }static bool intel_sdvo_set_tv_format (struct intel_sdvo *intel_sdvo, -struct drm_connector_state *conn_state) +const struct drm_connector_state *conn_state) {struct intel_sdvo_tv_format format;uint32_t format_map;
@@ -1202,9 +1199,9 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder, }while (0 ) static void intel_sdvo_update_props(struct intel_sdvo *intel_sdvo, -struct intel_sdvo_connector_state *sdvo_state) +const struct intel_sdvo_connector_state *sdvo_state) { -struct drm_connector_state *conn_state = &sdvo_state->base.base; +const struct drm_connector_state *conn_state = &sdvo_state->base.base;struct intel_sdvo_connector *intel_sdvo_conn =to_intel_sdvo_connector (conn_state->connector);uint16_t val;
@@ -1258,14 +1255,15 @@ static void intel_sdvo_update_props(struct intel_sdvo *intel_sdvo, }static void intel_sdvo_pre_enable (struct intel_encoder *intel_encoder, -struct intel_crtc_state *crtc_state, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *crtc_state, +const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (intel_encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; -struct intel_sdvo_connector_state *sdvo_state =to_intel_sdvo_connector_state (conn_state); -struct drm_display_mode *mode = &crtc_state->base.mode; +const struct intel_sdvo_connector_state *sdvo_state = +to_intel_sdvo_connector_state (conn_state); +const struct drm_display_mode *mode = &crtc_state->base.mode;struct intel_sdvo *intel_sdvo =to_sdvo (intel_encoder);u32 sdvox;struct intel_sdvo_in_out_map in_out;
@@ -1507,8 +1505,8 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder, }static void intel_disable_sdvo (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_sdvo *intel_sdvo =to_sdvo (encoder);
@@ -1552,21 +1550,21 @@ static void intel_disable_sdvo(struct intel_encoder *encoder, }static void pch_disable_sdvo (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) { }static void pch_post_disable_sdvo (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {intel_disable_sdvo (encoder, old_crtc_state, old_conn_state); }static void intel_enable_sdvo (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
drivers/gpu/drm/i915/intel_tv.c +7 -7
@@ -814,8 +814,8 @@ intel_tv_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe)static void intel_enable_tv (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -829,8 +829,8 @@ intel_enable_tv(struct intel_encoder *encoder,static void intel_disable_tv (struct intel_encoder *encoder, -struct intel_crtc_state *old_crtc_state, -struct drm_connector_state *old_conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) {struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -838,7 +838,7 @@ intel_disable_tv(struct intel_encoder *encoder,I915_WRITE (TV_CTL ,I915_READ (TV_CTL ) & ~TV_ENC_ENABLE ); } -static const struct tv_mode *intel_tv_mode_find (struct drm_connector_state *conn_state) +static const struct tv_mode *intel_tv_mode_find (const struct drm_connector_state *conn_state) {int format = conn_state->tv.mode;
@@ -976,8 +976,8 @@ static void set_color_conversion(struct drm_i915_private *dev_priv, }static void intel_tv_pre_enable (struct intel_encoder *encoder, -struct intel_crtc_state *pipe_config, -struct drm_connector_state *conn_state) +const struct intel_crtc_state *pipe_config, +const struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);
Signature · 6 lines
2.13.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Make infoframe code available to (e)DP ports (rev3)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915: Make infoframe code available to (e)DP ports (rev3)
URL : https://patchwork.freedesktop.org/series/8183/
State : failure
== Summary ==
Series 8183v3 drm/i915: Make infoframe code available to (e)DP ports
https://patchwork.freedesktop.org/api/1.0/series/8183/revisions/3/mbox/
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> SKIP (fi-skl-x1585l)
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-a-frame-sequence:
pass -> DMESG-WARN (fi-skl-6700k)
Subgroup read-crc-pipe-b:
pass -> INCOMPLETE (fi-skl-6700k)fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:451s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:433s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:359s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:551s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:523s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:528s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:521s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:606s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:444s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:421s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:420s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:505s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:479s fi-kbl-7260u total:279 pass:268 dwarn:1 dfail:0 fail:0 skip:10 time:496s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:479s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:593s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:602s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:525s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:467s fi-skl-6700k total:232 pass:215 dwarn:1 dfail:0 fail:0 skip:15 fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:490s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:440s fi-skl-x1585l total:279 pass:267 dwarn:0 dfail:0 fail:0 skip:12 time:469s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:549s fi-snb-2600 total:279 pass:250 dwarn:0 dfail:0 fail:0 skip:29 time:405s
09654a2769e99c8117fc30942322cbc461e09d6c drm-tip: 2017y-08m-18d-13h-21m-33s UTC integration manifest eaf7632dfa6c drm/i915: Constify states passed to enable/disable/etc. encoder hooks 1e73a954d54d drm/i915: Remove mostly duplicated video DIP handling from PSR code 9e10191ce2df drm/i915: Plumb crtc_state to PSR enable/disable9106b3e95c52 drm/i915: Init infoframe vfuncs for DP encoders as well9036d9cd622f drm/i915: Move infoframe vfuncs into intel_digital_portaae8f719aee1 drm/i915: Disable infoframes when shutting down DDI HDMIad62369341dc drm/i915: Check has_infoframes when enabling infoframes0cb37a51384c drm/dp: Add defines for DP SDP types
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5438/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Make infoframe code available to (e)DP ports (rev3)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915: Make infoframe code available to (e)DP ports (rev3)
URL : https://patchwork.freedesktop.org/series/8183/
State : failure
== Summary ==
Series 8183v3 drm/i915: Make infoframe code available to (e)DP ports
https://patchwork.freedesktop.org/api/1.0/series/8183/revisions/3/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-c:
pass -> FAIL (fi-skl-6700k)
Test drv_module_reload:
Subgroup basic-reload-inject:
dmesg-warn -> PASS (fi-kbl-7260u) fdo#102295fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#102295 https://bugs.freedesktop.org/show_bug.cgi?id=102295
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:452s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:435s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:362s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:559s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:524s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:524s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:612s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:446s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:423s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:426s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:512s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:478s fi-kbl-7260u total:279 pass:268 dwarn:1 dfail:0 fail:0 skip:10 time:506s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:480s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:597s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:597s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:535s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:470s fi-skl-6700k total:279 pass:260 dwarn:0 dfail:0 fail:1 skip:18 time:480s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:483s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:442s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:547s fi-snb-2600 total:279 pass:249 dwarn:0 dfail:0 fail:1 skip:29 time:407s
fi-byt-n2820 failed to connect after reboot
fi-skl-x1585l failed to connect after reboot
0f7cfea3f630a146954506acc0e1d18097020cf2 drm-tip: 2017y-08m-18d-15h-11m-18s UTC integration manifest 3124001c258c drm/i915: Constify states passed to enable/disable/etc. encoder hooks beb4af332ebb drm/i915: Remove mostly duplicated video DIP handling from PSR code f6d7bd94bd61 drm/i915: Plumb crtc_state to PSR enable/disable62c7b2e240ad drm/i915: Init infoframe vfuncs for DP encoders as well16d53a67ec9b drm/i915: Move infoframe vfuncs into intel_digital_port41bd6b03b067 drm/i915: Disable infoframes when shutting down DDI HDMI6ae8be45a718 drm/i915: Check has_infoframes when enabling infoframes5aa121359ca9 drm/dp: Add defines for DP SDP types
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5440/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Make infoframe code available to (e)DP ports (rev3)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915: Make infoframe code available to (e)DP ports (rev3)
URL : https://patchwork.freedesktop.org/series/8183/
State : success
== Summary ==
Series 8183v3 drm/i915: Make infoframe code available to (e)DP ports
https://patchwork.freedesktop.org/api/1.0/series/8183/revisions/3/mbox/
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-byt-n2820) fdo#101705fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:458s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:434s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:358s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:549s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:522s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:519s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:521s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:620s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:450s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:421s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:424s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:509s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:474s fi-kbl-7260u total:279 pass:267 dwarn:2 dfail:0 fail:0 skip:10 time:495s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:481s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:593s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:592s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:532s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:466s fi-skl-6700k total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:483s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:497s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:549s fi-snb-2600 total:279 pass:249 dwarn:0 dfail:0 fail:1 skip:29 time:407s
fi-skl-gvtdvm failed to connect after reboot
ad6ab9f96437f0cb1f4d8a7840fd9eeb894eb12e drm-tip: 2017y-08m-18d-18h-21m-46s UTC integration manifest 578c7b74374e drm/i915: Constify states passed to enable/disable/etc. encoder hooks 5368f86b5a08 drm/i915: Remove mostly duplicated video DIP handling from PSR code bcd0a729d3f6 drm/i915: Plumb crtc_state to PSR enable/disable75f26c75cb7e drm/i915: Init infoframe vfuncs for DP encoders as well9ce48a3e6743 drm/i915: Move infoframe vfuncs into intel_digital_port44c690bc7cfb drm/i915: Disable infoframes when shutting down DDI HDMIc350e5d7f055 drm/i915: Check has_infoframes when enabling infoframesc39bbc5c298c drm/dp: Add defines for DP SDP types
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5443/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Make infoframe code available to (e)DP ports (rev4)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915: Make infoframe code available to (e)DP ports (rev4)
URL : https://patchwork.freedesktop.org/series/8183/
State : success
== Summary ==
Series 8183v4 drm/i915: Make infoframe code available to (e)DP ports
https://patchwork.freedesktop.org/api/1.0/series/8183/revisions/4/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007
Test gem_exec_suspend:
Subgroup basic-s3:
dmesg-warn -> PASS (fi-kbl-7260u) fdo#102359
Subgroup basic-s4-devices:
pass -> DMESG-WARN (fi-kbl-7260u) fdo#102294
Test gem_sync:
Subgroup basic-store-all:
incomplete -> PASS (fi-kbl-7260u)
Test kms_flip:
Subgroup basic-flip-vs-modeset:
pass -> SKIP (fi-skl-x1585l) fdo#101781
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> PASS (fi-byt-n2820) fdo#101705fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#102359 https://bugs.freedesktop.org/show_bug.cgi?id=102359
fdo#102294 https://bugs.freedesktop.org/show_bug.cgi?id=102294
fdo#101781 https://bugs.freedesktop.org/show_bug.cgi?id=101781
fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:458s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:445s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:360s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:550s fi-bwr-2160 total:279 pass:184 dwarn:0 dfail:0 fail:0 skip:95 time:253s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:522s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:523s fi-byt-n2820 total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:517s fi-elk-e7500 total:279 pass:230 dwarn:0 dfail:0 fail:0 skip:49 time:435s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:613s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:441s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:423s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:429s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:508s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:476s fi-kbl-7260u total:279 pass:268 dwarn:1 dfail:0 fail:0 skip:10 time:496s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:484s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:598s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:597s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:528s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:465s fi-skl-6700k total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:484s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:490s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:441s fi-skl-x1585l total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:484s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:547s fi-snb-2600 total:279 pass:250 dwarn:0 dfail:0 fail:0 skip:29 time:407s
b9294399405b59609f76fe52af2d3e61f53e9f68 drm-tip: 2017y-08m-22d-13h-44m-53s UTC integration manifest b06660de54c3 drm/i915: Constify states passed to enable/disable/etc. encoder hooks 0e12378a555d drm/i915: Remove mostly duplicated video DIP handling from PSR code 602bdc151324 drm/i915: Plumb crtc_state to PSR enable/disable734b56419361 drm/i915: Init infoframe vfuncs for DP encoders as well5b5f004c8b4d drm/i915: Move infoframe vfuncs into intel_digital_port1957a3ab6f08 drm/i915: Disable infoframes when shutting down DDI HDMIc65c33650348 drm/i915: Check has_infoframes when enabling infoframes
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5460/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · On Fri, Aug 18, 2017 at 04:49:50PM +0300, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
A rebased reposting of the
dig_portinfoframe series.Notable changes since last time:
* Dealt with the newintel_sdvo_connector_state
* Annotated the SDP types with the DP spec version information
* Fixed the kernel docs for the PSR enable/disable funcsVille Syrjälä (8):
drm/dp: Add defines for DP SDP types
Pushed this one to to drm-misc-next
Quoted 6 lines
drm/i915: Check
has_infoframeswhen enabling infoframes drm/i915: Disable infoframes when shutting down DDI HDMI drm/i915: Move infoframe vfuncs intointel_digital_portdrm/i915: Init infoframe vfuncs for DP encoders as well drm/i915: Plumbcrtc_stateto PSR enable/disable
drm/i915: Constify states passed to enable/disable/etc. encoder hooks
and these to dinq. Thanks for the reviews.
Quoted 1 line
drm/i915: Remove mostly duplicated video DIP handling from PSR code
This one needs to wait for a drm-misc backmerge.
Quoted 18 lines
drivers/gpu/drm/i915/intel_crt.c | 22 ++--- drivers/gpu/drm/i915/intel_ddi.c | 70 ++++++++------ drivers/gpu/drm/i915/intel_dp.c | 71 +++++++------- drivers/gpu/drm/i915/intel_dp_mst.c | 16 ++-- drivers/gpu/drm/i915/intel_drv.h | 60 ++++++------ drivers/gpu/drm/i915/intel_dsi.c | 22 ++--- drivers/gpu/drm/i915/intel_dvo.c | 12 +-- drivers/gpu/drm/i915/intel_hdmi.c | 183 ++++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_lvds.c | 24 ++--- drivers/gpu/drm/i915/intel_psr.c | 118 ++++++++++------------- drivers/gpu/drm/i915/intel_sdvo.c | 40 ++++---- drivers/gpu/drm/i915/intel_tv.c | 14 +-- include/drm/drm_dp_helper.h | 12 +++ 13 files changed, 343 insertions(+), 321 deletions(-)Signature · 1 line
2.13.0
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx