drm/i915: Nuke dig_port->port and assorted cleanups
Subsystems (2)
cover drm/i915: Nuke dig_port->port and assorted cleanups
From: Ville Syrjälä <[email protected]>
The main attraction of this series is removal of intel_digital_port->port. Ever since the introduction of intel_encoder->port it has been redundant, and I figured it's high time we kill it.
The other stuff is mostly elimination of uses of the legacy encoder->crtc pointer and intel_crtc->config. While those do still work we do kinda want to kill them off, and instead use the proper atomic states instead. Having multiple ways to do things also tends to confuse people so the sooner we get this cleaned utp the better. I think I mostly got the the encoder side done now, apart from link training related code which will need more thought.
Entire series available here:git://github.com/vsyrjala/linux.git nuke_dig_port_port_4
Ville Syrjälä (10):
drm/i915: Eliminate some encoder->crtc usage from DP code drm/i915: Eliminate some encoder->crtc usage from DSI code drm/i915: Eliminate some encoder->crtc usage from SDVO code drm/i915: Eliminate some encoder->crtc usage from TV code drm/i915: Pass crtc state to DPIO PHY functions drm/i915: Eliminate crtc->config usage from CRT code drm/i915: Replace dig_port->port with encoder port for BXT DPLL
selection
drm/i915: Nuke intel_digital_port->port
drm/i915: Clean up PPS code calling conventions drm/i915: Clean up DP code local variables and calling conventions
drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 19 +- drivers/gpu/drm/i915/intel_crt.c | 44 ++-- drivers/gpu/drm/i915/intel_ddi.c | 13 +- drivers/gpu/drm/i915/intel_display.c | 13 +- drivers/gpu/drm/i915/intel_dp.c | 432 +++++++++++++++------------------- drivers/gpu/drm/i915/intel_dp_mst.c | 6 +- drivers/gpu/drm/i915/intel_dpio_phy.c | 99 ++++---- drivers/gpu/drm/i915/intel_dpll_mgr.c | 10 +- drivers/gpu/drm/i915/intel_drv.h | 5 +- drivers/gpu/drm/i915/intel_dsi.c | 17 +- drivers/gpu/drm/i915/intel_hdmi.c | 34 ++- drivers/gpu/drm/i915/intel_pipe_crc.c | 4 +- drivers/gpu/drm/i915/intel_psr.c | 4 +- drivers/gpu/drm/i915/intel_sdvo.c | 4 +- drivers/gpu/drm/i915/intel_tv.c | 4 +- 16 files changed, 316 insertions(+), 394 deletions(-)
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/10 drm/i915: Eliminate some encoder->crtc usage from DP code
From: Ville Syrjälä <[email protected]>
Extract the current crtc from the crtc state rather than via the legacy encoder->crtc pointer whenever possible.
--- drivers/gpu/drm/i915/intel_dp.c | 63 +++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +29 -34
@@ -129,10 +129,12 @@ static struct intel_dp *intel_attached_dp(struct drm_connector *connector)return enc_to_intel_dp (&intel_attached_encoder (connector)->base); } -static void intel_dp_link_down (struct intel_dp *intel_dp); +static void intel_dp_link_down (struct intel_encoder *encoder, +const struct intel_crtc_state *old_crtc_state);static bool edp_panel_vdd_on (struct intel_dp *intel_dp);static void edp_panel_vdd_off (struct intel_dp *intel_dp,bool sync); -static void vlv_init_panel_power_sequencer (struct intel_dp *intel_dp); +static void vlv_init_panel_power_sequencer (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state);static void vlv_steal_power_sequencer (struct drm_device *dev,enum pipe pipe);static void intel_dp_unset_edid (struct intel_dp *intel_dp);
@@ -1858,7 +1860,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port =dp_to_dig_port (intel_dp)->port; -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; intel_dp_set_link_params(intel_dp, pipe_config->port_clock,
@@ -2491,10 +2493,10 @@ static void ironlake_edp_pll_on(struct intel_dp *intel_dp,udelay (200 ); } -static void ironlake_edp_pll_off (struct intel_dp *intel_dp) +static void ironlake_edp_pll_off (struct intel_dp *intel_dp, +const struct intel_crtc_state *old_crtc_state) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);assert_pipe_disabled (dev_priv, crtc->pipe);
@@ -2624,7 +2626,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);enum port port =dp_to_dig_port (intel_dp)->port; -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);if (encoder->type ==INTEL_OUTPUT_EDP ) pipe_config->output_types |=BIT (INTEL_OUTPUT_EDP );
@@ -2723,12 +2725,10 @@ static void g4x_disable_dp(struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { - struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); -intel_disable_dp (encoder ,old_crtc_state ,old_conn_state );/* disable the port before the pipe on g4x */ -intel_dp_link_down (intel_dp); +intel_dp_link_down (encoder, old_crtc_state); } static void ilk_disable_dp(struct intel_encoder *encoder,
@@ -2754,33 +2754,29 @@ static void ilk_post_disable_dp(struct intel_encoder *encoder, const struct drm_connector_state *old_conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port = encoder->port; -intel_dp_link_down (intel_dp); +intel_dp_link_down (encoder, old_crtc_state);/* Only ilk+ has port A */ if (port ==PORT_A ) -ironlake_edp_pll_off (intel_dp); +ironlake_edp_pll_off (intel_dp, old_crtc_state); }static void vlv_post_disable_dp (struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state,const struct drm_connector_state *old_conn_state) { -struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); - -intel_dp_link_down (intel_dp); +intel_dp_link_down (encoder, old_crtc_state); }static void chv_post_disable_dp (struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state,const struct drm_connector_state *old_conn_state) { -struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -intel_dp_link_down (intel_dp); +intel_dp_link_down (encoder, old_crtc_state);mutex_lock (&dev_priv->sb_lock);
@@ -2909,7 +2905,7 @@ static void intel_enable_dp(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);uint32_t dp_reg =I915_READ (intel_dp->output_reg);enum pipe pipe = crtc->pipe;
@@ -2919,7 +2915,7 @@ static void intel_enable_dp(struct intel_encoder *encoder,pps_lock (intel_dp);if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) -vlv_init_panel_power_sequencer (intel_dp); +vlv_init_panel_power_sequencer (encoder, pipe_config);intel_dp_enable_port (intel_dp, pipe_config);
@@ -3047,13 +3043,13 @@ static void vlv_steal_power_sequencer(struct drm_device *dev, } } -static void vlv_init_panel_power_sequencer (struct intel_dp *intel_dp) +static void vlv_init_panel_power_sequencer (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *encoder = &intel_dig_port->base; +struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);lockdep_assert_held (&dev_priv->pps_mutex);
@@ -3084,7 +3080,7 @@ static void vlv_init_panel_power_sequencer(struct intel_dp *intel_dp) intel_dp->pps_pipe = crtc->pipe;DRM_DEBUG_KMS ("initializing pipe %c power sequencer for port %c\n" , -pipe_name (intel_dp->pps_pipe),port_name (intel_dig_port->port)); +pipe_name (intel_dp->pps_pipe),port_name (encoder->port));/* init power sequencer on this pipe and port */ intel_dp_init_panel_power_sequencer (dev, intel_dp);
@@ -3624,13 +3620,13 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp) }static void -intel_dp_link_down (struct intel_dp *intel_dp) +intel_dp_link_down (struct intel_encoder *encoder, +const struct intel_crtc_state *old_crtc_state) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc); -enum port port = intel_dig_port->port; -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +enum port port = encoder->port;uint32_t DP = intel_dp->DP;if (WARN_ON (HAS_DDI (dev_priv)))
@@ -5493,7 +5489,6 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, dig_port =dp_to_dig_port (intel_dp); encoder = &dig_port->base; - intel_crtc =to_intel_crtc (encoder->base.crtc);if (!intel_crtc) {DRM_DEBUG_KMS ("DRRS: intel_crtc not initialized\n" );
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/10] drm/i915: Eliminate some encoder->crtc usage from DP code
Quoted 5 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Extract the current crtc from the crtc state rather than via the legacy
encoder->crtcpointer whenever possible.
There are still some encoder->crtc remaining. How much of a problem is this?
Quoted 176 lines
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 63 +++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/intel_dp.c +29
-33@@ -129,10 +129,12 @@ static struct intel_dp *intel_attached_dp(struct drm_connector *connector)return enc_to_intel_dp (&intel_attached_encoder (connector)->base); } -static void intel_dp_link_down (struct intel_dp *intel_dp); +static void intel_dp_link_down (struct intel_encoder *encoder, +const struct intel_crtc_state *old_crtc_state);static bool edp_panel_vdd_on (struct intel_dp *intel_dp);static void edp_panel_vdd_off (struct intel_dp *intel_dp,bool sync); -static void vlv_init_panel_power_sequencer (struct intel_dp *intel_dp); +static void vlv_init_panel_power_sequencer (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state);static void vlv_steal_power_sequencer (struct drm_device *dev,enum pipe pipe);static void intel_dp_unset_edid (struct intel_dp *intel_dp);@@ -1858,7 +1860,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port =dp_to_dig_port (intel_dp)->port; -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; intel_dp_set_link_params(intel_dp, pipe_config->port_clock,@@ -2491,10 +2493,10 @@ static void ironlake_edp_pll_on(struct intel_dp *intel_dp,udelay (200 ); } -static void ironlake_edp_pll_off (struct intel_dp *intel_dp) +static void ironlake_edp_pll_off (struct intel_dp *intel_dp, +const struct intel_crtc_state *old_crtc_state) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);assert_pipe_disabled (dev_priv, crtc->pipe);@@ -2624,7 +2626,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);enum port port =dp_to_dig_port (intel_dp)->port; -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);if (encoder->type ==INTEL_OUTPUT_EDP ) pipe_config->output_types |=BIT (INTEL_OUTPUT_EDP );@@ -2723,12 +2725,10 @@ static void g4x_disable_dp(struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { - struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); -intel_disable_dp (encoder ,old_crtc_state ,old_conn_state );/* disable the port before the pipe on g4x */ -intel_dp_link_down (intel_dp); +intel_dp_link_down (encoder, old_crtc_state); } static void ilk_disable_dp(struct intel_encoder *encoder,@@ -2754,33 +2754,29 @@ static void ilk_post_disable_dp(struct intel_encoder *encoder, const struct drm_connector_state *old_conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port = encoder->port; -intel_dp_link_down (intel_dp); +intel_dp_link_down (encoder, old_crtc_state);/* Only ilk+ has port A */ if (port ==PORT_A ) -ironlake_edp_pll_off (intel_dp); +ironlake_edp_pll_off (intel_dp, old_crtc_state); }static void vlv_post_disable_dp (struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state,const struct drm_connector_state *old_conn_state) { -struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); - -intel_dp_link_down (intel_dp); +intel_dp_link_down (encoder, old_crtc_state); }static void chv_post_disable_dp (struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state,const struct drm_connector_state *old_conn_state) { -struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -intel_dp_link_down (intel_dp); +intel_dp_link_down (encoder, old_crtc_state);mutex_lock (&dev_priv->sb_lock);@@ -2909,7 +2905,7 @@ static void intel_enable_dp(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);uint32_t dp_reg =I915_READ (intel_dp->output_reg);enum pipe pipe = crtc->pipe;@@ -2919,7 +2915,7 @@ static void intel_enable_dp(struct intel_encoder *encoder,pps_lock (intel_dp);if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) -vlv_init_panel_power_sequencer (intel_dp); +vlv_init_panel_power_sequencer (encoder, pipe_config);intel_dp_enable_port (intel_dp, pipe_config);@@ -3047,13 +3043,13 @@ static void vlv_steal_power_sequencer(struct drm_device *dev, } } -static void vlv_init_panel_power_sequencer (struct intel_dp *intel_dp) +static void vlv_init_panel_power_sequencer (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *encoder = &intel_dig_port->base; +struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);lockdep_assert_held (&dev_priv->pps_mutex);@@ -3084,7 +3080,7 @@ static void vlv_init_panel_power_sequencer(struct intel_dp *intel_dp) intel_dp->pps_pipe = crtc->pipe;DRM_DEBUG_KMS ("initializing pipe %c power sequencer for port %c\n" , -pipe_name (intel_dp->pps_pipe),port_name (intel_dig_port->port)); +pipe_name (intel_dp->pps_pipe),port_name (encoder->port));/* init power sequencer on this pipe and port */ intel_dp_init_panel_power_sequencer (dev, intel_dp);@@ -3624,13 +3620,13 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp) }static void -intel_dp_link_down (struct intel_dp *intel_dp) +intel_dp_link_down (struct intel_encoder *encoder, +const struct intel_crtc_state *old_crtc_state) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc); -enum port port = intel_dig_port->port; -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +enum port port = encoder->port;uint32_t DP = intel_dp->DP;if (WARN_ON (HAS_DDI (dev_priv)))
drivers/gpu/drm/i915/intel_dp.c static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, · line 5494
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +0
-1@@ -5493,7 +5489,6 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, dig_port =dp_to_dig_port (intel_dp); encoder = &dig_port->base; - intel_crtc =to_intel_crtc (encoder->base.crtc);if (!intel_crtc) {DRM_DEBUG_KMS ("DRRS: intel_crtc not initialized\n" );
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/10] drm/i915: Eliminate some encoder->crtc usage from DP code
Quoted 10 lines · Dhinakaran
Quoted 5 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Extract the current crtc from the crtc state rather than via the legacy
encoder->crtcpointer whenever possible.There are still some
encoder->crtcremaining. How much of a problem is this?
The ones that are left are link training and sink crc stuff mostly IIRC. Those should get cleaned up, but they require a bit more than a trivial conversion.
It's not a real problem having those. Things should still work correctly given that we do update the legacy pointers somewhere.
Quoted 185 lines
Quoted 185 lines
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 63 +++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/intel_dp.c +29
-34@@ -129,10 +129,12 @@ static struct intel_dp *intel_attached_dp(struct drm_connector *connector)return enc_to_intel_dp (&intel_attached_encoder (connector)->base); } -static void intel_dp_link_down (struct intel_dp *intel_dp); +static void intel_dp_link_down (struct intel_encoder *encoder, +const struct intel_crtc_state *old_crtc_state);static bool edp_panel_vdd_on (struct intel_dp *intel_dp);static void edp_panel_vdd_off (struct intel_dp *intel_dp,bool sync); -static void vlv_init_panel_power_sequencer (struct intel_dp *intel_dp); +static void vlv_init_panel_power_sequencer (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state);static void vlv_steal_power_sequencer (struct drm_device *dev,enum pipe pipe);static void intel_dp_unset_edid (struct intel_dp *intel_dp);@@ -1858,7 +1860,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port =dp_to_dig_port (intel_dp)->port; -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; intel_dp_set_link_params(intel_dp, pipe_config->port_clock,@@ -2491,10 +2493,10 @@ static void ironlake_edp_pll_on(struct intel_dp *intel_dp,udelay (200 ); } -static void ironlake_edp_pll_off (struct intel_dp *intel_dp) +static void ironlake_edp_pll_off (struct intel_dp *intel_dp, +const struct intel_crtc_state *old_crtc_state) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);assert_pipe_disabled (dev_priv, crtc->pipe);@@ -2624,7 +2626,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);enum port port =dp_to_dig_port (intel_dp)->port; -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);if (encoder->type ==INTEL_OUTPUT_EDP ) pipe_config->output_types |=BIT (INTEL_OUTPUT_EDP );@@ -2723,12 +2725,10 @@ static void g4x_disable_dp(struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { - struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); -intel_disable_dp (encoder ,old_crtc_state ,old_conn_state );/* disable the port before the pipe on g4x */ -intel_dp_link_down (intel_dp); +intel_dp_link_down (encoder, old_crtc_state); } static void ilk_disable_dp(struct intel_encoder *encoder,@@ -2754,33 +2754,29 @@ static void ilk_post_disable_dp(struct intel_encoder *encoder, const struct drm_connector_state *old_conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port = encoder->port; -intel_dp_link_down (intel_dp); +intel_dp_link_down (encoder, old_crtc_state);/* Only ilk+ has port A */ if (port ==PORT_A ) -ironlake_edp_pll_off (intel_dp); +ironlake_edp_pll_off (intel_dp, old_crtc_state); }static void vlv_post_disable_dp (struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state,const struct drm_connector_state *old_conn_state) { -struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); - -intel_dp_link_down (intel_dp); +intel_dp_link_down (encoder, old_crtc_state); }static void chv_post_disable_dp (struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state,const struct drm_connector_state *old_conn_state) { -struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -intel_dp_link_down (intel_dp); +intel_dp_link_down (encoder, old_crtc_state);mutex_lock (&dev_priv->sb_lock);@@ -2909,7 +2905,7 @@ static void intel_enable_dp(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);uint32_t dp_reg =I915_READ (intel_dp->output_reg);enum pipe pipe = crtc->pipe;@@ -2919,7 +2915,7 @@ static void intel_enable_dp(struct intel_encoder *encoder,pps_lock (intel_dp);if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) -vlv_init_panel_power_sequencer (intel_dp); +vlv_init_panel_power_sequencer (encoder, pipe_config);intel_dp_enable_port (intel_dp, pipe_config);@@ -3047,13 +3043,13 @@ static void vlv_steal_power_sequencer(struct drm_device *dev, } } -static void vlv_init_panel_power_sequencer (struct intel_dp *intel_dp) +static void vlv_init_panel_power_sequencer (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *encoder = &intel_dig_port->base; +struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);lockdep_assert_held (&dev_priv->pps_mutex);@@ -3084,7 +3080,7 @@ static void vlv_init_panel_power_sequencer(struct intel_dp *intel_dp) intel_dp->pps_pipe = crtc->pipe;DRM_DEBUG_KMS ("initializing pipe %c power sequencer for port %c\n" , -pipe_name (intel_dp->pps_pipe),port_name (intel_dig_port->port)); +pipe_name (intel_dp->pps_pipe),port_name (encoder->port));/* init power sequencer on this pipe and port */ intel_dp_init_panel_power_sequencer (dev, intel_dp);@@ -3624,13 +3620,13 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp) }static void -intel_dp_link_down (struct intel_dp *intel_dp) +intel_dp_link_down (struct intel_encoder *encoder, +const struct intel_crtc_state *old_crtc_state) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_crtc *crtc =to_intel_crtc (intel_dig_port->base.base.crtc); -enum port port = intel_dig_port->port; -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +enum port port = encoder->port;uint32_t DP = intel_dp->DP;if (WARN_ON (HAS_DDI (dev_priv)))@@ -5493,7 +5489,6 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, dig_port =dp_to_dig_port (intel_dp); encoder = &dig_port->base; - intel_crtc =to_intel_crtc (encoder->base.crtc);if (!intel_crtc) {DRM_DEBUG_KMS ("DRRS: intel_crtc not initialized\n" );
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/10 drm/i915: Eliminate some encoder->crtc usage from DSI code
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Extract the current crtc from the crtc state rather than via the legacy encoder->crtc pointer whenever possible.
--- drivers/gpu/drm/i915/intel_dsi.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_dsi.c +8 -9
@@ -662,11 +662,11 @@ static void vlv_dsi_clear_device_ready(struct intel_encoder *encoder) } } -static void intel_dsi_port_enable (struct intel_encoder *encoder) +static void intel_dsi_port_enable (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state) { -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);enum port port;
@@ -705,7 +705,7 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder)if (IS_BROXTON (dev_priv)) temp |=LANE_CONFIGURATION_DUAL_LINK_A ;else - temp |= intel_crtc->pipe ? + temp |= crtc->pipe ?LANE_CONFIGURATION_DUAL_LINK_B :LANE_CONFIGURATION_DUAL_LINK_A ; }
@@ -875,7 +875,7 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder,intel_dsi_vbt_exec_sequence (intel_dsi,MIPI_SEQ_DISPLAY_ON ); -intel_dsi_port_enable (encoder); +intel_dsi_port_enable (encoder, pipe_config); }intel_panel_enable_backlight (pipe_config, conn_state);
@@ -1082,7 +1082,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;struct drm_display_mode *adjusted_mode_sw; -struct intel_crtc *intel_crtc; +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);unsigned int lane_count = intel_dsi->lane_count;unsigned int bpp, fmt;
@@ -1093,8 +1093,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder, crtc_hblank_start_sw, crtc_hblank_end_sw;/* FIXME: hw readout should not depend on SW state */ - intel_crtc =to_intel_crtc (encoder->base.crtc); - adjusted_mode_sw = &intel_crtc->config->base.adjusted_mode; + adjusted_mode_sw = &crtc->config->base.adjusted_mode;/* * Atleast one port is active as encoder->get_config called only if
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 02/10] drm/i915: Eliminate some encoder->crtc usage from DSI code
Quoted 17 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Extract the current crtc from the crtc state rather than via the legacy
encoder->crtcpointer whenever possible.Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_dsi.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/intel_dsi.c +0
-0@@ -662,11 +662,11 @@ static void vlv_dsi_clear_device_ready(struct intel_encoder *encoder) } }
drivers/gpu/drm/i915/intel_dsi.c static void vlv_dsi_clear_device_ready(struct intel_encoder *encoder) · line 669
Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi.c +4
-4-static void intel_dsi_port_enable (struct intel_encoder *encoder) +static void intel_dsi_port_enable (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state) { -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);
Hmm. the crtc v/s intel_crtc usage isn't consistent, perhaps another clean-up with coccinelle.
Quoted 31 lines
drivers/gpu/drm/i915/intel_dsi.c +3
-3struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);enum port port;@@ -705,7 +705,7 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder)if (IS_BROXTON (dev_priv)) temp |=LANE_CONFIGURATION_DUAL_LINK_A ;else - temp |= intel_crtc->pipe ? + temp |= crtc->pipe ?LANE_CONFIGURATION_DUAL_LINK_B :LANE_CONFIGURATION_DUAL_LINK_A ; }@@ -875,7 +875,7 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder,intel_dsi_vbt_exec_sequence (intel_dsi,MIPI_SEQ_DISPLAY_ON ); -intel_dsi_port_enable (encoder); +intel_dsi_port_enable (encoder, pipe_config); }intel_panel_enable_backlight (pipe_config, conn_state);@@ -1082,7 +1082,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;struct drm_display_mode *adjusted_mode_sw; -struct intel_crtc *intel_crtc; +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);unsigned int lane_count = intel_dsi->lane_count;unsigned int bpp, fmt;
drivers/gpu/drm/i915/intel_dsi.c static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder, · line 1099
Quoted 9 lines
drivers/gpu/drm/i915/intel_dsi.c +1
-2@@ -1093,8 +1093,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder, crtc_hblank_start_sw, crtc_hblank_end_sw;/* FIXME: hw readout should not depend on SW state */ - intel_crtc =to_intel_crtc (encoder->base.crtc); - adjusted_mode_sw = &intel_crtc->config->base.adjusted_mode; + adjusted_mode_sw = &crtc->config->base.adjusted_mode;/* * Atleast one port is active as encoder->get_config called only if
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 02/10] drm/i915: Eliminate some encoder->crtc usage from DSI code
Quoted 20 lines · Dhinakaran
Quoted 18 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Extract the current crtc from the crtc state rather than via the legacy
encoder->crtcpointer whenever possible.Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_dsi.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/intel_dsi.c +0
-0@@ -662,11 +662,11 @@ static void vlv_dsi_clear_device_ready(struct intel_encoder *encoder) } }
Quoted 13 lines
drivers/gpu/drm/i915/intel_dsi.c static void vlv_dsi_clear_device_ready(struct intel_encoder *encoder) · line 669
Quoted 9 lines
drivers/gpu/drm/i915/intel_dsi.c +4
-4-static void intel_dsi_port_enable (struct intel_encoder *encoder) +static void intel_dsi_port_enable (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state) { -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);Hmm. the crtc v/s
intel_crtcusage isn't consistent, perhaps another clean-up with coccinelle.
Yeah, theres' tons of that to be cleaned up all over the place. And silimarly for intel_encoder vs. encoder. And we're even worse when it comes to naming various atomic state objects.
Quoted 42 lines
Quoted 42 lines
drivers/gpu/drm/i915/intel_dsi.c +4
-5struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);enum port port;@@ -705,7 +705,7 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder)if (IS_BROXTON (dev_priv)) temp |=LANE_CONFIGURATION_DUAL_LINK_A ;else - temp |= intel_crtc->pipe ? + temp |= crtc->pipe ?LANE_CONFIGURATION_DUAL_LINK_B :LANE_CONFIGURATION_DUAL_LINK_A ; }@@ -875,7 +875,7 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder,intel_dsi_vbt_exec_sequence (intel_dsi,MIPI_SEQ_DISPLAY_ON ); -intel_dsi_port_enable (encoder); +intel_dsi_port_enable (encoder, pipe_config); }intel_panel_enable_backlight (pipe_config, conn_state);@@ -1082,7 +1082,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;struct drm_display_mode *adjusted_mode_sw; -struct intel_crtc *intel_crtc; +struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);unsigned int lane_count = intel_dsi->lane_count;unsigned int bpp, fmt;@@ -1093,8 +1093,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder, crtc_hblank_start_sw, crtc_hblank_end_sw;/* FIXME: hw readout should not depend on SW state */ - intel_crtc =to_intel_crtc (encoder->base.crtc); - adjusted_mode_sw = &intel_crtc->config->base.adjusted_mode; + adjusted_mode_sw = &crtc->config->base.adjusted_mode;/* * Atleast one port is active as encoder->get_config called only if
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/10 drm/i915: Eliminate some encoder->crtc usage from SDVO code
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Extract the current crtc from the crtc state rather than via the legacy encoder->crtc pointer whenever possible.
--- drivers/gpu/drm/i915/intel_sdvo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_sdvo.c +2 -2
@@ -1512,7 +1512,7 @@ static void intel_disable_sdvo(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_sdvo *intel_sdvo =to_sdvo (encoder); -struct intel_crtc *crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc);u32 temp;intel_sdvo_set_active_outputs (intel_sdvo,0 );
@@ -1571,7 +1571,7 @@ static void intel_enable_sdvo(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_sdvo *intel_sdvo =to_sdvo (encoder); -struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc);u32 temp;bool input1, input2;int i;
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/10 drm/i915: Eliminate some encoder->crtc usage from TV code
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Extract the current crtc from the crtc state rather than via the legacy encoder->crtc pointer whenever possible.
--- drivers/gpu/drm/i915/intel_tv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_tv.c +2 -2
@@ -822,7 +822,7 @@ intel_enable_tv(struct intel_encoder *encoder,/* Prevents vblank waits from timing out in intel_tv_detect_type() */ intel_wait_for_vblank (dev_priv, -to_intel_crtc (encoder->base.crtc)->pipe); +to_intel_crtc (pipe_config->base.crtc)->pipe);I915_WRITE (TV_CTL ,I915_READ (TV_CTL ) |TV_ENC_ENABLE ); }
@@ -982,7 +982,7 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder, 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); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc);struct intel_tv *intel_tv =enc_to_tv (encoder);const struct tv_mode *tv_mode =intel_tv_mode_find (conn_state);u32 tv_ctl;
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/10 drm/i915: Pass crtc state to DPIO PHY functions
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Rather than digging through encoder->crtc and crtc->config in the DPIO PHY functions, pass down the correct crtc state from the caller.
--- drivers/gpu/drm/i915/i915_drv.h | 19 +++++--- drivers/gpu/drm/i915/intel_dp.c | 16 +++---- drivers/gpu/drm/i915/intel_dpio_phy.c | 87 +++++++++++++++++------------------ drivers/gpu/drm/i915/intel_hdmi.c | 17 ++++--- 4 files changed, 72 insertions(+), 67 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +13 -6
@@ -4192,18 +4192,25 @@ void chv_set_phy_signal_level(struct intel_encoder *encoder, u32 deemph_reg_value, u32 margin_reg_value, bool uniq_trans_scale);void chv_data_lane_soft_reset (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state,bool reset); -void chv_phy_pre_pll_enable (struct intel_encoder *encoder); -void chv_phy_pre_encoder_enable (struct intel_encoder *encoder); +void chv_phy_pre_pll_enable (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state); +void chv_phy_pre_encoder_enable (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state);void chv_phy_release_cl2_override (struct intel_encoder *encoder); -void chv_phy_post_pll_disable (struct intel_encoder *encoder); +void chv_phy_post_pll_disable (struct intel_encoder *encoder, +const struct intel_crtc_state *old_crtc_state);void vlv_set_phy_signal_level (struct intel_encoder *encoder,u32 demph_reg_value,u32 preemph_reg_value,u32 uniqtranscale_reg_value,u32 tx3_demph); -void vlv_phy_pre_pll_enable (struct intel_encoder *encoder); -void vlv_phy_pre_encoder_enable (struct intel_encoder *encoder); -void vlv_phy_reset_lanes (struct intel_encoder *encoder); +void vlv_phy_pre_pll_enable (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state); +void vlv_phy_pre_encoder_enable (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state); +void vlv_phy_reset_lanes (struct intel_encoder *encoder, +const struct intel_crtc_state *old_crtc_state);int intel_gpu_freq (struct drm_i915_private *dev_priv,int val);int intel_freq_opcode (struct drm_i915_private *dev_priv,int val);
drivers/gpu/drm/i915/intel_dp.c +8 -8
@@ -2781,7 +2781,7 @@ static void chv_post_disable_dp(struct intel_encoder *encoder,mutex_lock (&dev_priv->sb_lock);/* Assert data lane reset */ -chv_data_lane_soft_reset (encoder, true); +chv_data_lane_soft_reset (encoder, old_crtc_state, true);mutex_unlock (&dev_priv->sb_lock); }
@@ -3091,7 +3091,7 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config, const struct drm_connector_state *conn_state) { -vlv_phy_pre_encoder_enable (encoder ); +vlv_phy_pre_encoder_enable (encoder ,pipe_config );intel_enable_dp (encoder, pipe_config, conn_state); }
@@ -3102,14 +3102,14 @@ static void vlv_dp_pre_pll_enable(struct intel_encoder *encoder, {intel_dp_prepare (encoder, pipe_config); -vlv_phy_pre_pll_enable (encoder); +vlv_phy_pre_pll_enable (encoder, pipe_config); }static void chv_pre_enable_dp (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config,const struct drm_connector_state *conn_state) { -chv_phy_pre_encoder_enable (encoder); +chv_phy_pre_encoder_enable (encoder, pipe_config);intel_enable_dp (encoder, pipe_config, conn_state);
@@ -3123,14 +3123,14 @@ static void chv_dp_pre_pll_enable(struct intel_encoder *encoder, {intel_dp_prepare (encoder, pipe_config); -chv_phy_pre_pll_enable (encoder); +chv_phy_pre_pll_enable (encoder, pipe_config); }static void chv_dp_post_pll_disable (struct intel_encoder *encoder, -const struct intel_crtc_state *pipe_config, -const struct drm_connector_state *conn_state) +const struct intel_crtc_state *old_crtc_state, +const struct drm_connector_state *old_conn_state) { -chv_phy_post_pll_disable (encoder); +chv_phy_post_pll_disable (encoder, old_crtc_state); }/*
drivers/gpu/drm/i915/intel_dpio_phy.c +43 -44
212 lines not on this page · raw message
drivers/gpu/drm/i915/intel_hdmi.c +8 -9
@@ -1683,10 +1683,9 @@ static void vlv_hdmi_pre_enable(struct intel_encoder *encoder, const struct drm_connector_state *conn_state) {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -vlv_phy_pre_encoder_enable (encoder); +vlv_phy_pre_encoder_enable (encoder, pipe_config);/* HDMI 1.0V-2dB */ vlv_set_phy_signal_level(encoder, 0x2b245f5f, 0x00002000, 0x5578b83a,
@@ -1707,7 +1706,7 @@ static void vlv_hdmi_pre_pll_enable(struct intel_encoder *encoder, {intel_hdmi_prepare (encoder, pipe_config); -vlv_phy_pre_pll_enable (encoder); +vlv_phy_pre_pll_enable (encoder, pipe_config); } static void chv_hdmi_pre_pll_enable(struct intel_encoder *encoder,
@@ -1716,14 +1715,14 @@ static void chv_hdmi_pre_pll_enable(struct intel_encoder *encoder, {intel_hdmi_prepare (encoder, pipe_config); -chv_phy_pre_pll_enable (encoder); +chv_phy_pre_pll_enable (encoder, pipe_config); }static void chv_hdmi_post_pll_disable (struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state,const struct drm_connector_state *old_conn_state) { -chv_phy_post_pll_disable (encoder); +chv_phy_post_pll_disable (encoder, old_crtc_state); } static void vlv_hdmi_post_disable(struct intel_encoder *encoder,
@@ -1731,7 +1730,7 @@ static void vlv_hdmi_post_disable(struct intel_encoder *encoder, const struct drm_connector_state *old_conn_state) {/* Reset lanes to avoid HDMI flicker (VLV w/a) */ -vlv_phy_reset_lanes (encoder); +vlv_phy_reset_lanes (encoder, old_crtc_state); } static void chv_hdmi_post_disable(struct intel_encoder *encoder,
@@ -1744,7 +1743,7 @@ static void chv_hdmi_post_disable(struct intel_encoder *encoder,mutex_lock (&dev_priv->sb_lock);/* Assert data lane reset */ -chv_data_lane_soft_reset (encoder, true); +chv_data_lane_soft_reset (encoder, old_crtc_state, true);mutex_unlock (&dev_priv->sb_lock); }
@@ -1757,7 +1756,7 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -chv_phy_pre_encoder_enable (encoder); +chv_phy_pre_encoder_enable (encoder, pipe_config);/* FIXME: Program the support xxx V-dB */ /* Use 800mV-0dB */
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/10 drm/i915: Eliminate crtc->config usage from CRT code
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Replace crtc->config usage with the passed down crtc state.
Also take the opportunity for some s/pipe_config/crtc_state/ while at it.
--- drivers/gpu/drm/i915/intel_crt.c | 44 +++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/intel_crt.c +19 -25
@@ -219,11 +219,9 @@ static void hsw_disable_crt(struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { - struct drm_crtc *crtc = old_crtc_state->base.crtc; -struct drm_i915_private *dev_priv =to_i915 (crtc->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); -WARN_ON (!intel_crtc->config->has_pch_encoder); +WARN_ON (!old_crtc_state->has_pch_encoder);intel_set_pch_fifo_underrun_reporting (dev_priv,PIPE_A , false); }
@@ -247,46 +245,42 @@ static void hsw_post_disable_crt(struct intel_encoder *encoder, }static void hsw_pre_pll_enable_crt (struct intel_encoder *encoder, -const struct intel_crtc_state *pipe_config, +const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state) { -struct drm_crtc *crtc = pipe_config->base.crtc; -struct drm_i915_private *dev_priv =to_i915 (crtc->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -WARN_ON (!intel_crtc->config->has_pch_encoder); +WARN_ON (!crtc_state->has_pch_encoder);intel_set_pch_fifo_underrun_reporting (dev_priv,PIPE_A , false); }static void hsw_pre_enable_crt (struct intel_encoder *encoder, -const struct intel_crtc_state *pipe_config, +const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state) { -struct drm_crtc *crtc = pipe_config->base.crtc; -struct drm_i915_private *dev_priv =to_i915 (crtc->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -int pipe = intel_crtc->pipe; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +enum pipe pipe = crtc->pipe; -WARN_ON (!intel_crtc->config->has_pch_encoder); +WARN_ON (!crtc_state->has_pch_encoder);intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, false); - dev_priv->display.fdi_link_train (intel_crtc, pipe_config); + dev_priv->display.fdi_link_train (crtc, crtc_state); }static void hsw_enable_crt (struct intel_encoder *encoder, -const struct intel_crtc_state *pipe_config, +const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state) { -struct drm_crtc *crtc = pipe_config->base.crtc; -struct drm_i915_private *dev_priv =to_i915 (crtc->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -int pipe = intel_crtc->pipe; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +enum pipe pipe = crtc->pipe; -WARN_ON (!intel_crtc->config->has_pch_encoder); +WARN_ON (!crtc_state->has_pch_encoder); -intel_crt_set_dpms (encoder, pipe_config,DRM_MODE_DPMS_ON ); +intel_crt_set_dpms (encoder, crtc_state,DRM_MODE_DPMS_ON );intel_wait_for_vblank (dev_priv, pipe);intel_wait_for_vblank (dev_priv, pipe);
@@ -295,10 +289,10 @@ static void hsw_enable_crt(struct intel_encoder *encoder, }static void intel_enable_crt (struct intel_encoder *encoder, -const struct intel_crtc_state *pipe_config, +const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state) { -intel_crt_set_dpms (encoder, pipe_config,DRM_MODE_DPMS_ON ); +intel_crt_set_dpms (encoder, crtc_state,DRM_MODE_DPMS_ON ); } static enum drm_mode_status
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/10 drm/i915: Replace dig_port->port with encoder port for BXT DPLL selection
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Replace dig_port->port with encoder->port in the BXT DPLL selection. We can do this because both the master encoder and the fake MST encoders have the same encoder->port value, whereas using dig_port->port only worked for the master encoder since the fake encoders were't derived from intel_digital_port. This eliminates the DP MST special case.
Do this by hand because spatch is having problems with the control flow due to the dig_port assignment happening in two different branches.
--- drivers/gpu/drm/i915/intel_dpll_mgr.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -9
@@ -1802,7 +1802,6 @@ bxt_get_dpll(struct intel_crtc *crtc, {struct intel_dpll_hw_state dpll_hw_state = { };struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -struct intel_digital_port *intel_dig_port;struct intel_shared_dpll *pll;int i, clock = crtc_state->port_clock;
@@ -1820,15 +1819,8 @@ bxt_get_dpll(struct intel_crtc *crtc, crtc_state->dpll_hw_state = dpll_hw_state; -if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DP_MST )) { -struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base); - - intel_dig_port = intel_mst->primary; - }else - intel_dig_port =enc_to_dig_port (&encoder->base); -/* 1:1 mapping between ports and PLLs */ - i = (enum intel_dpll_id ) intel_dig_port->port; + i = (enum intel_dpll_id ) encoder->port; pll =intel_get_shared_dpll_by_id (dev_priv, i); DRM_DEBUG_KMS("[CRTC:%d:%s] using pre-allocated %s\n",
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/10 drm/i915: Nuke intel_digital_port->port
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Remove intel_digital_port->port and replace its users with intel_encoder->port. intel_encoder->port is a superset of intel_digital_port->port, and it works correctly even for MST encoders.
Performed with cocci:
@@
@@
struct intel_digital_port {
...
- enum port port;
...
}@@
struct intel_digital_port *D;
expression E;
@@
- D->port = E;
@@
struct intel_digital_port *D;
@@
- D->port
+ D->base.port
@@
expression E;
@@
(
- dp_to_dig_port(E)->port
+ dp_to_dig_port(E)->base.port
|
- enc_to_dig_port(E)->port
+ to_intel_encoder(E)->port
)
@@
expression E;
@@
- to_intel_encoder(&E->base)
+ E
@@
struct intel_digital_port *D;
identifier I, M;
@@
I = &D->base
<...
(
- D->base.M
+ I->M
|
- &D->base
+ I
)
...>
@@
identifier D;
expression E;
identifier M;
@@
D = enc_to_dig_port(&E->base)
<...
(
- D->base.M
+ E->M
|
- &D->base
+ E
)
...>
@@
expression E;
identifier M;
@@
(
- enc_to_dig_port(&E->base)->base.M
+ E->M
|
- enc_to_dig_port(&E->base)->base
+ E
|
- enc_to_mst(&E->base)->primary->base.port
+ E->port
)
@@
expression E;
identifier D;
@@
- struct intel_digital_port *D = E;
... when != D
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 13 ++--- drivers/gpu/drm/i915/intel_display.c | 13 +++-- drivers/gpu/drm/i915/intel_dp.c | 103 +++++++++++++++++----------------- drivers/gpu/drm/i915/intel_dp_mst.c | 6 +- drivers/gpu/drm/i915/intel_dpio_phy.c | 12 ++-- drivers/gpu/drm/i915/intel_drv.h | 5 +- drivers/gpu/drm/i915/intel_hdmi.c | 17 +++--- drivers/gpu/drm/i915/intel_pipe_crc.c | 4 +- drivers/gpu/drm/i915/intel_psr.c | 4 +- 10 files changed, 87 insertions(+), 92 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -3603,7 +3603,7 @@ static int i915_dp_mst_info(struct seq_file *m, void *unused)continue ;seq_printf (m,"MST Source Port %c\n" , -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port));drm_dp_mst_dump_topology (m, &intel_dig_port->dp.mst_mgr); }drm_connector_list_iter_end (&conn_iter);
drivers/gpu/drm/i915/intel_ddi.c +6 -7
@@ -1801,8 +1801,8 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, int level, enum intel_output_type type) {struct intel_digital_port *intel_dig_port =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev); -enum port port = intel_dig_port->port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port;uint8_t iboost;if (type ==INTEL_OUTPUT_HDMI )
@@ -2470,7 +2470,7 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;uint32_t val;bool wait = false;
@@ -2698,7 +2698,7 @@ static struct intel_connector * intel_ddi_init_dp_connector(struct intel_digital_port *intel_dig_port) {struct intel_connector *connector; -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port; connector =intel_connector_alloc ();if (!connector)
@@ -2717,7 +2717,7 @@ static struct intel_connector * intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port) {struct intel_connector *connector; -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port; connector =intel_connector_alloc ();if (!connector)
@@ -2733,7 +2733,7 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dport) {struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); -if (dport->port !=PORT_A ) +if (dport->base.port !=PORT_A )return false;if (dport->saved_port_bits &DDI_A_4_LANES )
@@ -2836,7 +2836,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) intel_encoder->suspend = intel_dp_encoder_suspend; intel_encoder->get_power_domains = intel_ddi_get_power_domains; - intel_dig_port->port = port; intel_dig_port->saved_port_bits =I915_READ (DDI_BUF_CTL (port)) & (DDI_BUF_PORT_REVERSAL |DDI_A_4_LANES );
drivers/gpu/drm/i915/intel_display.c +7 -6
@@ -1703,7 +1703,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,u32 port_mask;i915_reg_t dpll_reg; -switch (dport->port) { +switch (dport->base.port) {case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; dpll_reg =DPLL (0 );
@@ -1725,7 +1725,8 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, dpll_reg, port_mask, expected_mask, 1000))WARN (1 ,"timed out waiting for port %c ready: got 0x%x, expected 0x%x\n" , -port_name (dport->port),I915_READ (dpll_reg) & port_mask, expected_mask); +port_name (dport->base.port), +I915_READ (dpll_reg) & port_mask, expected_mask); } static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv,
@@ -4482,7 +4483,7 @@ intel_trans_dp_port_sel(struct intel_crtc *crtc)for_each_encoder_on_crtc (dev, &crtc->base, encoder) {if (encoder->type ==INTEL_OUTPUT_DP || encoder->type ==INTEL_OUTPUT_EDP ) -return enc_to_dig_port (&encoder->base)->port; +return encoder->port; }return -1 ;
@@ -7633,7 +7634,7 @@ static void ironlake_init_pch_refclk(struct drm_i915_private *dev_priv)break ;case INTEL_OUTPUT_EDP : has_panel = true; -if (enc_to_dig_port (&encoder->base)->port ==PORT_A ) +if (encoder->port ==PORT_A ) has_cpu_edp = true;break ;default :
@@ -10756,7 +10757,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)case INTEL_OUTPUT_DP :case INTEL_OUTPUT_HDMI :case INTEL_OUTPUT_EDP : - port_mask =1 <<enc_to_dig_port (&encoder->base)->port; + port_mask =1 << encoder->port;/* the same port mustn't appear more than once */ if (used_ports & port_mask)
@@ -10766,7 +10767,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)break ;case INTEL_OUTPUT_DP_MST : used_mst_ports |= -1 <<enc_to_mst (&encoder->base)->primary->port; +1 << encoder->port;break ;default :break ;
drivers/gpu/drm/i915/intel_dp.c +51 -52
398 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp_mst.c +3 -3
@@ -209,7 +209,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp;struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;struct intel_connector *connector =to_intel_connector (conn_state->connector);int ret;
@@ -253,7 +253,7 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder,struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp;struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;int ret;DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links);
@@ -552,7 +552,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum intel_encoder->type =INTEL_OUTPUT_DP_MST ; intel_encoder->power_domain = intel_dig_port->base.power_domain; - intel_encoder->port = intel_dig_port->port; + intel_encoder->port = intel_dig_port->base.port; intel_encoder->crtc_mask =0x7 ; intel_encoder->cloneable =0 ;
drivers/gpu/drm/i915/intel_dpio_phy.c +5 -7
@@ -586,9 +586,8 @@ bxt_ddi_phy_calc_lane_lat_optim_mask(uint8_t lane_count)void bxt_ddi_phy_set_lane_optim_mask (struct intel_encoder *encoder,uint8_t lane_lat_optim_mask) { -struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); -enum port port = dport->port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port;enum dpio_phy phy;enum dpio_channel ch;int lane;
@@ -613,9 +612,8 @@ void bxt_ddi_phy_set_lane_optim_mask(struct intel_encoder *encoder,uint8_t bxt_ddi_phy_get_lane_lat_optim_mask (struct intel_encoder *encoder) { -struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); -enum port port = dport->port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port;enum dpio_phy phy;enum dpio_channel ch;int lane;
@@ -641,7 +639,7 @@ void chv_set_phy_signal_level(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct intel_crtc *intel_crtc =to_intel_crtc (dport->base.base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);enum dpio_channel ch =vlv_dport_to_channel (dport);enum pipe pipe = intel_crtc->pipe;u32 val;
drivers/gpu/drm/i915/intel_drv.h +2 -3
@@ -1056,7 +1056,6 @@ struct intel_lspcon {struct intel_digital_port {struct intel_encoder base; -enum port port;u32 saved_port_bits;struct intel_dp dp;struct intel_hdmi hdmi;
@@ -1088,7 +1087,7 @@ struct intel_dp_mst_encoder {static inline enum dpio_channel vlv_dport_to_channel (struct intel_digital_port *dport) { -switch (dport->port) { +switch (dport->base.port) {case PORT_B :case PORT_D :return DPIO_CH0 ;
@@ -1102,7 +1101,7 @@ vlv_dport_to_channel(struct intel_digital_port *dport)static inline enum dpio_phy vlv_dport_to_phy (struct intel_digital_port *dport) { -switch (dport->port) { +switch (dport->base.port) {case PORT_B :case PORT_C :return DPIO_PHY0 ;
drivers/gpu/drm/i915/intel_hdmi.c +8 -9
@@ -186,7 +186,7 @@ static bool g4x_infoframe_enabled(struct drm_encoder *encoder,if ((val &VIDEO_DIP_ENABLE ) ==0 )return false; -if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->port)) +if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->base.port))return false; return val & (VIDEO_DIP_ENABLE_AVI |
@@ -245,7 +245,7 @@ static bool ibx_infoframe_enabled(struct drm_encoder *encoder,if ((val &VIDEO_DIP_ENABLE ) ==0 )return false; -if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->port)) +if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->base.port))return false; return val & (VIDEO_DIP_ENABLE_AVI |
@@ -362,7 +362,7 @@ static bool vlv_infoframe_enabled(struct drm_encoder *encoder,if ((val &VIDEO_DIP_ENABLE ) ==0 )return false; -if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->port)) +if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->base.port))return false; return val & (VIDEO_DIP_ENABLE_AVI |
@@ -535,7 +535,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;i915_reg_t reg =VIDEO_DIP_CTL ;u32 val =I915_READ (reg); -u32 port =VIDEO_DIP_PORT (intel_dig_port->port); +u32 port =VIDEO_DIP_PORT (intel_dig_port->base.port);assert_hdmi_port_disabled (intel_hdmi);
@@ -686,7 +686,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;i915_reg_t reg =TVIDEO_DIP_CTL (intel_crtc->pipe);u32 val =I915_READ (reg); -u32 port =VIDEO_DIP_PORT (intel_dig_port->port); +u32 port =VIDEO_DIP_PORT (intel_dig_port->base.port);assert_hdmi_port_disabled (intel_hdmi);
@@ -782,7 +782,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);i915_reg_t reg =VLV_TVIDEO_DIP_CTL (intel_crtc->pipe);u32 val =I915_READ (reg); -u32 port =VIDEO_DIP_PORT (intel_dig_port->port); +u32 port =VIDEO_DIP_PORT (intel_dig_port->base.port);assert_hdmi_port_disabled (intel_hdmi);
@@ -1545,7 +1545,7 @@ intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector, bool has_edid) {struct drm_i915_private *dev_priv =to_i915 (connector->dev);struct intel_hdmi *hdmi =intel_attached_hdmi (connector); -enum port port =hdmi_to_dig_port (hdmi)->port; +enum port port =hdmi_to_dig_port (hdmi)->base.port;struct i2c_adapter *adapter =intel_gmbus_get_adapter (dev_priv, hdmi->ddc_bus);enum drm_dp_dual_mode_type type =drm_dp_dual_mode_detect (adapter);
@@ -2015,7 +2015,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,struct intel_encoder *intel_encoder = &intel_dig_port->base;struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->port;DRM_DEBUG_KMS ("Adding HDMI connector on port %c\n" ,port_name (port));
@@ -2135,7 +2135,6 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv,if (IS_G4X (dev_priv)) intel_encoder->cloneable |=1 <<INTEL_OUTPUT_HDMI ; - intel_dig_port->port = port; intel_dig_port->hdmi.hdmi_reg = hdmi_reg; intel_dig_port->dp.output_reg =INVALID_MMIO_REG ; intel_dig_port->max_lanes =4 ;
drivers/gpu/drm/i915/intel_pipe_crc.c +2 -2
@@ -269,7 +269,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv,case INTEL_OUTPUT_DP :case INTEL_OUTPUT_EDP : dig_port =enc_to_dig_port (&encoder->base); -switch (dig_port->port) { +switch (dig_port->base.port) {case PORT_B : *source =INTEL_PIPE_CRC_SOURCE_DP_B ;break ;
@@ -281,7 +281,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv,break ;default :WARN (1 ,"nonexisting DP port %c\n" , -port_name (dig_port->port)); +port_name (dig_port->base.port));break ; }break ;
drivers/gpu/drm/i915/intel_psr.c +2 -2
@@ -163,7 +163,7 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) [3] = 1 - 1, [4] = DP_SET_POWER_D0, }; -enum port port = dig_port->port; +enum port port = dig_port->base.port;u32 aux_ctl;int i;
@@ -376,7 +376,7 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,* ones. Since by Display design transcoder EDP is tied to port A * we can safely escape based on the port A. */ -if (HAS_DDI (dev_priv) && dig_port->port !=PORT_A ) { +if (HAS_DDI (dev_priv) && dig_port->base.port !=PORT_A ) {DRM_DEBUG_KMS ("PSR condition failed: Port not supported\n" );return ; }
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/10] drm/i915: Nuke intel_digital_port->port
Quoted 91 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Remove
intel_digital_port->portand replace its users withintel_encoder->port.intel_encoder->portis a superset ofintel_digital_port->port, and it works correctly even for MST encoders.Performed with cocci:
@@
@@struct intel_digital_port { ... - enum port port; ... }@@
structintel_digital_port*D;
expression E;
@@
-D->port= E;@@
structintel_digital_port*D;
@@
-D->port
+D->base.port@@
expression E;
@@
(
- dp_to_dig_port(E)->port
+ dp_to_dig_port(E)->base.port
|
- enc_to_dig_port(E)->port
+ to_intel_encoder(E)->port
)@@
expression E;
@@
-to_intel_encoder(&E->base)
+ E@@
structintel_digital_port*D;
identifier I, M;
@@
I =&D->base
<...
(
-D->base.M
+I->M
|
-&D->base
+ I
)
...>@@
identifier D;
expression E;
identifier M;
@@
D =enc_to_dig_port(&E->base)
<...
(
-D->base.M
+E->M
|
-&D->base
+ E
)
...>@@
expression E;
identifier M;
@@
(
- enc_to_dig_port(&E->base)->base.M
+E->M
|
- enc_to_dig_port(&E->base)->base
+ E
|
- enc_to_mst(&E->base)->primary->base.port
+E->port
)
Quoted 7 lines
@@
expression E;
identifier D;
@@
- structintel_digital_port*D = E;
... when != D
The script has ended up creating intel_dig_port->base.port dereferences in some places where encoder->port was possible, but has worked pretty well otherwise.
Quoted 227 lines
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 13 ++--- drivers/gpu/drm/i915/intel_display.c | 13 +++-- drivers/gpu/drm/i915/intel_dp.c | 103 +++++++++++++++++----------------- drivers/gpu/drm/i915/intel_dp_mst.c | 6 +- drivers/gpu/drm/i915/intel_dpio_phy.c | 12 ++-- drivers/gpu/drm/i915/intel_drv.h | 5 +- drivers/gpu/drm/i915/intel_hdmi.c | 17 +++--- drivers/gpu/drm/i915/intel_pipe_crc.c | 4 +- drivers/gpu/drm/i915/intel_psr.c | 4 +- 10 files changed, 87 insertions(+), 92 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -3603,7 +3603,7 @@ static int i915_dp_mst_info(struct seq_file *m, void *unused)continue ;seq_printf (m,"MST Source Port %c\n" , -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port));drm_dp_mst_dump_topology (m, &intel_dig_port->dp.mst_mgr); }drm_connector_list_iter_end (&conn_iter);drivers/gpu/drm/i915/intel_ddi.c +6
-7@@ -1801,8 +1801,8 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, int level, enum intel_output_type type) {struct intel_digital_port *intel_dig_port =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev); -enum port port = intel_dig_port->port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port;uint8_t iboost;if (type ==INTEL_OUTPUT_HDMI )@@ -2470,7 +2470,7 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;uint32_t val;bool wait = false;@@ -2698,7 +2698,7 @@ static struct intel_connector * intel_ddi_init_dp_connector(struct intel_digital_port *intel_dig_port) {struct intel_connector *connector; -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port; connector =intel_connector_alloc ();if (!connector)@@ -2717,7 +2717,7 @@ static struct intel_connector * intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port) {struct intel_connector *connector; -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port; connector =intel_connector_alloc ();if (!connector)@@ -2733,7 +2733,7 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dport) {struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); -if (dport->port !=PORT_A ) +if (dport->base.port !=PORT_A )return false;if (dport->saved_port_bits &DDI_A_4_LANES )@@ -2836,7 +2836,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) intel_encoder->suspend = intel_dp_encoder_suspend; intel_encoder->get_power_domains = intel_ddi_get_power_domains; - intel_dig_port->port = port; intel_dig_port->saved_port_bits =I915_READ (DDI_BUF_CTL (port)) & (DDI_BUF_PORT_REVERSAL |DDI_A_4_LANES );drivers/gpu/drm/i915/intel_display.c +7
-6@@ -1703,7 +1703,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,u32 port_mask;i915_reg_t dpll_reg; -switch (dport->port) { +switch (dport->base.port) {case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; dpll_reg =DPLL (0 );@@ -1725,7 +1725,8 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, dpll_reg, port_mask, expected_mask, 1000))WARN (1 ,"timed out waiting for port %c ready: got 0x%x, expected 0x%x\n" , -port_name (dport->port),I915_READ (dpll_reg) & port_mask, expected_mask); +port_name (dport->base.port), +I915_READ (dpll_reg) & port_mask, expected_mask); } static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv,@@ -4482,7 +4483,7 @@ intel_trans_dp_port_sel(struct intel_crtc *crtc)for_each_encoder_on_crtc (dev, &crtc->base, encoder) {if (encoder->type ==INTEL_OUTPUT_DP || encoder->type ==INTEL_OUTPUT_EDP ) -return enc_to_dig_port (&encoder->base)->port; +return encoder->port; }return -1 ;@@ -7633,7 +7634,7 @@ static void ironlake_init_pch_refclk(struct drm_i915_private *dev_priv)break ;case INTEL_OUTPUT_EDP : has_panel = true; -if (enc_to_dig_port (&encoder->base)->port ==PORT_A ) +if (encoder->port ==PORT_A ) has_cpu_edp = true;break ;default :@@ -10756,7 +10757,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)case INTEL_OUTPUT_DP :case INTEL_OUTPUT_HDMI :case INTEL_OUTPUT_EDP : - port_mask =1 <<enc_to_dig_port (&encoder->base)->port; + port_mask =1 << encoder->port;/* the same port mustn't appear more than once */ if (used_ports & port_mask)@@ -10766,7 +10767,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)break ;case INTEL_OUTPUT_DP_MST : used_mst_ports |= -1 <<enc_to_mst (&encoder->base)->primary->port; +1 << encoder->port;break ;default :break ;drivers/gpu/drm/i915/intel_dp.c +9
-9@@ -223,7 +223,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev); -enum port port = dig_port->port; +enum port port = dig_port->base.port;const int *source_rates;int size;u32 voltage;@@ -479,11 +479,11 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)if (WARN (I915_READ (intel_dp->output_reg) &DP_PORT_EN ,"skipping pipe %c power seqeuncer kick due to port %c being active\n" , -pipe_name (pipe),port_name (intel_dig_port->port))) +pipe_name (pipe),port_name (intel_dig_port->base.port)))return ;DRM_DEBUG_KMS ("kicking pipe %c power sequencer for port %c\n" , -pipe_name (pipe),port_name (intel_dig_port->port)); +pipe_name (pipe),port_name (intel_dig_port->base.port));/* Preserve the BIOS-computed detected bit. This is * supposed to be read-only. @@ -610,7 +610,7 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp)DRM_DEBUG_KMS ("picked pipe %c power sequencer for port %c\n" ,pipe_name (intel_dp->pps_pipe), -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port));/* init power sequencer on this pipe and port */ intel_dp_init_panel_power_sequencer (dev, intel_dp);@@ -706,7 +706,7 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;lockdep_assert_held (&dev_priv->pps_mutex);@@ -966,7 +966,7 @@ static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index)* like to run at 2MHz. So, take the cdclk or PCH rawclk value and * divide by 2000 and use that */ -if (intel_dig_port->port ==PORT_A ) +if (intel_dig_port->base.port ==PORT_A )return DIV_ROUND_CLOSEST (dev_priv->cdclk.hw.cdclk,2000 );else return DIV_ROUND_CLOSEST (dev_priv->rawclk_freq,2000 );@@ -977,7 +977,7 @@ static uint32_t hsw_get_aux_clock_divider(struct intel_dp *intel_dp, int index)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev); -if (intel_dig_port->port !=PORT_A &&HAS_PCH_LPT_H (dev_priv)) { +if (intel_dig_port->base.port !=PORT_A &&HAS_PCH_LPT_H (dev_priv)) {/* Workaround for non-ULT HSW */ switch (index) {case 0 :return 63 ;@@ -1447,7 +1447,7 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp) {struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));enum port port =intel_aux_port (dev_priv, -dp_to_dig_port (intel_dp)->port); +dp_to_dig_port (intel_dp)->base.port);int i; intel_dp->aux_ch_ctl_reg =intel_aux_ctl_reg (dev_priv, port);@@ -1465,7 +1465,7 @@ static void intel_dp_aux_init(struct intel_dp *intel_dp) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;intel_aux_reg_init (intel_dp);drm_dp_aux_init (&intel_dp->aux);
drivers/gpu/drm/i915/intel_dp.c intel_dp_compute_config(struct intel_encoder *encoder, · line 1638
Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -1635,7 +1635,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;
encoder->port
drivers/gpu/drm/i915/intel_dp.c static void intel_dp_prepare(struct intel_encoder *encoder, · line 1862
Quoted 9 lines
drivers/gpu/drm/i915/intel_dp.c +1
-1struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc);struct intel_connector *intel_connector = intel_dp->attached_connector; struct intel_digital_connector_state *intel_conn_state =@@ -1859,7 +1859,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;
Same here.
Quoted 540 lines
drivers/gpu/drm/i915/intel_dp.c +40
-41struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;@@ -2074,7 +2074,7 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)intel_display_power_get (dev_priv, intel_dp->aux_power_domain);DRM_DEBUG_KMS ("Turning eDP port %c VDD on\n" , -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port));if (!edp_have_panel_power (intel_dp))wait_panel_power_cycle (intel_dp);@@ -2094,7 +2094,7 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)*/ if (!edp_have_panel_power (intel_dp)) {DRM_DEBUG_KMS ("eDP port %c panel power wasn't enabled\n" , -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port));msleep (intel_dp->panel_power_up_delay); }@@ -2120,7 +2120,7 @@ void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)pps_unlock (intel_dp);I915_STATE_WARN (!vdd,"eDP port %c VDD already requested on\n" , -port_name (dp_to_dig_port (intel_dp)->port)); +port_name (dp_to_dig_port (intel_dp)->base.port)); }static void edp_panel_vdd_off_sync (struct intel_dp *intel_dp)@@ -2140,7 +2140,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)return ;DRM_DEBUG_KMS ("Turning eDP port %c VDD off\n" , -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port)); pp =ironlake_get_pp_control (intel_dp); pp &= ~EDP_FORCE_VDD ;@@ -2200,7 +2200,7 @@ static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)return ;I915_STATE_WARN (!intel_dp->want_panel_vdd,"eDP port %c VDD not forced on" , -port_name (dp_to_dig_port (intel_dp)->port)); +port_name (dp_to_dig_port (intel_dp)->base.port)); intel_dp->want_panel_vdd = false;@@ -2223,11 +2223,11 @@ static void edp_panel_on(struct intel_dp *intel_dp)return ;DRM_DEBUG_KMS ("Turn eDP port %c panel power on\n" , -port_name (dp_to_dig_port (intel_dp)->port)); +port_name (dp_to_dig_port (intel_dp)->base.port));if (WARN (edp_have_panel_power (intel_dp),"eDP port %c panel power already on\n" , -port_name (dp_to_dig_port (intel_dp)->port))) +port_name (dp_to_dig_port (intel_dp)->base.port)))return ;wait_panel_power_cycle (intel_dp);@@ -2282,10 +2282,10 @@ static void edp_panel_off(struct intel_dp *intel_dp)return ;DRM_DEBUG_KMS ("Turn eDP port %c panel power off\n" , -port_name (dp_to_dig_port (intel_dp)->port)); +port_name (dp_to_dig_port (intel_dp)->base.port));WARN (!intel_dp->want_panel_vdd,"Need eDP port %c VDD to turn off panel\n" , -port_name (dp_to_dig_port (intel_dp)->port)); +port_name (dp_to_dig_port (intel_dp)->base.port)); pp =ironlake_get_pp_control (intel_dp);/* We need to switch off panel power _and_ force vdd, for otherwise some @@ -2437,7 +2437,7 @@ static void assert_dp_port(struct intel_dp *intel_dp, bool state)I915_STATE_WARN (cur_state != state,"DP port %c state assertion failure (expected %s, current %s)\n" , -port_name (dig_port->port), +port_name (dig_port->base.port),onoff (state),onoff (cur_state)); }#define assert_dp_port_disabled (d) assert_dp_port((d), false)@@ -2570,7 +2570,7 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe) {struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);u32 tmp;@@ -2625,7 +2625,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,u32 tmp, flags =0 ;struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);if (encoder->type ==INTEL_OUTPUT_EDP )@@ -2794,7 +2794,7 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp,struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;if (dp_train_pat &DP_TRAINING_PATTERN_MASK ) DRM_DEBUG_KMS("Using DP training pattern TPS%d\n",@@ -2969,7 +2969,7 @@ static void g4x_pre_enable_dp(struct intel_encoder *encoder, const struct drm_connector_state *conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;intel_dp_prepare (encoder, pipe_config);@@ -3002,7 +3002,7 @@ static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)* from a port. */ DRM_DEBUG_KMS ("detaching pipe %c power sequencer from port %c\n" , -pipe_name (pipe),port_name (intel_dig_port->port)); +pipe_name (pipe),port_name (intel_dig_port->base.port));I915_WRITE (pp_on_reg,0 );POSTING_READ (pp_on_reg);@@ -3026,7 +3026,7 @@ static void vlv_steal_power_sequencer(struct drm_device *dev,continue ; intel_dp =enc_to_intel_dp (&encoder->base); - port =dp_to_dig_port (intel_dp)->port; + port =dp_to_dig_port (intel_dp)->base.port; WARN(intel_dp->active_pipe == pipe, "stealing pipe %c power sequencer from active (e)DP port %c\n",@@ -3178,7 +3178,7 @@ uint8_t intel_dp_voltage_max(struct intel_dp *intel_dp) {struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp)); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;if (INTEL_GEN (dev_priv) >=9 ) {struct intel_encoder *encoder = &dp_to_dig_port (intel_dp)->base;@@ -3197,7 +3197,7 @@ uint8_t intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing) {struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp)); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;if (INTEL_GEN (dev_priv) >=9 ) {switch (voltage_swing &DP_TRAIN_VOLTAGE_SWING_MASK ) {@@ -3531,7 +3531,7 @@ void intel_dp_set_signal_levels(struct intel_dp *intel_dp) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t signal_levels, mask =0 ;@@ -3591,7 +3591,7 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;uint32_t val;if (!HAS_DDI (dev_priv))@@ -4490,7 +4490,7 @@ static bool ibx_digital_port_connected(struct drm_i915_private *dev_priv, {u32 bit; -switch (port->port) { +switch (port->base.port) {case PORT_B : bit =SDE_PORTB_HOTPLUG ;break ;@@ -4501,7 +4501,7 @@ static bool ibx_digital_port_connected(struct drm_i915_private *dev_priv, bit =SDE_PORTD_HOTPLUG ;break ;default : -MISSING_CASE (port->port); +MISSING_CASE (port->base.port);return false; }@@ -4513,7 +4513,7 @@ static bool cpt_digital_port_connected(struct drm_i915_private *dev_priv, {u32 bit; -switch (port->port) { +switch (port->base.port) {case PORT_B : bit =SDE_PORTB_HOTPLUG_CPT ;break ;@@ -4524,7 +4524,7 @@ static bool cpt_digital_port_connected(struct drm_i915_private *dev_priv, bit =SDE_PORTD_HOTPLUG_CPT ;break ;default : -MISSING_CASE (port->port); +MISSING_CASE (port->base.port);return false; }@@ -4536,7 +4536,7 @@ static bool spt_digital_port_connected(struct drm_i915_private *dev_priv, {u32 bit; -switch (port->port) { +switch (port->base.port) {case PORT_A : bit =SDE_PORTA_HOTPLUG_SPT ;break ;@@ -4555,7 +4555,7 @@ static bool g4x_digital_port_connected(struct drm_i915_private *dev_priv, {u32 bit; -switch (port->port) { +switch (port->base.port) {case PORT_B : bit =PORTB_HOTPLUG_LIVE_STATUS_G4X ;break ;@@ -4566,7 +4566,7 @@ static bool g4x_digital_port_connected(struct drm_i915_private *dev_priv, bit =PORTD_HOTPLUG_LIVE_STATUS_G4X ;break ;default : -MISSING_CASE (port->port); +MISSING_CASE (port->base.port);return false; }@@ -4578,7 +4578,7 @@ static bool gm45_digital_port_connected(struct drm_i915_private *dev_priv, {u32 bit; -switch (port->port) { +switch (port->base.port) {case PORT_B : bit =PORTB_HOTPLUG_LIVE_STATUS_GM45 ;break ;@@ -4589,7 +4589,7 @@ static bool gm45_digital_port_connected(struct drm_i915_private *dev_priv, bit =PORTD_HOTPLUG_LIVE_STATUS_GM45 ;break ;default : -MISSING_CASE (port->port); +MISSING_CASE (port->base.port);return false; }@@ -4599,7 +4599,7 @@ static bool gm45_digital_port_connected(struct drm_i915_private *dev_priv,static bool ilk_digital_port_connected (struct drm_i915_private *dev_priv,struct intel_digital_port *port) { -if (port->port ==PORT_A ) +if (port->base.port ==PORT_A )return I915_READ (DEISR ) &DE_DP_A_HOTPLUG ;else return ibx_digital_port_connected (dev_priv, port);@@ -4608,7 +4608,7 @@ static bool ilk_digital_port_connected(struct drm_i915_private *dev_priv,static bool snb_digital_port_connected (struct drm_i915_private *dev_priv,struct intel_digital_port *port) { -if (port->port ==PORT_A ) +if (port->base.port ==PORT_A )return I915_READ (DEISR ) &DE_DP_A_HOTPLUG ;else return cpt_digital_port_connected (dev_priv, port);@@ -4617,7 +4617,7 @@ static bool snb_digital_port_connected(struct drm_i915_private *dev_priv,static bool ivb_digital_port_connected (struct drm_i915_private *dev_priv,struct intel_digital_port *port) { -if (port->port ==PORT_A ) +if (port->base.port ==PORT_A )return I915_READ (DEISR ) &DE_DP_A_HOTPLUG_IVB ;else return cpt_digital_port_connected (dev_priv, port);@@ -4626,7 +4626,7 @@ static bool ivb_digital_port_connected(struct drm_i915_private *dev_priv,static bool bdw_digital_port_connected (struct drm_i915_private *dev_priv,struct intel_digital_port *port) { -if (port->port ==PORT_A ) +if (port->base.port ==PORT_A )return I915_READ (GEN8_DE_PORT_ISR ) &GEN8_PORT_DP_A_HOTPLUG ;else return cpt_digital_port_connected (dev_priv, port);@@ -5109,12 +5109,12 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)* "vdd off -> long hpd -> vdd on -> detect -> vdd off -> ..." */ DRM_DEBUG_KMS ("ignoring long hpd on eDP port %c\n" , -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port));return IRQ_HANDLED ; }DRM_DEBUG_KMS ("got hpd irq on port %c - %s\n" , -port_name (intel_dig_port->port), +port_name (intel_dig_port->base.port), long_hpd ?"long" :"short" );if (long_hpd) {@@ -5364,7 +5364,7 @@ intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev,u32 pp_on, pp_off, pp_div, port_sel =0 ;int div = dev_priv->rawclk_freq /1000 ;struct pps_registers regs; -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;const struct edp_power_seq *seq = &intel_dp->pps_delays;lockdep_assert_held (&dev_priv->pps_mutex);@@ -5965,9 +5965,9 @@ intel_dp_init_connector_port_info(struct intel_digital_port *intel_dig_port)struct intel_encoder *encoder = &intel_dig_port->base;struct intel_dp *intel_dp = &intel_dig_port->dp; - encoder->hpd_pin =intel_hpd_pin (intel_dig_port->port); + encoder->hpd_pin =intel_hpd_pin (encoder->port); -switch (intel_dig_port->port) { +switch (encoder->port) {case PORT_A : intel_dp->aux_power_domain =POWER_DOMAIN_AUX_A ;break ;@@ -5985,7 +5985,7 @@ intel_dp_init_connector_port_info(struct intel_digital_port *intel_dig_port) intel_dp->aux_power_domain =POWER_DOMAIN_AUX_D ;break ;default : -MISSING_CASE (intel_dig_port->port); +MISSING_CASE (encoder->port); } }@@ -6021,7 +6021,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,struct intel_encoder *intel_encoder = &intel_dig_port->base;struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->port;int type;/* Initialize the work for modeset in case of link train failure */ @@ -6191,7 +6191,6 @@ bool intel_dp_init(struct drm_i915_private *dev_priv, intel_encoder->disable = g4x_disable_dp; } - intel_dig_port->port = port; intel_dig_port->dp.output_reg = output_reg; intel_dig_port->max_lanes =4 ;drivers/gpu/drm/i915/intel_dp_mst.c +3
-3@@ -209,7 +209,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp;struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;struct intel_connector *connector =to_intel_connector (conn_state->connector);int ret;@@ -253,7 +253,7 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder,struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp;struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;int ret;DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links);@@ -552,7 +552,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum intel_encoder->type =INTEL_OUTPUT_DP_MST ; intel_encoder->power_domain = intel_dig_port->base.power_domain; - intel_encoder->port = intel_dig_port->port; + intel_encoder->port = intel_dig_port->base.port; intel_encoder->crtc_mask =0x7 ; intel_encoder->cloneable =0 ;drivers/gpu/drm/i915/intel_dpio_phy.c +5
-7@@ -586,9 +586,8 @@ bxt_ddi_phy_calc_lane_lat_optim_mask(uint8_t lane_count)void bxt_ddi_phy_set_lane_optim_mask (struct intel_encoder *encoder,uint8_t lane_lat_optim_mask) { -struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); -enum port port = dport->port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port;enum dpio_phy phy;enum dpio_channel ch;int lane;@@ -613,9 +612,8 @@ void bxt_ddi_phy_set_lane_optim_mask(struct intel_encoder *encoder,uint8_t bxt_ddi_phy_get_lane_lat_optim_mask (struct intel_encoder *encoder) { -struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); -enum port port = dport->port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port;enum dpio_phy phy;enum dpio_channel ch;int lane;@@ -641,7 +639,7 @@ void chv_set_phy_signal_level(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct intel_crtc *intel_crtc =to_intel_crtc (dport->base.base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);enum dpio_channel ch =vlv_dport_to_channel (dport);enum pipe pipe = intel_crtc->pipe;u32 val;drivers/gpu/drm/i915/intel_drv.h +2
-3@@ -1056,7 +1056,6 @@ struct intel_lspcon {struct intel_digital_port {struct intel_encoder base; -enum port port;u32 saved_port_bits;struct intel_dp dp;struct intel_hdmi hdmi;@@ -1088,7 +1087,7 @@ struct intel_dp_mst_encoder {static inline enum dpio_channel vlv_dport_to_channel (struct intel_digital_port *dport) { -switch (dport->port) { +switch (dport->base.port) {case PORT_B :case PORT_D :return DPIO_CH0 ;@@ -1102,7 +1101,7 @@ vlv_dport_to_channel(struct intel_digital_port *dport)static inline enum dpio_phy vlv_dport_to_phy (struct intel_digital_port *dport) { -switch (dport->port) { +switch (dport->base.port) {case PORT_B :case PORT_C :return DPIO_PHY0 ;drivers/gpu/drm/i915/intel_hdmi.c +8
-9@@ -186,7 +186,7 @@ static bool g4x_infoframe_enabled(struct drm_encoder *encoder,if ((val &VIDEO_DIP_ENABLE ) ==0 )return false; -if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->port)) +if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->base.port))return false; return val & (VIDEO_DIP_ENABLE_AVI |@@ -245,7 +245,7 @@ static bool ibx_infoframe_enabled(struct drm_encoder *encoder,if ((val &VIDEO_DIP_ENABLE ) ==0 )return false; -if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->port)) +if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->base.port))return false; return val & (VIDEO_DIP_ENABLE_AVI |@@ -362,7 +362,7 @@ static bool vlv_infoframe_enabled(struct drm_encoder *encoder,if ((val &VIDEO_DIP_ENABLE ) ==0 )return false; -if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->port)) +if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->base.port))return false; return val & (VIDEO_DIP_ENABLE_AVI |@@ -535,7 +535,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;i915_reg_t reg =VIDEO_DIP_CTL ;u32 val =I915_READ (reg); -u32 port =VIDEO_DIP_PORT (intel_dig_port->port); +u32 port =VIDEO_DIP_PORT (intel_dig_port->base.port);assert_hdmi_port_disabled (intel_hdmi);@@ -686,7 +686,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;i915_reg_t reg =TVIDEO_DIP_CTL (intel_crtc->pipe);u32 val =I915_READ (reg); -u32 port =VIDEO_DIP_PORT (intel_dig_port->port); +u32 port =VIDEO_DIP_PORT (intel_dig_port->base.port);assert_hdmi_port_disabled (intel_hdmi);@@ -782,7 +782,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);i915_reg_t reg =VLV_TVIDEO_DIP_CTL (intel_crtc->pipe);u32 val =I915_READ (reg); -u32 port =VIDEO_DIP_PORT (intel_dig_port->port); +u32 port =VIDEO_DIP_PORT (intel_dig_port->base.port);assert_hdmi_port_disabled (intel_hdmi);@@ -1545,7 +1545,7 @@ intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector, bool has_edid) {struct drm_i915_private *dev_priv =to_i915 (connector->dev);struct intel_hdmi *hdmi =intel_attached_hdmi (connector); -enum port port =hdmi_to_dig_port (hdmi)->port; +enum port port =hdmi_to_dig_port (hdmi)->base.port;struct i2c_adapter *adapter =intel_gmbus_get_adapter (dev_priv, hdmi->ddc_bus);enum drm_dp_dual_mode_type type =drm_dp_dual_mode_detect (adapter);@@ -2015,7 +2015,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,struct intel_encoder *intel_encoder = &intel_dig_port->base;struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->port;DRM_DEBUG_KMS ("Adding HDMI connector on port %c\n" ,port_name (port));@@ -2135,7 +2135,6 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv,if (IS_G4X (dev_priv)) intel_encoder->cloneable |=1 <<INTEL_OUTPUT_HDMI ; - intel_dig_port->port = port; intel_dig_port->hdmi.hdmi_reg = hdmi_reg; intel_dig_port->dp.output_reg =INVALID_MMIO_REG ; intel_dig_port->max_lanes =4 ;drivers/gpu/drm/i915/intel_pipe_crc.c +0
-0
drivers/gpu/drm/i915/intel_pipe_crc.c static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv, · line 271
Quoted 3 lines
drivers/gpu/drm/i915/intel_pipe_crc.c +0
-0@@ -269,7 +269,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv,case INTEL_OUTPUT_DP :case INTEL_OUTPUT_EDP : dig_port =enc_to_dig_port (&encoder->base);
This can be eliminated.
Quoted 28 lines
drivers/gpu/drm/i915/intel_pipe_crc.c +2
-2-switch (dig_port->port) { +switch (dig_port->base.port) {case PORT_B : *source =INTEL_PIPE_CRC_SOURCE_DP_B ;break ;@@ -281,7 +281,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv,break ;default :WARN (1 ,"nonexisting DP port %c\n" , -port_name (dig_port->port)); +port_name (dig_port->base.port));break ; }break ;drivers/gpu/drm/i915/intel_psr.c +1
-1@@ -163,7 +163,7 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) [3] = 1 - 1, [4] = DP_SET_POWER_D0, }; -enum port port = dig_port->port; +enum port port = dig_port->base.port;u32 aux_ctl;int i;
drivers/gpu/drm/i915/intel_psr.c void intel_psr_compute_config(struct intel_dp *intel_dp, · line 382
Quoted 8 lines
drivers/gpu/drm/i915/intel_psr.c +1
-1@@ -376,7 +376,7 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,* ones. Since by Display design transcoder EDP is tied to port A * we can safely escape based on the port A. */ -if (HAS_DDI (dev_priv) && dig_port->port !=PORT_A ) { +if (HAS_DDI (dev_priv) && dig_port->base.port !=PORT_A ) {DRM_DEBUG_KMS ("PSR condition failed: Port not supported\n" );return ; }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/10] drm/i915: Nuke intel_digital_port->port
Quoted 102 lines · Dhinakaran
Quoted 91 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Remove
intel_digital_port->portand replace its users withintel_encoder->port.intel_encoder->portis a superset ofintel_digital_port->port, and it works correctly even for MST encoders.Performed with cocci:
@@
@@struct intel_digital_port { ... - enum port port; ... }@@
structintel_digital_port*D;
expression E;
@@
-D->port= E;@@
structintel_digital_port*D;
@@
-D->port
+D->base.port@@
expression E;
@@
(
- dp_to_dig_port(E)->port
+ dp_to_dig_port(E)->base.port
|
- enc_to_dig_port(E)->port
+ to_intel_encoder(E)->port
)@@
expression E;
@@
-to_intel_encoder(&E->base)
+ E@@
structintel_digital_port*D;
identifier I, M;
@@
I =&D->base
<...
(
-D->base.M
+I->M
|
-&D->base
+ I
)
...>@@
identifier D;
expression E;
identifier M;
@@
D =enc_to_dig_port(&E->base)
<...
(
-D->base.M
+E->M
|
-&D->base
+ E
)
...>@@
expression E;
identifier M;
@@
(
- enc_to_dig_port(&E->base)->base.M
+E->M
|
- enc_to_dig_port(&E->base)->base
+ E
|
- enc_to_mst(&E->base)->primary->base.port
+E->port
)Quoted 7 lines
@@
expression E;
identifier D;
@@
- structintel_digital_port*D = E;
... when != D
Quoted 3 lines
The script has ended up creating
intel_dig_port->base.portdereferences in some places whereencoder->portwas possible, but has worked pretty well otherwise.
I guess I missed some pattern in the cleanup. Hmm. I wonder if that entire thing could be simplified a bit. I'll give it another try.
Quoted 827 lines
Quoted 228 lines
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 13 ++--- drivers/gpu/drm/i915/intel_display.c | 13 +++-- drivers/gpu/drm/i915/intel_dp.c | 103 +++++++++++++++++----------------- drivers/gpu/drm/i915/intel_dp_mst.c | 6 +- drivers/gpu/drm/i915/intel_dpio_phy.c | 12 ++-- drivers/gpu/drm/i915/intel_drv.h | 5 +- drivers/gpu/drm/i915/intel_hdmi.c | 17 +++--- drivers/gpu/drm/i915/intel_pipe_crc.c | 4 +- drivers/gpu/drm/i915/intel_psr.c | 4 +- 10 files changed, 87 insertions(+), 92 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -3603,7 +3603,7 @@ static int i915_dp_mst_info(struct seq_file *m, void *unused)continue ;seq_printf (m,"MST Source Port %c\n" , -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port));drm_dp_mst_dump_topology (m, &intel_dig_port->dp.mst_mgr); }drm_connector_list_iter_end (&conn_iter);drivers/gpu/drm/i915/intel_ddi.c +6
-7@@ -1801,8 +1801,8 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, int level, enum intel_output_type type) {struct intel_digital_port *intel_dig_port =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev); -enum port port = intel_dig_port->port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port;uint8_t iboost;if (type ==INTEL_OUTPUT_HDMI )@@ -2470,7 +2470,7 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;uint32_t val;bool wait = false;@@ -2698,7 +2698,7 @@ static struct intel_connector * intel_ddi_init_dp_connector(struct intel_digital_port *intel_dig_port) {struct intel_connector *connector; -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port; connector =intel_connector_alloc ();if (!connector)@@ -2717,7 +2717,7 @@ static struct intel_connector * intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port) {struct intel_connector *connector; -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port; connector =intel_connector_alloc ();if (!connector)@@ -2733,7 +2733,7 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dport) {struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); -if (dport->port !=PORT_A ) +if (dport->base.port !=PORT_A )return false;if (dport->saved_port_bits &DDI_A_4_LANES )@@ -2836,7 +2836,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) intel_encoder->suspend = intel_dp_encoder_suspend; intel_encoder->get_power_domains = intel_ddi_get_power_domains; - intel_dig_port->port = port; intel_dig_port->saved_port_bits =I915_READ (DDI_BUF_CTL (port)) & (DDI_BUF_PORT_REVERSAL |DDI_A_4_LANES );drivers/gpu/drm/i915/intel_display.c +7
-6@@ -1703,7 +1703,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,u32 port_mask;i915_reg_t dpll_reg; -switch (dport->port) { +switch (dport->base.port) {case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; dpll_reg =DPLL (0 );@@ -1725,7 +1725,8 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, dpll_reg, port_mask, expected_mask, 1000))WARN (1 ,"timed out waiting for port %c ready: got 0x%x, expected 0x%x\n" , -port_name (dport->port),I915_READ (dpll_reg) & port_mask, expected_mask); +port_name (dport->base.port), +I915_READ (dpll_reg) & port_mask, expected_mask); } static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv,@@ -4482,7 +4483,7 @@ intel_trans_dp_port_sel(struct intel_crtc *crtc)for_each_encoder_on_crtc (dev, &crtc->base, encoder) {if (encoder->type ==INTEL_OUTPUT_DP || encoder->type ==INTEL_OUTPUT_EDP ) -return enc_to_dig_port (&encoder->base)->port; +return encoder->port; }return -1 ;@@ -7633,7 +7634,7 @@ static void ironlake_init_pch_refclk(struct drm_i915_private *dev_priv)break ;case INTEL_OUTPUT_EDP : has_panel = true; -if (enc_to_dig_port (&encoder->base)->port ==PORT_A ) +if (encoder->port ==PORT_A ) has_cpu_edp = true;break ;default :@@ -10756,7 +10757,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)case INTEL_OUTPUT_DP :case INTEL_OUTPUT_HDMI :case INTEL_OUTPUT_EDP : - port_mask =1 <<enc_to_dig_port (&encoder->base)->port; + port_mask =1 << encoder->port;/* the same port mustn't appear more than once */ if (used_ports & port_mask)@@ -10766,7 +10767,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)break ;case INTEL_OUTPUT_DP_MST : used_mst_ports |= -1 <<enc_to_mst (&encoder->base)->primary->port; +1 << encoder->port;break ;default :break ;drivers/gpu/drm/i915/intel_dp.c +9
-9@@ -223,7 +223,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev); -enum port port = dig_port->port; +enum port port = dig_port->base.port;const int *source_rates;int size;u32 voltage;@@ -479,11 +479,11 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)if (WARN (I915_READ (intel_dp->output_reg) &DP_PORT_EN ,"skipping pipe %c power seqeuncer kick due to port %c being active\n" , -pipe_name (pipe),port_name (intel_dig_port->port))) +pipe_name (pipe),port_name (intel_dig_port->base.port)))return ;DRM_DEBUG_KMS ("kicking pipe %c power sequencer for port %c\n" , -pipe_name (pipe),port_name (intel_dig_port->port)); +pipe_name (pipe),port_name (intel_dig_port->base.port));/* Preserve the BIOS-computed detected bit. This is * supposed to be read-only. @@ -610,7 +610,7 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp)DRM_DEBUG_KMS ("picked pipe %c power sequencer for port %c\n" ,pipe_name (intel_dp->pps_pipe), -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port));/* init power sequencer on this pipe and port */ intel_dp_init_panel_power_sequencer (dev, intel_dp);@@ -706,7 +706,7 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;lockdep_assert_held (&dev_priv->pps_mutex);@@ -966,7 +966,7 @@ static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index)* like to run at 2MHz. So, take the cdclk or PCH rawclk value and * divide by 2000 and use that */ -if (intel_dig_port->port ==PORT_A ) +if (intel_dig_port->base.port ==PORT_A )return DIV_ROUND_CLOSEST (dev_priv->cdclk.hw.cdclk,2000 );else return DIV_ROUND_CLOSEST (dev_priv->rawclk_freq,2000 );@@ -977,7 +977,7 @@ static uint32_t hsw_get_aux_clock_divider(struct intel_dp *intel_dp, int index)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev); -if (intel_dig_port->port !=PORT_A &&HAS_PCH_LPT_H (dev_priv)) { +if (intel_dig_port->base.port !=PORT_A &&HAS_PCH_LPT_H (dev_priv)) {/* Workaround for non-ULT HSW */ switch (index) {case 0 :return 63 ;@@ -1447,7 +1447,7 @@ static void intel_aux_reg_init(struct intel_dp *intel_dp) {struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));enum port port =intel_aux_port (dev_priv, -dp_to_dig_port (intel_dp)->port); +dp_to_dig_port (intel_dp)->base.port);int i; intel_dp->aux_ch_ctl_reg =intel_aux_ctl_reg (dev_priv, port);@@ -1465,7 +1465,7 @@ static void intel_dp_aux_init(struct intel_dp *intel_dp) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;intel_aux_reg_init (intel_dp);drm_dp_aux_init (&intel_dp->aux);drivers/gpu/drm/i915/intel_dp.c intel_dp_compute_config(struct intel_encoder *encoder, · line 1638
Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -1635,7 +1635,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;
encoder->portdrivers/gpu/drm/i915/intel_dp.c static void intel_dp_prepare(struct intel_encoder *encoder, · line 1862
Quoted 9 lines
drivers/gpu/drm/i915/intel_dp.c +1
-1struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc);struct intel_connector *intel_connector = intel_dp->attached_connector; struct intel_digital_connector_state *intel_conn_state =@@ -1859,7 +1859,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;Same here.
Quoted 540 lines
drivers/gpu/drm/i915/intel_dp.c +40
-41struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;@@ -2074,7 +2074,7 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)intel_display_power_get (dev_priv, intel_dp->aux_power_domain);DRM_DEBUG_KMS ("Turning eDP port %c VDD on\n" , -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port));if (!edp_have_panel_power (intel_dp))wait_panel_power_cycle (intel_dp);@@ -2094,7 +2094,7 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp)*/ if (!edp_have_panel_power (intel_dp)) {DRM_DEBUG_KMS ("eDP port %c panel power wasn't enabled\n" , -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port));msleep (intel_dp->panel_power_up_delay); }@@ -2120,7 +2120,7 @@ void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)pps_unlock (intel_dp);I915_STATE_WARN (!vdd,"eDP port %c VDD already requested on\n" , -port_name (dp_to_dig_port (intel_dp)->port)); +port_name (dp_to_dig_port (intel_dp)->base.port)); }static void edp_panel_vdd_off_sync (struct intel_dp *intel_dp)@@ -2140,7 +2140,7 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp)return ;DRM_DEBUG_KMS ("Turning eDP port %c VDD off\n" , -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port)); pp =ironlake_get_pp_control (intel_dp); pp &= ~EDP_FORCE_VDD ;@@ -2200,7 +2200,7 @@ static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)return ;I915_STATE_WARN (!intel_dp->want_panel_vdd,"eDP port %c VDD not forced on" , -port_name (dp_to_dig_port (intel_dp)->port)); +port_name (dp_to_dig_port (intel_dp)->base.port)); intel_dp->want_panel_vdd = false;@@ -2223,11 +2223,11 @@ static void edp_panel_on(struct intel_dp *intel_dp)return ;DRM_DEBUG_KMS ("Turn eDP port %c panel power on\n" , -port_name (dp_to_dig_port (intel_dp)->port)); +port_name (dp_to_dig_port (intel_dp)->base.port));if (WARN (edp_have_panel_power (intel_dp),"eDP port %c panel power already on\n" , -port_name (dp_to_dig_port (intel_dp)->port))) +port_name (dp_to_dig_port (intel_dp)->base.port)))return ;wait_panel_power_cycle (intel_dp);@@ -2282,10 +2282,10 @@ static void edp_panel_off(struct intel_dp *intel_dp)return ;DRM_DEBUG_KMS ("Turn eDP port %c panel power off\n" , -port_name (dp_to_dig_port (intel_dp)->port)); +port_name (dp_to_dig_port (intel_dp)->base.port));WARN (!intel_dp->want_panel_vdd,"Need eDP port %c VDD to turn off panel\n" , -port_name (dp_to_dig_port (intel_dp)->port)); +port_name (dp_to_dig_port (intel_dp)->base.port)); pp =ironlake_get_pp_control (intel_dp);/* We need to switch off panel power _and_ force vdd, for otherwise some @@ -2437,7 +2437,7 @@ static void assert_dp_port(struct intel_dp *intel_dp, bool state)I915_STATE_WARN (cur_state != state,"DP port %c state assertion failure (expected %s, current %s)\n" , -port_name (dig_port->port), +port_name (dig_port->base.port),onoff (state),onoff (cur_state)); }#define assert_dp_port_disabled (d) assert_dp_port((d), false)@@ -2570,7 +2570,7 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe) {struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);u32 tmp;@@ -2625,7 +2625,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,u32 tmp, flags =0 ;struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);if (encoder->type ==INTEL_OUTPUT_EDP )@@ -2794,7 +2794,7 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp,struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;if (dp_train_pat &DP_TRAINING_PATTERN_MASK ) DRM_DEBUG_KMS("Using DP training pattern TPS%d\n",@@ -2969,7 +2969,7 @@ static void g4x_pre_enable_dp(struct intel_encoder *encoder, const struct drm_connector_state *conn_state) {struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;intel_dp_prepare (encoder, pipe_config);@@ -3002,7 +3002,7 @@ static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)* from a port. */ DRM_DEBUG_KMS ("detaching pipe %c power sequencer from port %c\n" , -pipe_name (pipe),port_name (intel_dig_port->port)); +pipe_name (pipe),port_name (intel_dig_port->base.port));I915_WRITE (pp_on_reg,0 );POSTING_READ (pp_on_reg);@@ -3026,7 +3026,7 @@ static void vlv_steal_power_sequencer(struct drm_device *dev,continue ; intel_dp =enc_to_intel_dp (&encoder->base); - port =dp_to_dig_port (intel_dp)->port; + port =dp_to_dig_port (intel_dp)->base.port; WARN(intel_dp->active_pipe == pipe, "stealing pipe %c power sequencer from active (e)DP port %c\n",@@ -3178,7 +3178,7 @@ uint8_t intel_dp_voltage_max(struct intel_dp *intel_dp) {struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp)); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;if (INTEL_GEN (dev_priv) >=9 ) {struct intel_encoder *encoder = &dp_to_dig_port (intel_dp)->base;@@ -3197,7 +3197,7 @@ uint8_t intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing) {struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp)); -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;if (INTEL_GEN (dev_priv) >=9 ) {switch (voltage_swing &DP_TRAIN_VOLTAGE_SWING_MASK ) {@@ -3531,7 +3531,7 @@ void intel_dp_set_signal_levels(struct intel_dp *intel_dp) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t signal_levels, mask =0 ;@@ -3591,7 +3591,7 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_device *dev = intel_dig_port->base.base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;uint32_t val;if (!HAS_DDI (dev_priv))@@ -4490,7 +4490,7 @@ static bool ibx_digital_port_connected(struct drm_i915_private *dev_priv, {u32 bit; -switch (port->port) { +switch (port->base.port) {case PORT_B : bit =SDE_PORTB_HOTPLUG ;break ;@@ -4501,7 +4501,7 @@ static bool ibx_digital_port_connected(struct drm_i915_private *dev_priv, bit =SDE_PORTD_HOTPLUG ;break ;default : -MISSING_CASE (port->port); +MISSING_CASE (port->base.port);return false; }@@ -4513,7 +4513,7 @@ static bool cpt_digital_port_connected(struct drm_i915_private *dev_priv, {u32 bit; -switch (port->port) { +switch (port->base.port) {case PORT_B : bit =SDE_PORTB_HOTPLUG_CPT ;break ;@@ -4524,7 +4524,7 @@ static bool cpt_digital_port_connected(struct drm_i915_private *dev_priv, bit =SDE_PORTD_HOTPLUG_CPT ;break ;default : -MISSING_CASE (port->port); +MISSING_CASE (port->base.port);return false; }@@ -4536,7 +4536,7 @@ static bool spt_digital_port_connected(struct drm_i915_private *dev_priv, {u32 bit; -switch (port->port) { +switch (port->base.port) {case PORT_A : bit =SDE_PORTA_HOTPLUG_SPT ;break ;@@ -4555,7 +4555,7 @@ static bool g4x_digital_port_connected(struct drm_i915_private *dev_priv, {u32 bit; -switch (port->port) { +switch (port->base.port) {case PORT_B : bit =PORTB_HOTPLUG_LIVE_STATUS_G4X ;break ;@@ -4566,7 +4566,7 @@ static bool g4x_digital_port_connected(struct drm_i915_private *dev_priv, bit =PORTD_HOTPLUG_LIVE_STATUS_G4X ;break ;default : -MISSING_CASE (port->port); +MISSING_CASE (port->base.port);return false; }@@ -4578,7 +4578,7 @@ static bool gm45_digital_port_connected(struct drm_i915_private *dev_priv, {u32 bit; -switch (port->port) { +switch (port->base.port) {case PORT_B : bit =PORTB_HOTPLUG_LIVE_STATUS_GM45 ;break ;@@ -4589,7 +4589,7 @@ static bool gm45_digital_port_connected(struct drm_i915_private *dev_priv, bit =PORTD_HOTPLUG_LIVE_STATUS_GM45 ;break ;default : -MISSING_CASE (port->port); +MISSING_CASE (port->base.port);return false; }@@ -4599,7 +4599,7 @@ static bool gm45_digital_port_connected(struct drm_i915_private *dev_priv,static bool ilk_digital_port_connected (struct drm_i915_private *dev_priv,struct intel_digital_port *port) { -if (port->port ==PORT_A ) +if (port->base.port ==PORT_A )return I915_READ (DEISR ) &DE_DP_A_HOTPLUG ;else return ibx_digital_port_connected (dev_priv, port);@@ -4608,7 +4608,7 @@ static bool ilk_digital_port_connected(struct drm_i915_private *dev_priv,static bool snb_digital_port_connected (struct drm_i915_private *dev_priv,struct intel_digital_port *port) { -if (port->port ==PORT_A ) +if (port->base.port ==PORT_A )return I915_READ (DEISR ) &DE_DP_A_HOTPLUG ;else return cpt_digital_port_connected (dev_priv, port);@@ -4617,7 +4617,7 @@ static bool snb_digital_port_connected(struct drm_i915_private *dev_priv,static bool ivb_digital_port_connected (struct drm_i915_private *dev_priv,struct intel_digital_port *port) { -if (port->port ==PORT_A ) +if (port->base.port ==PORT_A )return I915_READ (DEISR ) &DE_DP_A_HOTPLUG_IVB ;else return cpt_digital_port_connected (dev_priv, port);@@ -4626,7 +4626,7 @@ static bool ivb_digital_port_connected(struct drm_i915_private *dev_priv,static bool bdw_digital_port_connected (struct drm_i915_private *dev_priv,struct intel_digital_port *port) { -if (port->port ==PORT_A ) +if (port->base.port ==PORT_A )return I915_READ (GEN8_DE_PORT_ISR ) &GEN8_PORT_DP_A_HOTPLUG ;else return cpt_digital_port_connected (dev_priv, port);@@ -5109,12 +5109,12 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)* "vdd off -> long hpd -> vdd on -> detect -> vdd off -> ..." */ DRM_DEBUG_KMS ("ignoring long hpd on eDP port %c\n" , -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port));return IRQ_HANDLED ; }DRM_DEBUG_KMS ("got hpd irq on port %c - %s\n" , -port_name (intel_dig_port->port), +port_name (intel_dig_port->base.port), long_hpd ?"long" :"short" );if (long_hpd) {@@ -5364,7 +5364,7 @@ intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev,u32 pp_on, pp_off, pp_div, port_sel =0 ;int div = dev_priv->rawclk_freq /1000 ;struct pps_registers regs; -enum port port =dp_to_dig_port (intel_dp)->port; +enum port port =dp_to_dig_port (intel_dp)->base.port;const struct edp_power_seq *seq = &intel_dp->pps_delays;lockdep_assert_held (&dev_priv->pps_mutex);@@ -5965,9 +5965,9 @@ intel_dp_init_connector_port_info(struct intel_digital_port *intel_dig_port)struct intel_encoder *encoder = &intel_dig_port->base;struct intel_dp *intel_dp = &intel_dig_port->dp; - encoder->hpd_pin =intel_hpd_pin (intel_dig_port->port); + encoder->hpd_pin =intel_hpd_pin (encoder->port); -switch (intel_dig_port->port) { +switch (encoder->port) {case PORT_A : intel_dp->aux_power_domain =POWER_DOMAIN_AUX_A ;break ;@@ -5985,7 +5985,7 @@ intel_dp_init_connector_port_info(struct intel_digital_port *intel_dig_port) intel_dp->aux_power_domain =POWER_DOMAIN_AUX_D ;break ;default : -MISSING_CASE (intel_dig_port->port); +MISSING_CASE (encoder->port); } }@@ -6021,7 +6021,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,struct intel_encoder *intel_encoder = &intel_dig_port->base;struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->port;int type;/* Initialize the work for modeset in case of link train failure */ @@ -6191,7 +6191,6 @@ bool intel_dp_init(struct drm_i915_private *dev_priv, intel_encoder->disable = g4x_disable_dp; } - intel_dig_port->port = port; intel_dig_port->dp.output_reg = output_reg; intel_dig_port->max_lanes =4 ;drivers/gpu/drm/i915/intel_dp_mst.c +3
-3@@ -209,7 +209,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp;struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;struct intel_connector *connector =to_intel_connector (conn_state->connector);int ret;@@ -253,7 +253,7 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder,struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp;struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;int ret;DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links);@@ -552,7 +552,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum intel_encoder->type =INTEL_OUTPUT_DP_MST ; intel_encoder->power_domain = intel_dig_port->base.power_domain; - intel_encoder->port = intel_dig_port->port; + intel_encoder->port = intel_dig_port->base.port; intel_encoder->crtc_mask =0x7 ; intel_encoder->cloneable =0 ;drivers/gpu/drm/i915/intel_dpio_phy.c +5
-7@@ -586,9 +586,8 @@ bxt_ddi_phy_calc_lane_lat_optim_mask(uint8_t lane_count)void bxt_ddi_phy_set_lane_optim_mask (struct intel_encoder *encoder,uint8_t lane_lat_optim_mask) { -struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); -enum port port = dport->port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port;enum dpio_phy phy;enum dpio_channel ch;int lane;@@ -613,9 +612,8 @@ void bxt_ddi_phy_set_lane_optim_mask(struct intel_encoder *encoder,uint8_t bxt_ddi_phy_get_lane_lat_optim_mask (struct intel_encoder *encoder) { -struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); -enum port port = dport->port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port;enum dpio_phy phy;enum dpio_channel ch;int lane;@@ -641,7 +639,7 @@ void chv_set_phy_signal_level(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct intel_crtc *intel_crtc =to_intel_crtc (dport->base.base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);enum dpio_channel ch =vlv_dport_to_channel (dport);enum pipe pipe = intel_crtc->pipe;u32 val;drivers/gpu/drm/i915/intel_drv.h +2
-3@@ -1056,7 +1056,6 @@ struct intel_lspcon {struct intel_digital_port {struct intel_encoder base; -enum port port;u32 saved_port_bits;struct intel_dp dp;struct intel_hdmi hdmi;@@ -1088,7 +1087,7 @@ struct intel_dp_mst_encoder {static inline enum dpio_channel vlv_dport_to_channel (struct intel_digital_port *dport) { -switch (dport->port) { +switch (dport->base.port) {case PORT_B :case PORT_D :return DPIO_CH0 ;@@ -1102,7 +1101,7 @@ vlv_dport_to_channel(struct intel_digital_port *dport)static inline enum dpio_phy vlv_dport_to_phy (struct intel_digital_port *dport) { -switch (dport->port) { +switch (dport->base.port) {case PORT_B :case PORT_C :return DPIO_PHY0 ;drivers/gpu/drm/i915/intel_hdmi.c +8
-9@@ -186,7 +186,7 @@ static bool g4x_infoframe_enabled(struct drm_encoder *encoder,if ((val &VIDEO_DIP_ENABLE ) ==0 )return false; -if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->port)) +if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->base.port))return false; return val & (VIDEO_DIP_ENABLE_AVI |@@ -245,7 +245,7 @@ static bool ibx_infoframe_enabled(struct drm_encoder *encoder,if ((val &VIDEO_DIP_ENABLE ) ==0 )return false; -if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->port)) +if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->base.port))return false; return val & (VIDEO_DIP_ENABLE_AVI |@@ -362,7 +362,7 @@ static bool vlv_infoframe_enabled(struct drm_encoder *encoder,if ((val &VIDEO_DIP_ENABLE ) ==0 )return false; -if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->port)) +if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->base.port))return false; return val & (VIDEO_DIP_ENABLE_AVI |@@ -535,7 +535,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;i915_reg_t reg =VIDEO_DIP_CTL ;u32 val =I915_READ (reg); -u32 port =VIDEO_DIP_PORT (intel_dig_port->port); +u32 port =VIDEO_DIP_PORT (intel_dig_port->base.port);assert_hdmi_port_disabled (intel_hdmi);@@ -686,7 +686,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;i915_reg_t reg =TVIDEO_DIP_CTL (intel_crtc->pipe);u32 val =I915_READ (reg); -u32 port =VIDEO_DIP_PORT (intel_dig_port->port); +u32 port =VIDEO_DIP_PORT (intel_dig_port->base.port);assert_hdmi_port_disabled (intel_hdmi);@@ -782,7 +782,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);i915_reg_t reg =VLV_TVIDEO_DIP_CTL (intel_crtc->pipe);u32 val =I915_READ (reg); -u32 port =VIDEO_DIP_PORT (intel_dig_port->port); +u32 port =VIDEO_DIP_PORT (intel_dig_port->base.port);assert_hdmi_port_disabled (intel_hdmi);@@ -1545,7 +1545,7 @@ intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector, bool has_edid) {struct drm_i915_private *dev_priv =to_i915 (connector->dev);struct intel_hdmi *hdmi =intel_attached_hdmi (connector); -enum port port =hdmi_to_dig_port (hdmi)->port; +enum port port =hdmi_to_dig_port (hdmi)->base.port;struct i2c_adapter *adapter =intel_gmbus_get_adapter (dev_priv, hdmi->ddc_bus);enum drm_dp_dual_mode_type type =drm_dp_dual_mode_detect (adapter);@@ -2015,7 +2015,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,struct intel_encoder *intel_encoder = &intel_dig_port->base;struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->port;DRM_DEBUG_KMS ("Adding HDMI connector on port %c\n" ,port_name (port));@@ -2135,7 +2135,6 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv,if (IS_G4X (dev_priv)) intel_encoder->cloneable |=1 <<INTEL_OUTPUT_HDMI ; - intel_dig_port->port = port; intel_dig_port->hdmi.hdmi_reg = hdmi_reg; intel_dig_port->dp.output_reg =INVALID_MMIO_REG ; intel_dig_port->max_lanes =4 ;drivers/gpu/drm/i915/intel_pipe_crc.c +0
-0drivers/gpu/drm/i915/intel_pipe_crc.c static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv, · line 271
Quoted 3 lines
drivers/gpu/drm/i915/intel_pipe_crc.c +0
-0@@ -269,7 +269,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv,case INTEL_OUTPUT_DP :case INTEL_OUTPUT_EDP : dig_port =enc_to_dig_port (&encoder->base);This can be eliminated.
Quoted 36 lines
drivers/gpu/drm/i915/intel_pipe_crc.c +2
-2-switch (dig_port->port) { +switch (dig_port->base.port) {case PORT_B : *source =INTEL_PIPE_CRC_SOURCE_DP_B ;break ;@@ -281,7 +281,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv,break ;default :WARN (1 ,"nonexisting DP port %c\n" , -port_name (dig_port->port)); +port_name (dig_port->base.port));break ; }break ;drivers/gpu/drm/i915/intel_psr.c +2
-2@@ -163,7 +163,7 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) [3] = 1 - 1, [4] = DP_SET_POWER_D0, }; -enum port port = dig_port->port; +enum port port = dig_port->base.port;u32 aux_ctl;int i;@@ -376,7 +376,7 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,* ones. Since by Display design transcoder EDP is tied to port A * we can safely escape based on the port A. */ -if (HAS_DDI (dev_priv) && dig_port->port !=PORT_A ) { +if (HAS_DDI (dev_priv) && dig_port->base.port !=PORT_A ) {DRM_DEBUG_KMS ("PSR condition failed: Port not supported\n" );return ; }
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 8/10 drm/i915: Nuke intel_digital_port->port
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Remove intel_digital_port->port and replace its users with intel_encoder->port. intel_encoder->port is a superset of intel_digital_port->port, and it works correctly even for MST encoders.
v2: Eliminate a few dp_to_dig_port()->base.port cases too (DK)
Performed with cocci:
@@
@@
struct intel_digital_port {
...
- enum port port;
...
}@@
struct intel_digital_port *D;
expression E;
@@
- D->port = E;
@@
struct intel_digital_port *D;
@@
- D->port
+ D->base.port
@
expression E;
@@
(
- dp_to_dig_port(E)->port
+ dp_to_dig_port(E)->base.port
|
- enc_to_dig_port(E)->port
+ to_intel_encoder(E)->port
)
@@
expression E;
@@
- to_intel_encoder(&E->base)
+ E
@@
struct intel_digital_port *D;
identifier I, M;
@@
I = &D->base
<...
(
- D->base.M
+ I->M
|
- &D->base
+ I
)
...>
@@
identifier D;
expression E;
identifier M;
@@
D = enc_to_dig_port(&E->base)
<...
(
- D->base.M
+ E->M
|
- &D->base
+ E
)
...>
@@
identifier D, DP;
expression E;
identifier M;
@@
DP = enc_to_intel_dp(&E->base)
<...
(
- dp_to_dig_port(DP)->base.M
+ E->M
|
- &dp_to_dig_port(DP)->base
+ E
)
...>
@@
expression E;
identifier M;
@@
(
- enc_to_dig_port(&E->base)->base.M
+ E->M
|
- enc_to_dig_port(&E->base)->base
+ E
|
- enc_to_mst(&E->base)->primary->base.port
+ E->port
)
@@
expression E;
identifier D;
@@
- struct intel_digital_port *D = E;
... when != D
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 13 ++--- drivers/gpu/drm/i915/intel_display.c | 13 +++-- drivers/gpu/drm/i915/intel_dp.c | 103 +++++++++++++++++----------------- drivers/gpu/drm/i915/intel_dp_mst.c | 6 +- drivers/gpu/drm/i915/intel_dpio_phy.c | 12 ++-- drivers/gpu/drm/i915/intel_drv.h | 5 +- drivers/gpu/drm/i915/intel_hdmi.c | 17 +++--- drivers/gpu/drm/i915/intel_pipe_crc.c | 4 +- drivers/gpu/drm/i915/intel_psr.c | 4 +- 10 files changed, 87 insertions(+), 92 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -3603,7 +3603,7 @@ static int i915_dp_mst_info(struct seq_file *m, void *unused)continue ;seq_printf (m,"MST Source Port %c\n" , -port_name (intel_dig_port->port)); +port_name (intel_dig_port->base.port));drm_dp_mst_dump_topology (m, &intel_dig_port->dp.mst_mgr); }drm_connector_list_iter_end (&conn_iter);
drivers/gpu/drm/i915/intel_ddi.c +6 -7
@@ -1801,8 +1801,8 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, int level, enum intel_output_type type) {struct intel_digital_port *intel_dig_port =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev); -enum port port = intel_dig_port->port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port;uint8_t iboost;if (type ==INTEL_OUTPUT_HDMI )
@@ -2470,7 +2470,7 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;uint32_t val;bool wait = false;
@@ -2698,7 +2698,7 @@ static struct intel_connector * intel_ddi_init_dp_connector(struct intel_digital_port *intel_dig_port) {struct intel_connector *connector; -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port; connector =intel_connector_alloc ();if (!connector)
@@ -2717,7 +2717,7 @@ static struct intel_connector * intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port) {struct intel_connector *connector; -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port; connector =intel_connector_alloc ();if (!connector)
@@ -2733,7 +2733,7 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dport) {struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); -if (dport->port !=PORT_A ) +if (dport->base.port !=PORT_A )return false;if (dport->saved_port_bits &DDI_A_4_LANES )
@@ -2836,7 +2836,6 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) intel_encoder->suspend = intel_dp_encoder_suspend; intel_encoder->get_power_domains = intel_ddi_get_power_domains; - intel_dig_port->port = port; intel_dig_port->saved_port_bits =I915_READ (DDI_BUF_CTL (port)) & (DDI_BUF_PORT_REVERSAL |DDI_A_4_LANES );
drivers/gpu/drm/i915/intel_display.c +7 -6
@@ -1701,7 +1701,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,u32 port_mask;i915_reg_t dpll_reg; -switch (dport->port) { +switch (dport->base.port) {case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; dpll_reg =DPLL (0 );
@@ -1723,7 +1723,8 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, dpll_reg, port_mask, expected_mask, 1000))WARN (1 ,"timed out waiting for port %c ready: got 0x%x, expected 0x%x\n" , -port_name (dport->port),I915_READ (dpll_reg) & port_mask, expected_mask); +port_name (dport->base.port), +I915_READ (dpll_reg) & port_mask, expected_mask); } static void ironlake_enable_pch_transcoder(struct drm_i915_private *dev_priv,
@@ -4481,7 +4482,7 @@ intel_trans_dp_port_sel(struct intel_crtc *crtc)for_each_encoder_on_crtc (dev, &crtc->base, encoder) {if (encoder->type ==INTEL_OUTPUT_DP || encoder->type ==INTEL_OUTPUT_EDP ) -return enc_to_dig_port (&encoder->base)->port; +return encoder->port; }return -1 ;
@@ -7632,7 +7633,7 @@ static void ironlake_init_pch_refclk(struct drm_i915_private *dev_priv)break ;case INTEL_OUTPUT_EDP : has_panel = true; -if (enc_to_dig_port (&encoder->base)->port ==PORT_A ) +if (encoder->port ==PORT_A ) has_cpu_edp = true;break ;default :
@@ -10755,7 +10756,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)case INTEL_OUTPUT_DP :case INTEL_OUTPUT_HDMI :case INTEL_OUTPUT_EDP : - port_mask =1 <<enc_to_dig_port (&encoder->base)->port; + port_mask =1 << encoder->port;/* the same port mustn't appear more than once */ if (used_ports & port_mask)
@@ -10765,7 +10766,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)break ;case INTEL_OUTPUT_DP_MST : used_mst_ports |= -1 <<enc_to_mst (&encoder->base)->primary->port; +1 << encoder->port;break ;default :break ;
drivers/gpu/drm/i915/intel_dp.c +51 -52
398 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp_mst.c +3 -3
@@ -209,7 +209,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp;struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;struct intel_connector *connector =to_intel_connector (conn_state->connector);int ret;
@@ -253,7 +253,7 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder,struct intel_digital_port *intel_dig_port = intel_mst->primary;struct intel_dp *intel_dp = &intel_dig_port->dp;struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum port port = intel_dig_port->port; +enum port port = intel_dig_port->base.port;int ret;DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links);
@@ -552,7 +552,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum intel_encoder->type =INTEL_OUTPUT_DP_MST ; intel_encoder->power_domain = intel_dig_port->base.power_domain; - intel_encoder->port = intel_dig_port->port; + intel_encoder->port = intel_dig_port->base.port; intel_encoder->crtc_mask =0x7 ; intel_encoder->cloneable =0 ;
drivers/gpu/drm/i915/intel_dpio_phy.c +5 -7
@@ -586,9 +586,8 @@ bxt_ddi_phy_calc_lane_lat_optim_mask(uint8_t lane_count)void bxt_ddi_phy_set_lane_optim_mask (struct intel_encoder *encoder,uint8_t lane_lat_optim_mask) { -struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); -enum port port = dport->port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port;enum dpio_phy phy;enum dpio_channel ch;int lane;
@@ -613,9 +612,8 @@ void bxt_ddi_phy_set_lane_optim_mask(struct intel_encoder *encoder,uint8_t bxt_ddi_phy_get_lane_lat_optim_mask (struct intel_encoder *encoder) { -struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev); -enum port port = dport->port; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port;enum dpio_phy phy;enum dpio_channel ch;int lane;
@@ -641,7 +639,7 @@ void chv_set_phy_signal_level(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_digital_port *dport =enc_to_dig_port (&encoder->base); -struct intel_crtc *intel_crtc =to_intel_crtc (dport->base.base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (encoder->base.crtc);enum dpio_channel ch =vlv_dport_to_channel (dport);enum pipe pipe = intel_crtc->pipe;u32 val;
drivers/gpu/drm/i915/intel_drv.h +2 -3
@@ -1056,7 +1056,6 @@ struct intel_lspcon {struct intel_digital_port {struct intel_encoder base; -enum port port;u32 saved_port_bits;struct intel_dp dp;struct intel_hdmi hdmi;
@@ -1088,7 +1087,7 @@ struct intel_dp_mst_encoder {static inline enum dpio_channel vlv_dport_to_channel (struct intel_digital_port *dport) { -switch (dport->port) { +switch (dport->base.port) {case PORT_B :case PORT_D :return DPIO_CH0 ;
@@ -1102,7 +1101,7 @@ vlv_dport_to_channel(struct intel_digital_port *dport)static inline enum dpio_phy vlv_dport_to_phy (struct intel_digital_port *dport) { -switch (dport->port) { +switch (dport->base.port) {case PORT_B :case PORT_C :return DPIO_PHY0 ;
drivers/gpu/drm/i915/intel_hdmi.c +8 -9
@@ -186,7 +186,7 @@ static bool g4x_infoframe_enabled(struct drm_encoder *encoder,if ((val &VIDEO_DIP_ENABLE ) ==0 )return false; -if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->port)) +if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->base.port))return false; return val & (VIDEO_DIP_ENABLE_AVI |
@@ -245,7 +245,7 @@ static bool ibx_infoframe_enabled(struct drm_encoder *encoder,if ((val &VIDEO_DIP_ENABLE ) ==0 )return false; -if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->port)) +if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->base.port))return false; return val & (VIDEO_DIP_ENABLE_AVI |
@@ -362,7 +362,7 @@ static bool vlv_infoframe_enabled(struct drm_encoder *encoder,if ((val &VIDEO_DIP_ENABLE ) ==0 )return false; -if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->port)) +if ((val &VIDEO_DIP_PORT_MASK ) !=VIDEO_DIP_PORT (intel_dig_port->base.port))return false; return val & (VIDEO_DIP_ENABLE_AVI |
@@ -535,7 +535,7 @@ static void g4x_set_infoframes(struct drm_encoder *encoder,struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;i915_reg_t reg =VIDEO_DIP_CTL ;u32 val =I915_READ (reg); -u32 port =VIDEO_DIP_PORT (intel_dig_port->port); +u32 port =VIDEO_DIP_PORT (intel_dig_port->base.port);assert_hdmi_port_disabled (intel_hdmi);
@@ -686,7 +686,7 @@ static void ibx_set_infoframes(struct drm_encoder *encoder,struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;i915_reg_t reg =TVIDEO_DIP_CTL (intel_crtc->pipe);u32 val =I915_READ (reg); -u32 port =VIDEO_DIP_PORT (intel_dig_port->port); +u32 port =VIDEO_DIP_PORT (intel_dig_port->base.port);assert_hdmi_port_disabled (intel_hdmi);
@@ -782,7 +782,7 @@ static void vlv_set_infoframes(struct drm_encoder *encoder,struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);i915_reg_t reg =VLV_TVIDEO_DIP_CTL (intel_crtc->pipe);u32 val =I915_READ (reg); -u32 port =VIDEO_DIP_PORT (intel_dig_port->port); +u32 port =VIDEO_DIP_PORT (intel_dig_port->base.port);assert_hdmi_port_disabled (intel_hdmi);
@@ -1545,7 +1545,7 @@ intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector, bool has_edid) {struct drm_i915_private *dev_priv =to_i915 (connector->dev);struct intel_hdmi *hdmi =intel_attached_hdmi (connector); -enum port port =hdmi_to_dig_port (hdmi)->port; +enum port port =hdmi_to_dig_port (hdmi)->base.port;struct i2c_adapter *adapter =intel_gmbus_get_adapter (dev_priv, hdmi->ddc_bus);enum drm_dp_dual_mode_type type =drm_dp_dual_mode_detect (adapter);
@@ -2015,7 +2015,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,struct intel_encoder *intel_encoder = &intel_dig_port->base;struct drm_device *dev = intel_encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -enum port port = intel_dig_port->port; +enum port port = intel_encoder->port;DRM_DEBUG_KMS ("Adding HDMI connector on port %c\n" ,port_name (port));
@@ -2135,7 +2135,6 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv,if (IS_G4X (dev_priv)) intel_encoder->cloneable |=1 <<INTEL_OUTPUT_HDMI ; - intel_dig_port->port = port; intel_dig_port->hdmi.hdmi_reg = hdmi_reg; intel_dig_port->dp.output_reg =INVALID_MMIO_REG ; intel_dig_port->max_lanes =4 ;
drivers/gpu/drm/i915/intel_pipe_crc.c +2 -2
@@ -269,7 +269,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv,case INTEL_OUTPUT_DP :case INTEL_OUTPUT_EDP : dig_port =enc_to_dig_port (&encoder->base); -switch (dig_port->port) { +switch (dig_port->base.port) {case PORT_B : *source =INTEL_PIPE_CRC_SOURCE_DP_B ;break ;
@@ -281,7 +281,7 @@ static int i9xx_pipe_crc_auto_source(struct drm_i915_private *dev_priv,break ;default :WARN (1 ,"nonexisting DP port %c\n" , -port_name (dig_port->port)); +port_name (dig_port->base.port));break ; }break ;
drivers/gpu/drm/i915/intel_psr.c +2 -2
@@ -163,7 +163,7 @@ static void hsw_psr_enable_sink(struct intel_dp *intel_dp) [3] = 1 - 1, [4] = DP_SET_POWER_D0, }; -enum port port = dig_port->port; +enum port port = dig_port->base.port;u32 aux_ctl;int i;
@@ -376,7 +376,7 @@ void intel_psr_compute_config(struct intel_dp *intel_dp,* ones. Since by Display design transcoder EDP is tied to port A * we can safely escape based on the port A. */ -if (HAS_DDI (dev_priv) && dig_port->port !=PORT_A ) { +if (HAS_DDI (dev_priv) && dig_port->base.port !=PORT_A ) {DRM_DEBUG_KMS ("PSR condition failed: Port not supported\n" );return ; }
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/10 drm/i915: Clean up PPS code calling conventions
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
No need to pass 'dev' or 'dev_priv' when the function already takes 'intel_dp'. Also let's prefer passing 'dev_priv' instead of 'dev' when we have to pass one or the other.
--- drivers/gpu/drm/i915/intel_dp.c | 99 +++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 57 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +42 -57
@@ -135,7 +135,7 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp);static void edp_panel_vdd_off (struct intel_dp *intel_dp,bool sync);static void vlv_init_panel_power_sequencer (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state); -static void vlv_steal_power_sequencer (struct drm_device *dev, +static void vlv_steal_power_sequencer (struct drm_i915_private *dev_priv,enum pipe pipe);static void intel_dp_unset_edid (struct intel_dp *intel_dp);
@@ -429,14 +429,12 @@ static void intel_dp_unpack_aux(uint32_t src, uint8_t *dst, int dst_bytes) }static void -intel_dp_init_panel_power_sequencer (struct drm_device *dev, -struct intel_dp *intel_dp); +intel_dp_init_panel_power_sequencer (struct intel_dp *intel_dp);static void -intel_dp_init_panel_power_sequencer_registers (struct drm_device *dev, -struct intel_dp *intel_dp, +intel_dp_init_panel_power_sequencer_registers (struct intel_dp *intel_dp,bool force_disable_vdd);static void -intel_dp_pps_init (struct drm_device *dev,struct intel_dp *intel_dp); +intel_dp_pps_init (struct intel_dp *intel_dp);static void pps_lock (struct intel_dp *intel_dp) {
@@ -580,9 +578,8 @@ static enum pipe vlv_find_free_pps(struct drm_i915_private *dev_priv)static enum pipe vlv_power_sequencer_pipe (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum pipe pipe;lockdep_assert_held (&dev_priv->pps_mutex);
@@ -605,7 +602,7 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp)if (WARN_ON (pipe ==INVALID_PIPE )) pipe =PIPE_A ; -vlv_steal_power_sequencer (dev, pipe); +vlv_steal_power_sequencer (dev_priv, pipe); intel_dp->pps_pipe = pipe; DRM_DEBUG_KMS("picked pipe %c power sequencer for port %c\n",
@@ -613,8 +610,8 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp) port_name(intel_dig_port->base.port));/* init power sequencer on this pipe and port */ -intel_dp_init_panel_power_sequencer (dev, intel_dp); -intel_dp_init_panel_power_sequencer_registers (dev, intel_dp, true); +intel_dp_init_panel_power_sequencer (intel_dp); +intel_dp_init_panel_power_sequencer_registers (intel_dp, true);/* * Even vdd force doesn't work until we've made
@@ -628,9 +625,7 @@ vlv_power_sequencer_pipe(struct intel_dp *intel_dp)static int bxt_power_sequencer_idx (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);
@@ -651,7 +646,7 @@ bxt_power_sequencer_idx(struct intel_dp *intel_dp)* Only the HW needs to be reprogrammed, the SW state is fixed and * has been setup during connector init. */ -intel_dp_init_panel_power_sequencer_registers (dev, intel_dp, false); +intel_dp_init_panel_power_sequencer_registers (intel_dp, false);return 0 ; }
@@ -703,9 +698,8 @@ vlv_initial_pps_pipe(struct drm_i915_private *dev_priv,static void vlv_initial_power_sequencer_setup (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = intel_dig_port->base.port;lockdep_assert_held (&dev_priv->pps_mutex);
@@ -733,8 +727,8 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)DRM_DEBUG_KMS ("initial power sequencer for port %c: pipe %c\n" ,port_name (port),pipe_name (intel_dp->pps_pipe)); -intel_dp_init_panel_power_sequencer (dev, intel_dp); -intel_dp_init_panel_power_sequencer_registers (dev, intel_dp, false); +intel_dp_init_panel_power_sequencer (intel_dp); +intel_dp_init_panel_power_sequencer_registers (intel_dp, false); }void intel_power_sequencer_reset (struct drm_i915_private *dev_priv)
@@ -790,10 +784,10 @@ struct pps_registers {i915_reg_t pp_div; }; -static void intel_pps_get_registers (struct drm_i915_private *dev_priv, -struct intel_dp *intel_dp, +static void intel_pps_get_registers (struct intel_dp *intel_dp,struct pps_registers *regs) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));int pps_idx =0 ;memset (regs,0 ,sizeof (*regs));
@@ -816,8 +810,7 @@ _pp_ctrl_reg(struct intel_dp *intel_dp) {struct pps_registers regs; -intel_pps_get_registers (to_i915 (intel_dp_to_dev (intel_dp)), intel_dp, - ®s); +intel_pps_get_registers (intel_dp, ®s);return regs.pp_ctrl; }
@@ -827,8 +820,7 @@ _pp_stat_reg(struct intel_dp *intel_dp) {struct pps_registers regs; -intel_pps_get_registers (to_i915 (intel_dp_to_dev (intel_dp)), intel_dp, - ®s); +intel_pps_get_registers (intel_dp, ®s);return regs.pp_stat; }
@@ -1947,8 +1939,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,#define IDLE_CYCLE_MASK (PP_ON | PP_SEQUENCE_MASK | PP_CYCLE_DELAY_ACTIVE | PP_SEQUENCE_STATE_MASK)#define IDLE_CYCLE_VALUE (0 | PP_SEQUENCE_NONE | 0 | PP_SEQUENCE_STATE_OFF_IDLE) -static void intel_pps_verify_state (struct drm_i915_private *dev_priv, -struct intel_dp *intel_dp); +static void intel_pps_verify_state (struct intel_dp *intel_dp); static void wait_panel_status(struct intel_dp *intel_dp, u32 mask,
@@ -1960,7 +1951,7 @@ static void wait_panel_status(struct intel_dp *intel_dp,lockdep_assert_held (&dev_priv->pps_mutex); -intel_pps_verify_state (dev_priv, intel_dp); +intel_pps_verify_state (intel_dp); pp_stat_reg =_pp_stat_reg (intel_dp); pp_ctrl_reg =_pp_ctrl_reg (intel_dp);
@@ -3009,15 +3000,14 @@ static void vlv_detach_power_sequencer(struct intel_dp *intel_dp) intel_dp->pps_pipe =INVALID_PIPE ; } -static void vlv_steal_power_sequencer (struct drm_device *dev, +static void vlv_steal_power_sequencer (struct drm_i915_private *dev_priv,enum pipe pipe) { -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_encoder *encoder;lockdep_assert_held (&dev_priv->pps_mutex); -for_each_intel_encoder (dev, encoder) { +for_each_intel_encoder (&dev_priv->drm, encoder) {struct intel_dp *intel_dp;enum port port;
@@ -3046,9 +3036,8 @@ static void vlv_steal_power_sequencer(struct drm_device *dev,static void vlv_init_panel_power_sequencer (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);lockdep_assert_held (&dev_priv->pps_mutex);
@@ -3069,7 +3058,7 @@ static void vlv_init_panel_power_sequencer(struct intel_encoder *encoder,* We may be stealing the power * sequencer from another port. */ -vlv_steal_power_sequencer (dev, crtc->pipe); +vlv_steal_power_sequencer (dev_priv, crtc->pipe); intel_dp->active_pipe = crtc->pipe;
@@ -3083,8 +3072,8 @@ static void vlv_init_panel_power_sequencer(struct intel_encoder *encoder, pipe_name(intel_dp->pps_pipe), port_name(encoder->port));/* init power sequencer on this pipe and port */ -intel_dp_init_panel_power_sequencer (dev, intel_dp); -intel_dp_init_panel_power_sequencer_registers (dev, intel_dp, true); +intel_dp_init_panel_power_sequencer (intel_dp); +intel_dp_init_panel_power_sequencer_registers (intel_dp, true); } static void vlv_pre_enable_dp(struct intel_encoder *encoder,
@@ -5062,7 +5051,7 @@ void intel_dp_encoder_reset(struct drm_encoder *encoder)if (intel_dp_is_edp (intel_dp)) {/* Reinit the power sequencer, in case BIOS did something with it. */ -intel_dp_pps_init (encoder->dev, intel_dp); +intel_dp_pps_init (intel_dp);intel_edp_panel_vdd_sanitize (intel_dp); }
@@ -5202,13 +5191,13 @@ static void intel_dp_init_panel_power_timestamps(struct intel_dp *intel_dp) }static void -intel_pps_readout_hw_state (struct drm_i915_private *dev_priv, -struct intel_dp *intel_dp,struct edp_power_seq *seq) +intel_pps_readout_hw_state (struct intel_dp *intel_dp,struct edp_power_seq *seq) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp_on, pp_off, pp_div =0 , pp_ctl =0 ;struct pps_registers regs; -intel_pps_get_registers (dev_priv, intel_dp, ®s); +intel_pps_get_registers (intel_dp, ®s);/* Workaround: Need to write PP_CONTROL with the unlock key as * the very first thing. */
@@ -5252,13 +5241,12 @@ intel_pps_dump_state(const char *state_name, const struct edp_power_seq *seq) }static void -intel_pps_verify_state (struct drm_i915_private *dev_priv, -struct intel_dp *intel_dp) +intel_pps_verify_state (struct intel_dp *intel_dp) {struct edp_power_seq hw;struct edp_power_seq *sw = &intel_dp->pps_delays; -intel_pps_readout_hw_state (dev_priv, intel_dp, &hw); +intel_pps_readout_hw_state (intel_dp, &hw);if (hw.t1_t3 != sw->t1_t3 || hw.t8 != sw->t8 || hw.t9 != sw->t9 || hw.t10 != sw->t10 || hw.t11_t12 != sw->t11_t12) {
@@ -5269,10 +5257,9 @@ intel_pps_verify_state(struct drm_i915_private *dev_priv, }static void -intel_dp_init_panel_power_sequencer (struct drm_device *dev, -struct intel_dp *intel_dp) +intel_dp_init_panel_power_sequencer (struct intel_dp *intel_dp) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct edp_power_seq cur, vbt, spec, *final = &intel_dp->pps_delays;
@@ -5282,7 +5269,7 @@ intel_dp_init_panel_power_sequencer(struct drm_device *dev,if (final->t11_t12 !=0 )return ; -intel_pps_readout_hw_state (dev_priv, intel_dp, &cur); +intel_pps_readout_hw_state (intel_dp, &cur);intel_pps_dump_state ("cur" , &cur);
@@ -5356,11 +5343,10 @@ intel_dp_init_panel_power_sequencer(struct drm_device *dev, }static void -intel_dp_init_panel_power_sequencer_registers (struct drm_device *dev, -struct intel_dp *intel_dp, +intel_dp_init_panel_power_sequencer_registers (struct intel_dp *intel_dp,bool force_disable_vdd) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp_on, pp_off, pp_div, port_sel =0 ;int div = dev_priv->rawclk_freq /1000 ;struct pps_registers regs;
@@ -5369,7 +5355,7 @@ intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev,lockdep_assert_held (&dev_priv->pps_mutex); -intel_pps_get_registers (dev_priv, intel_dp, ®s); +intel_pps_get_registers (intel_dp, ®s);/* * On some VLV machines the BIOS can leave the VDD
@@ -5441,16 +5427,15 @@ intel_dp_init_panel_power_sequencer_registers(struct drm_device *dev, I915_READ(regs.pp_div)); } -static void intel_dp_pps_init (struct drm_device *dev, -struct intel_dp *intel_dp) +static void intel_dp_pps_init (struct intel_dp *intel_dp) { -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {vlv_initial_power_sequencer_setup (intel_dp); }else { -intel_dp_init_panel_power_sequencer (dev, intel_dp); -intel_dp_init_panel_power_sequencer_registers (dev, intel_dp, false); +intel_dp_init_panel_power_sequencer (intel_dp); +intel_dp_init_panel_power_sequencer_registers (intel_dp, false); } }
@@ -5864,7 +5849,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,pps_lock (intel_dp);intel_dp_init_panel_power_timestamps (intel_dp); -intel_dp_pps_init (dev, intel_dp); +intel_dp_pps_init (intel_dp);intel_edp_panel_vdd_sanitize (intel_dp);pps_unlock (intel_dp);
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/10 drm/i915: Clean up DP code local variables and calling conventions
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Eliminate a ton of pointless 'dev' variables in the DP code, and pass around 'dev_priv' instead of 'dev'.
--- drivers/gpu/drm/i915/intel_dp.c | 151 ++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 97 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +54 -97
@@ -438,10 +438,7 @@ intel_dp_pps_init(struct intel_dp *intel_dp);static void pps_lock (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *encoder = &intel_dig_port->base; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));/* * See vlv_power_sequencer_reset() why we need
@@ -454,10 +451,7 @@ static void pps_lock(struct intel_dp *intel_dp)static void pps_unlock (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *encoder = &intel_dig_port->base; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));mutex_unlock (&dev_priv->pps_mutex);
@@ -467,8 +461,8 @@ static void pps_unlock(struct intel_dp *intel_dp)static void vlv_power_sequencer_kick (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev);enum pipe pipe = intel_dp->pps_pipe;bool pll_enabled, release_cl_override = false;enum dpio_phy phy =DPIO_PHY (pipe);
@@ -733,7 +727,6 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)void intel_power_sequencer_reset (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm;struct intel_encoder *encoder; if (WARN_ON(!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv) &&
@@ -750,7 +743,7 @@ void intel_power_sequencer_reset(struct drm_i915_private *dev_priv)* should use them always. */ -for_each_intel_encoder (dev, encoder) { +for_each_intel_encoder (&dev_priv->drm, encoder) {struct intel_dp *intel_dp; if (encoder->type != INTEL_OUTPUT_DP &&
@@ -832,8 +825,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code, {struct intel_dp *intel_dp =container_of (this,typeof (* intel_dp), edp_notifier); -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!intel_dp_is_edp (intel_dp) || code !=SYS_RESTART )return 0 ;
@@ -863,8 +855,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code,static bool edp_have_panel_power (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);
@@ -877,8 +868,7 @@ static bool edp_have_panel_power(struct intel_dp *intel_dp)static bool edp_have_panel_vdd (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);
@@ -892,8 +882,7 @@ static bool edp_have_panel_vdd(struct intel_dp *intel_dp)static void intel_dp_check_edp (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!intel_dp_is_edp (intel_dp))return ;
@@ -909,9 +898,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)static uint32_t intel_dp_aux_wait_done (struct intel_dp *intel_dp,bool has_aux_irq) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg;uint32_t status;bool done;
@@ -1478,8 +1465,7 @@ static void intel_dp_set_clock(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) { - struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);const struct dp_link_dpll *divisor =NULL ;int i, count =0 ;
@@ -1848,8 +1834,7 @@ void intel_dp_set_link_params(struct intel_dp *intel_dp,static void intel_dp_prepare (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) { -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port =dp_to_dig_port (intel_dp)->base.port;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);
@@ -1945,8 +1930,7 @@ static void wait_panel_status(struct intel_dp *intel_dp, u32 mask, u32 value) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));i915_reg_t pp_stat_reg, pp_ctrl_reg;lockdep_assert_held (&dev_priv->pps_mutex);
@@ -2022,8 +2006,7 @@ static void edp_wait_backlight_off(struct intel_dp *intel_dp)static u32 ironlake_get_pp_control (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 control;lockdep_assert_held (&dev_priv->pps_mutex);
@@ -2044,9 +2027,8 @@ static u32 ironlake_get_pp_control(struct intel_dp *intel_dp)*/ static bool edp_panel_vdd_on (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev);u32 pp;i915_reg_t pp_stat_reg, pp_ctrl_reg;bool need_to_disable = !intel_dp->want_panel_vdd;
@@ -2116,8 +2098,7 @@ void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)static void edp_panel_vdd_off_sync (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);u32 pp;
@@ -2203,8 +2184,7 @@ static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)static void edp_panel_on (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;
@@ -2262,8 +2242,7 @@ void intel_edp_panel_on(struct intel_dp *intel_dp)static void edp_panel_off (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;
@@ -2311,9 +2290,7 @@ void intel_edp_panel_off(struct intel_dp *intel_dp)/* Enable backlight in the panel power control. */ static void _intel_edp_backlight_on (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;
@@ -2356,8 +2333,7 @@ void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state,/* Disable backlight in the panel power control. */ static void _intel_edp_backlight_off (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;
@@ -2560,10 +2536,9 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode)static bool intel_dp_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port =dp_to_dig_port (intel_dp)->base.port; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);u32 tmp;bool ret;
@@ -2612,10 +2587,9 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder,static void intel_dp_get_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);u32 tmp, flags =0 ; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port =dp_to_dig_port (intel_dp)->base.port;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);
@@ -2782,9 +2756,8 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp, uint32_t *DP, uint8_t dp_train_pat) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = intel_dig_port->base.port;if (dp_train_pat &DP_TRAINING_PATTERN_MASK )
@@ -2868,8 +2841,7 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp,static void intel_dp_enable_port (struct intel_dp *intel_dp,const struct intel_crtc_state *old_crtc_state) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));/* enable with pattern 1 (as per spec) */
@@ -2893,9 +2865,8 @@ static void intel_enable_dp(struct intel_encoder *encoder,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_dp *intel_dp =enc_to_intel_dp (&encoder->base); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);uint32_t dp_reg =I915_READ (intel_dp->output_reg);enum pipe pipe = crtc->pipe;
@@ -3519,10 +3490,9 @@ gen7_edp_signal_levels(uint8_t train_set)void intel_dp_set_signal_levels (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);enum port port = intel_dig_port->base.port; -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t signal_levels, mask =0 ;uint8_t train_set = intel_dp->train_set[0 ];
@@ -3577,9 +3547,8 @@ intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,void intel_dp_set_idle_link_train (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = intel_dig_port->base.port;uint32_t val;
@@ -4303,11 +4272,11 @@ intel_dp_retrain_link(struct intel_dp *intel_dp)static void intel_dp_check_link_status (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base; -struct drm_device *dev =intel_dp_to_dev (intel_dp);u8 link_status[DP_LINK_STATUS_SIZE ]; -WARN_ON (!drm_modeset_is_locked (&dev->mode_config.connection_mutex)); +WARN_ON (!drm_modeset_is_locked (&dev_priv->drm.mode_config.connection_mutex));if (!intel_dp_get_link_status (intel_dp, link_status)) {DRM_ERROR ("Failed to get link status\n" );
@@ -4353,8 +4322,7 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)static bool intel_dp_short_pulse (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base; +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u8 sink_irq_vector =0 ;u8 old_sink_count = intel_dp->sink_count;bool ret;
@@ -4393,13 +4361,13 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)DRM_DEBUG_DRIVER ("CP or sink specific irq unhandled\n" ); } -drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); +drm_modeset_lock (&dev_priv->drm.mode_config.connection_mutex,NULL );intel_dp_check_link_status (intel_dp); -drm_modeset_unlock (&dev->mode_config.connection_mutex); +drm_modeset_unlock (&dev_priv->drm.mode_config.connection_mutex);if (intel_dp->compliance.test_type ==DP_TEST_LINK_TRAINING ) {DRM_DEBUG_KMS ("Link Training Compliance Test requested\n" );/* Send a Hotplug Uevent to userspace to start modeset */ -drm_kms_helper_hotplug_event (intel_encoder->base.dev); +drm_kms_helper_hotplug_event (&dev_priv->drm); }return true;
@@ -4463,8 +4431,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp)static enum drm_connector_status edp_detect (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));enum drm_connector_status status; status =intel_panel_detect (dev_priv);
@@ -4720,22 +4687,21 @@ intel_dp_unset_edid(struct intel_dp *intel_dp) }static int -intel_dp_long_pulse (struct intel_connector *intel_connector) +intel_dp_long_pulse (struct intel_connector *connector) { -struct drm_connector *connector = &intel_connector->base; -struct intel_dp *intel_dp =intel_attached_dp (connector); -struct drm_device *dev = connector->dev; +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_dp *intel_dp =intel_attached_dp (&connector->base);enum drm_connector_status status;u8 sink_irq_vector =0 ; -WARN_ON (!drm_modeset_is_locked (&connector->dev->mode_config.connection_mutex)); +WARN_ON (!drm_modeset_is_locked (&dev_priv->drm.mode_config.connection_mutex)); -intel_display_power_get (to_i915 (dev), intel_dp->aux_power_domain); +intel_display_power_get (dev_priv, intel_dp->aux_power_domain);/* Can't disconnect eDP, but you can close the lid... */ if (intel_dp_is_edp (intel_dp)) status =edp_detect (intel_dp); -else if (intel_digital_port_connected (to_i915 (dev), +else if (intel_digital_port_connected (dev_priv,dp_to_dig_port (intel_dp))) status =intel_dp_detect_dpcd (intel_dp);else
@@ -4806,7 +4772,7 @@ intel_dp_long_pulse(struct intel_connector *intel_connector) intel_dp->aux.i2c_defer_count =0 ;intel_dp_set_edid (intel_dp); -if (intel_dp_is_edp (intel_dp) || intel_connector->detect_edid) +if (intel_dp_is_edp (intel_dp) || connector->detect_edid) status = connector_status_connected; intel_dp->detect_done = true;
@@ -4829,7 +4795,7 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)if (status != connector_status_connected && !intel_dp->is_mst)intel_dp_unset_edid (intel_dp); -intel_display_power_put (to_i915 (dev), intel_dp->aux_power_domain); +intel_display_power_put (dev_priv, intel_dp->aux_power_domain);return status; }
@@ -4996,9 +4962,7 @@ void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder)static void intel_edp_panel_vdd_sanitize (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);
@@ -5086,8 +5050,7 @@ enum irqreturn intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) {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 drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));enum irqreturn ret =IRQ_NONE ;if (long_hpd && intel_dig_port->base.type ==INTEL_OUTPUT_EDP ) {
@@ -5546,8 +5509,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,void intel_edp_drrs_enable (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!crtc_state->has_drrs) {DRM_DEBUG_KMS ("Panel doesn't support DRRS\n" );
@@ -5582,8 +5544,7 @@ void intel_edp_drrs_enable(struct intel_dp *intel_dp,void intel_edp_drrs_disable (struct intel_dp *intel_dp,const struct intel_crtc_state *old_crtc_state) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!old_crtc_state->has_drrs)return ;
@@ -5766,7 +5727,7 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,/** * intel_dp_drrs_init - Init basic DRRS work and mutex. -* @intel_connector: eDP connector +* @connector: eDP connector * @fixed_mode: preferred mode of panel * * This function is called only once at driver load to initialize basic
@@ -5778,12 +5739,10 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,* from VBT setting). */ static struct drm_display_mode * -intel_dp_drrs_init (struct intel_connector *intel_connector, -struct drm_display_mode *fixed_mode) +intel_dp_drrs_init (struct intel_connector *connector, +struct drm_display_mode *fixed_mode) { -struct drm_connector *connector = &intel_connector->base; -struct drm_device *dev = connector->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct drm_display_mode *downclock_mode =NULL ;INIT_DELAYED_WORK (&dev_priv->drrs.work, intel_edp_drrs_downclock_work);
@@ -5799,8 +5758,8 @@ intel_dp_drrs_init(struct intel_connector *intel_connector,return NULL ; } - downclock_mode =intel_find_panel_downclock - (dev_priv, fixed_mode, connector); + downclock_mode =intel_find_panel_downclock (dev_priv, fixed_mode, + &connector->base);if (!downclock_mode) {DRM_DEBUG_KMS ("Downclock mode is not found. DRRS not supported\n" );
@@ -5817,11 +5776,9 @@ intel_dp_drrs_init(struct intel_connector *intel_connector,static bool intel_edp_init_connector (struct intel_dp *intel_dp,struct intel_connector *intel_connector) { -struct drm_connector *connector = &intel_connector->base; -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *intel_encoder = &intel_dig_port->base; -struct drm_device *dev = intel_encoder->base.dev; +struct drm_device *dev =intel_dp_to_dev (intel_dp);struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_connector *connector = &intel_connector->base;struct drm_display_mode *fixed_mode =NULL ;struct drm_display_mode *alt_fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;
@@ -5839,7 +5796,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,* eDP and LVDS bail out early in this case to prevent interfering * with an already powered-on LVDS power sequencer. */ -if (intel_get_lvds_encoder (dev)) { +if (intel_get_lvds_encoder (&dev_priv->drm)) {WARN_ON (!(HAS_PCH_IBX (dev_priv) ||HAS_PCH_CPT (dev_priv)));DRM_INFO ("LVDS was detected, not registering eDP\n" );
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/10] drm/i915: Clean up DP code local variables and calling conventions
nits below.
Quoted 298 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Eliminate a ton of pointless 'dev' variables in the DP code, and pass around '
dev_priv' instead of 'dev'.Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 151 ++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 97 deletions(-)drivers/gpu/drm/i915/intel_dp.c +26
-57@@ -438,10 +438,7 @@ intel_dp_pps_init(struct intel_dp *intel_dp);static void pps_lock (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *encoder = &intel_dig_port->base; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));/* * See vlv_power_sequencer_reset() why we need @@ -454,10 +451,7 @@ static void pps_lock(struct intel_dp *intel_dp)static void pps_unlock (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *encoder = &intel_dig_port->base; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));mutex_unlock (&dev_priv->pps_mutex);@@ -467,8 +461,8 @@ static void pps_unlock(struct intel_dp *intel_dp)static void vlv_power_sequencer_kick (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev);enum pipe pipe = intel_dp->pps_pipe;bool pll_enabled, release_cl_override = false;enum dpio_phy phy =DPIO_PHY (pipe);@@ -733,7 +727,6 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)void intel_power_sequencer_reset (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm;struct intel_encoder *encoder; if (WARN_ON(!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv) &&@@ -750,7 +743,7 @@ void intel_power_sequencer_reset(struct drm_i915_private *dev_priv)* should use them always. */ -for_each_intel_encoder (dev, encoder) { +for_each_intel_encoder (&dev_priv->drm, encoder) {struct intel_dp *intel_dp; if (encoder->type != INTEL_OUTPUT_DP &&@@ -832,8 +825,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code, {struct intel_dp *intel_dp =container_of (this,typeof (* intel_dp), edp_notifier); -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!intel_dp_is_edp (intel_dp) || code !=SYS_RESTART )return 0 ;@@ -863,8 +855,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code,static bool edp_have_panel_power (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);@@ -877,8 +868,7 @@ static bool edp_have_panel_power(struct intel_dp *intel_dp)static bool edp_have_panel_vdd (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);@@ -892,8 +882,7 @@ static bool edp_have_panel_vdd(struct intel_dp *intel_dp)static void intel_dp_check_edp (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!intel_dp_is_edp (intel_dp))return ;@@ -909,9 +898,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)static uint32_t intel_dp_aux_wait_done (struct intel_dp *intel_dp,bool has_aux_irq) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg;uint32_t status;bool done;@@ -1478,8 +1465,7 @@ static void intel_dp_set_clock(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) { - struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);const struct dp_link_dpll *divisor =NULL ;int i, count =0 ;@@ -1848,8 +1834,7 @@ void intel_dp_set_link_params(struct intel_dp *intel_dp,static void intel_dp_prepare (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) { -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port =dp_to_dig_port (intel_dp)->base.port;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);@@ -1945,8 +1930,7 @@ static void wait_panel_status(struct intel_dp *intel_dp, u32 mask, u32 value) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));i915_reg_t pp_stat_reg, pp_ctrl_reg;lockdep_assert_held (&dev_priv->pps_mutex);@@ -2022,8 +2006,7 @@ static void edp_wait_backlight_off(struct intel_dp *intel_dp)static u32 ironlake_get_pp_control (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 control;lockdep_assert_held (&dev_priv->pps_mutex);@@ -2044,9 +2027,8 @@ static u32 ironlake_get_pp_control(struct intel_dp *intel_dp)*/ static bool edp_panel_vdd_on (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev);u32 pp;i915_reg_t pp_stat_reg, pp_ctrl_reg;bool need_to_disable = !intel_dp->want_panel_vdd;@@ -2116,8 +2098,7 @@ void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)static void edp_panel_vdd_off_sync (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);u32 pp;@@ -2203,8 +2184,7 @@ static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)static void edp_panel_on (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;@@ -2262,8 +2242,7 @@ void intel_edp_panel_on(struct intel_dp *intel_dp)static void edp_panel_off (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;@@ -2311,9 +2290,7 @@ void intel_edp_panel_off(struct intel_dp *intel_dp)/* Enable backlight in the panel power control. */ static void _intel_edp_backlight_on (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;@@ -2356,8 +2333,7 @@ void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state,/* Disable backlight in the panel power control. */ static void _intel_edp_backlight_off (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;@@ -2560,10 +2536,9 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode)static bool intel_dp_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port =dp_to_dig_port (intel_dp)->base.port; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);u32 tmp;bool ret;@@ -2612,10 +2587,9 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder,static void intel_dp_get_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);u32 tmp, flags =0 ; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port =dp_to_dig_port (intel_dp)->base.port;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);@@ -2782,9 +2756,8 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp, uint32_t *DP, uint8_t dp_train_pat) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = intel_dig_port->base.port;if (dp_train_pat &DP_TRAINING_PATTERN_MASK )@@ -2868,8 +2841,7 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp,static void intel_dp_enable_port (struct intel_dp *intel_dp,const struct intel_crtc_state *old_crtc_state) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));/* enable with pattern 1 (as per spec) */ @@ -2893,9 +2865,8 @@ static void intel_enable_dp(struct intel_encoder *encoder,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_dp *intel_dp =enc_to_intel_dp (&encoder->base); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);uint32_t dp_reg =I915_READ (intel_dp->output_reg);enum pipe pipe = crtc->pipe;@@ -3519,10 +3490,9 @@ gen7_edp_signal_levels(uint8_t train_set)void intel_dp_set_signal_levels (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);enum port port = intel_dig_port->base.port; -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t signal_levels, mask =0 ;uint8_t train_set = intel_dp->train_set[0 ];@@ -3577,9 +3547,8 @@ intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,void intel_dp_set_idle_link_train (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = intel_dig_port->base.port;uint32_t val;
drivers/gpu/drm/i915/intel_dp.c intel_dp_retrain_link(struct intel_dp *intel_dp) · line 4275
Quoted 4 lines
drivers/gpu/drm/i915/intel_dp.c +1
-0@@ -4303,11 +4272,11 @@ intel_dp_retrain_link(struct intel_dp *intel_dp)static void intel_dp_check_link_status (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));
You convert it back again to drm_device.
Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +1
-2struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base; -struct drm_device *dev =intel_dp_to_dev (intel_dp);u8 link_status[DP_LINK_STATUS_SIZE ]; -WARN_ON (!drm_modeset_is_locked (&dev->mode_config.connection_mutex)); +WARN_ON (!drm_modeset_is_locked (&dev_priv->drm.mode_config.connection_mutex));if (!intel_dp_get_link_status (intel_dp, link_status)) {DRM_ERROR ("Failed to get link status\n" );
drivers/gpu/drm/i915/intel_dp.c intel_dp_check_link_status(struct intel_dp *intel_dp) · line 4325
Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +1
-2@@ -4353,8 +4322,7 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)static bool intel_dp_short_pulse (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base; +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));
to_i915() is unnecessary, all cases of dev_priv usage are for dev_priv->drm.
Quoted 155 lines
drivers/gpu/drm/i915/intel_dp.c +22
-31u8 sink_irq_vector =0 ;u8 old_sink_count = intel_dp->sink_count;bool ret;@@ -4393,13 +4361,13 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)DRM_DEBUG_DRIVER ("CP or sink specific irq unhandled\n" ); } -drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); +drm_modeset_lock (&dev_priv->drm.mode_config.connection_mutex,NULL );intel_dp_check_link_status (intel_dp); -drm_modeset_unlock (&dev->mode_config.connection_mutex); +drm_modeset_unlock (&dev_priv->drm.mode_config.connection_mutex);if (intel_dp->compliance.test_type ==DP_TEST_LINK_TRAINING ) {DRM_DEBUG_KMS ("Link Training Compliance Test requested\n" );/* Send a Hotplug Uevent to userspace to start modeset */ -drm_kms_helper_hotplug_event (intel_encoder->base.dev); +drm_kms_helper_hotplug_event (&dev_priv->drm); }return true;@@ -4463,8 +4431,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp)static enum drm_connector_status edp_detect (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));enum drm_connector_status status; status =intel_panel_detect (dev_priv);@@ -4720,22 +4687,21 @@ intel_dp_unset_edid(struct intel_dp *intel_dp) }static int -intel_dp_long_pulse (struct intel_connector *intel_connector) +intel_dp_long_pulse (struct intel_connector *connector) { -struct drm_connector *connector = &intel_connector->base; -struct intel_dp *intel_dp =intel_attached_dp (connector); -struct drm_device *dev = connector->dev; +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_dp *intel_dp =intel_attached_dp (&connector->base);enum drm_connector_status status;u8 sink_irq_vector =0 ; -WARN_ON (!drm_modeset_is_locked (&connector->dev->mode_config.connection_mutex)); +WARN_ON (!drm_modeset_is_locked (&dev_priv->drm.mode_config.connection_mutex)); -intel_display_power_get (to_i915 (dev), intel_dp->aux_power_domain); +intel_display_power_get (dev_priv, intel_dp->aux_power_domain);/* Can't disconnect eDP, but you can close the lid... */ if (intel_dp_is_edp (intel_dp)) status =edp_detect (intel_dp); -else if (intel_digital_port_connected (to_i915 (dev), +else if (intel_digital_port_connected (dev_priv,dp_to_dig_port (intel_dp))) status =intel_dp_detect_dpcd (intel_dp);else @@ -4806,7 +4772,7 @@ intel_dp_long_pulse(struct intel_connector *intel_connector) intel_dp->aux.i2c_defer_count =0 ;intel_dp_set_edid (intel_dp); -if (intel_dp_is_edp (intel_dp) || intel_connector->detect_edid) +if (intel_dp_is_edp (intel_dp) || connector->detect_edid) status = connector_status_connected; intel_dp->detect_done = true;@@ -4829,7 +4795,7 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)if (status != connector_status_connected && !intel_dp->is_mst)intel_dp_unset_edid (intel_dp); -intel_display_power_put (to_i915 (dev), intel_dp->aux_power_domain); +intel_display_power_put (dev_priv, intel_dp->aux_power_domain);return status; }@@ -4996,9 +4962,7 @@ void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder)static void intel_edp_panel_vdd_sanitize (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);@@ -5086,8 +5050,7 @@ enum irqreturn intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) {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 drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));enum irqreturn ret =IRQ_NONE ;if (long_hpd && intel_dig_port->base.type ==INTEL_OUTPUT_EDP ) {@@ -5546,8 +5509,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,void intel_edp_drrs_enable (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!crtc_state->has_drrs) {DRM_DEBUG_KMS ("Panel doesn't support DRRS\n" );@@ -5582,8 +5544,7 @@ void intel_edp_drrs_enable(struct intel_dp *intel_dp,void intel_edp_drrs_disable (struct intel_dp *intel_dp,const struct intel_crtc_state *old_crtc_state) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!old_crtc_state->has_drrs)return ;@@ -5766,7 +5727,7 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,/** * intel_dp_drrs_init - Init basic DRRS work and mutex. -* @intel_connector: eDP connector +* @connector: eDP connector * @fixed_mode: preferred mode of panel * * This function is called only once at driver load to initialize basic @@ -5778,12 +5739,10 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,* from VBT setting). */ static struct drm_display_mode * -intel_dp_drrs_init (struct intel_connector *intel_connector, -struct drm_display_mode *fixed_mode) +intel_dp_drrs_init (struct intel_connector *connector, +struct drm_display_mode *fixed_mode) { -struct drm_connector *connector = &intel_connector->base; -struct drm_device *dev = connector->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct drm_display_mode *downclock_mode =NULL ;INIT_DELAYED_WORK (&dev_priv->drrs.work, intel_edp_drrs_downclock_work);@@ -5799,8 +5758,8 @@ intel_dp_drrs_init(struct intel_connector *intel_connector,return NULL ; } - downclock_mode =intel_find_panel_downclock - (dev_priv, fixed_mode, connector); + downclock_mode =intel_find_panel_downclock (dev_priv, fixed_mode, + &connector->base);if (!downclock_mode) {DRM_DEBUG_KMS ("Downclock mode is not found. DRRS not supported\n" );
drivers/gpu/drm/i915/intel_dp.c intel_dp_drrs_init(struct intel_connector *intel_connector, · line 5779
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +1
-4@@ -5817,11 +5776,9 @@ intel_dp_drrs_init(struct intel_connector *intel_connector,static bool intel_edp_init_connector (struct intel_dp *intel_dp,struct intel_connector *intel_connector) { -struct drm_connector *connector = &intel_connector->base; -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *intel_encoder = &intel_dig_port->base; -struct drm_device *dev = intel_encoder->base.dev; +struct drm_device *dev =intel_dp_to_dev (intel_dp);
You have retained dev here but
drivers/gpu/drm/i915/intel_dp.c static bool intel_edp_init_connector(struct intel_dp *intel_dp, · line 5799
Quoted 11 lines
drivers/gpu/drm/i915/intel_dp.c +2
-1struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_connector *connector = &intel_connector->base;struct drm_display_mode *fixed_mode =NULL ;struct drm_display_mode *alt_fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;@@ -5839,7 +5796,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,* eDP and LVDS bail out early in this case to prevent interfering * with an already powered-on LVDS power sequencer. */ -if (intel_get_lvds_encoder (dev)) { +if (intel_get_lvds_encoder (&dev_priv->drm)) {
but dereferenced dev_priv->drm here.
drivers/gpu/drm/i915/intel_dp.c static bool intel_edp_init_connector(struct intel_dp *intel_dp, · line 5802
Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +0
-0WARN_ON (!(HAS_PCH_IBX (dev_priv) ||HAS_PCH_CPT (dev_priv)));DRM_INFO ("LVDS was detected, not registering eDP\n" );
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/10] drm/i915: Clean up DP code local variables and calling conventions
Quoted 303 lines · Dhinakaran
nits below.
Quoted 297 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
Eliminate a ton of pointless 'dev' variables in the DP code, and pass around '
dev_priv' instead of 'dev'.Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 151 ++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 97 deletions(-)drivers/gpu/drm/i915/intel_dp.c +26
-57@@ -438,10 +438,7 @@ intel_dp_pps_init(struct intel_dp *intel_dp);static void pps_lock (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *encoder = &intel_dig_port->base; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));/* * See vlv_power_sequencer_reset() why we need @@ -454,10 +451,7 @@ static void pps_lock(struct intel_dp *intel_dp)static void pps_unlock (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *encoder = &intel_dig_port->base; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));mutex_unlock (&dev_priv->pps_mutex);@@ -467,8 +461,8 @@ static void pps_unlock(struct intel_dp *intel_dp)static void vlv_power_sequencer_kick (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev);enum pipe pipe = intel_dp->pps_pipe;bool pll_enabled, release_cl_override = false;enum dpio_phy phy =DPIO_PHY (pipe);@@ -733,7 +727,6 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)void intel_power_sequencer_reset (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm;struct intel_encoder *encoder; if (WARN_ON(!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv) &&@@ -750,7 +743,7 @@ void intel_power_sequencer_reset(struct drm_i915_private *dev_priv)* should use them always. */ -for_each_intel_encoder (dev, encoder) { +for_each_intel_encoder (&dev_priv->drm, encoder) {struct intel_dp *intel_dp; if (encoder->type != INTEL_OUTPUT_DP &&@@ -832,8 +825,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code, {struct intel_dp *intel_dp =container_of (this,typeof (* intel_dp), edp_notifier); -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!intel_dp_is_edp (intel_dp) || code !=SYS_RESTART )return 0 ;@@ -863,8 +855,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code,static bool edp_have_panel_power (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);@@ -877,8 +868,7 @@ static bool edp_have_panel_power(struct intel_dp *intel_dp)static bool edp_have_panel_vdd (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);@@ -892,8 +882,7 @@ static bool edp_have_panel_vdd(struct intel_dp *intel_dp)static void intel_dp_check_edp (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!intel_dp_is_edp (intel_dp))return ;@@ -909,9 +898,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)static uint32_t intel_dp_aux_wait_done (struct intel_dp *intel_dp,bool has_aux_irq) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg;uint32_t status;bool done;@@ -1478,8 +1465,7 @@ static void intel_dp_set_clock(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) { - struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);const struct dp_link_dpll *divisor =NULL ;int i, count =0 ;@@ -1848,8 +1834,7 @@ void intel_dp_set_link_params(struct intel_dp *intel_dp,static void intel_dp_prepare (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) { -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port =dp_to_dig_port (intel_dp)->base.port;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);@@ -1945,8 +1930,7 @@ static void wait_panel_status(struct intel_dp *intel_dp, u32 mask, u32 value) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));i915_reg_t pp_stat_reg, pp_ctrl_reg;lockdep_assert_held (&dev_priv->pps_mutex);@@ -2022,8 +2006,7 @@ static void edp_wait_backlight_off(struct intel_dp *intel_dp)static u32 ironlake_get_pp_control (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 control;lockdep_assert_held (&dev_priv->pps_mutex);@@ -2044,9 +2027,8 @@ static u32 ironlake_get_pp_control(struct intel_dp *intel_dp)*/ static bool edp_panel_vdd_on (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev);u32 pp;i915_reg_t pp_stat_reg, pp_ctrl_reg;bool need_to_disable = !intel_dp->want_panel_vdd;@@ -2116,8 +2098,7 @@ void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)static void edp_panel_vdd_off_sync (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);u32 pp;@@ -2203,8 +2184,7 @@ static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)static void edp_panel_on (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;@@ -2262,8 +2242,7 @@ void intel_edp_panel_on(struct intel_dp *intel_dp)static void edp_panel_off (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;@@ -2311,9 +2290,7 @@ void intel_edp_panel_off(struct intel_dp *intel_dp)/* Enable backlight in the panel power control. */ static void _intel_edp_backlight_on (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;@@ -2356,8 +2333,7 @@ void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state,/* Disable backlight in the panel power control. */ static void _intel_edp_backlight_off (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;@@ -2560,10 +2536,9 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode)static bool intel_dp_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port =dp_to_dig_port (intel_dp)->base.port; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);u32 tmp;bool ret;@@ -2612,10 +2587,9 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder,static void intel_dp_get_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);u32 tmp, flags =0 ; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port =dp_to_dig_port (intel_dp)->base.port;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);@@ -2782,9 +2756,8 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp, uint32_t *DP, uint8_t dp_train_pat) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = intel_dig_port->base.port;if (dp_train_pat &DP_TRAINING_PATTERN_MASK )@@ -2868,8 +2841,7 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp,static void intel_dp_enable_port (struct intel_dp *intel_dp,const struct intel_crtc_state *old_crtc_state) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));/* enable with pattern 1 (as per spec) */ @@ -2893,9 +2865,8 @@ static void intel_enable_dp(struct intel_encoder *encoder,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_dp *intel_dp =enc_to_intel_dp (&encoder->base); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);uint32_t dp_reg =I915_READ (intel_dp->output_reg);enum pipe pipe = crtc->pipe;@@ -3519,10 +3490,9 @@ gen7_edp_signal_levels(uint8_t train_set)void intel_dp_set_signal_levels (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);enum port port = intel_dig_port->base.port; -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t signal_levels, mask =0 ;uint8_t train_set = intel_dp->train_set[0 ];@@ -3577,9 +3547,8 @@ intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,void intel_dp_set_idle_link_train (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = intel_dig_port->base.port;uint32_t val;
Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c intel_dp_retrain_link(struct intel_dp *intel_dp) · line 4275
Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +1
-0@@ -4303,11 +4272,11 @@ intel_dp_retrain_link(struct intel_dp *intel_dp)static void intel_dp_check_link_status (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));You convert it back again to
drm_device.
Actually where I want to go next is changing intel_dp_to_dev() into intel_dp_to_i915(). So at that point things will not look so odd.
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +1
-2struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base; -struct drm_device *dev =intel_dp_to_dev (intel_dp);u8 link_status[DP_LINK_STATUS_SIZE ]; -WARN_ON (!drm_modeset_is_locked (&dev->mode_config.connection_mutex)); +WARN_ON (!drm_modeset_is_locked (&dev_priv->drm.mode_config.connection_mutex));
Quoted 12 lines
drivers/gpu/drm/i915/intel_dp.c intel_dp_check_link_status(struct intel_dp *intel_dp) · line 4325
Quoted 9 lines
drivers/gpu/drm/i915/intel_dp.c +1
-2if (!intel_dp_get_link_status (intel_dp, link_status)) {DRM_ERROR ("Failed to get link status\n" );@@ -4353,8 +4322,7 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)static bool intel_dp_short_pulse (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base; +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));
to_i915()is unnecessary, all cases ofdev_privusage are fordev_priv->drm.
similar reasoning here
Quoted 167 lines
Quoted 157 lines
drivers/gpu/drm/i915/intel_dp.c +22
-31u8 sink_irq_vector =0 ;u8 old_sink_count = intel_dp->sink_count;bool ret;@@ -4393,13 +4361,13 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)DRM_DEBUG_DRIVER ("CP or sink specific irq unhandled\n" ); } -drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); +drm_modeset_lock (&dev_priv->drm.mode_config.connection_mutex,NULL );intel_dp_check_link_status (intel_dp); -drm_modeset_unlock (&dev->mode_config.connection_mutex); +drm_modeset_unlock (&dev_priv->drm.mode_config.connection_mutex);if (intel_dp->compliance.test_type ==DP_TEST_LINK_TRAINING ) {DRM_DEBUG_KMS ("Link Training Compliance Test requested\n" );/* Send a Hotplug Uevent to userspace to start modeset */ -drm_kms_helper_hotplug_event (intel_encoder->base.dev); +drm_kms_helper_hotplug_event (&dev_priv->drm); }return true;@@ -4463,8 +4431,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp)static enum drm_connector_status edp_detect (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));enum drm_connector_status status; status =intel_panel_detect (dev_priv);@@ -4720,22 +4687,21 @@ intel_dp_unset_edid(struct intel_dp *intel_dp) }static int -intel_dp_long_pulse (struct intel_connector *intel_connector) +intel_dp_long_pulse (struct intel_connector *connector) { -struct drm_connector *connector = &intel_connector->base; -struct intel_dp *intel_dp =intel_attached_dp (connector); -struct drm_device *dev = connector->dev; +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_dp *intel_dp =intel_attached_dp (&connector->base);enum drm_connector_status status;u8 sink_irq_vector =0 ; -WARN_ON (!drm_modeset_is_locked (&connector->dev->mode_config.connection_mutex)); +WARN_ON (!drm_modeset_is_locked (&dev_priv->drm.mode_config.connection_mutex)); -intel_display_power_get (to_i915 (dev), intel_dp->aux_power_domain); +intel_display_power_get (dev_priv, intel_dp->aux_power_domain);/* Can't disconnect eDP, but you can close the lid... */ if (intel_dp_is_edp (intel_dp)) status =edp_detect (intel_dp); -else if (intel_digital_port_connected (to_i915 (dev), +else if (intel_digital_port_connected (dev_priv,dp_to_dig_port (intel_dp))) status =intel_dp_detect_dpcd (intel_dp);else @@ -4806,7 +4772,7 @@ intel_dp_long_pulse(struct intel_connector *intel_connector) intel_dp->aux.i2c_defer_count =0 ;intel_dp_set_edid (intel_dp); -if (intel_dp_is_edp (intel_dp) || intel_connector->detect_edid) +if (intel_dp_is_edp (intel_dp) || connector->detect_edid) status = connector_status_connected; intel_dp->detect_done = true;@@ -4829,7 +4795,7 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)if (status != connector_status_connected && !intel_dp->is_mst)intel_dp_unset_edid (intel_dp); -intel_display_power_put (to_i915 (dev), intel_dp->aux_power_domain); +intel_display_power_put (dev_priv, intel_dp->aux_power_domain);return status; }@@ -4996,9 +4962,7 @@ void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder)static void intel_edp_panel_vdd_sanitize (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);@@ -5086,8 +5050,7 @@ enum irqreturn intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) {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 drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));enum irqreturn ret =IRQ_NONE ;if (long_hpd && intel_dig_port->base.type ==INTEL_OUTPUT_EDP ) {@@ -5546,8 +5509,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,void intel_edp_drrs_enable (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!crtc_state->has_drrs) {DRM_DEBUG_KMS ("Panel doesn't support DRRS\n" );@@ -5582,8 +5544,7 @@ void intel_edp_drrs_enable(struct intel_dp *intel_dp,void intel_edp_drrs_disable (struct intel_dp *intel_dp,const struct intel_crtc_state *old_crtc_state) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!old_crtc_state->has_drrs)return ;@@ -5766,7 +5727,7 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,/** * intel_dp_drrs_init - Init basic DRRS work and mutex. -* @intel_connector: eDP connector +* @connector: eDP connector * @fixed_mode: preferred mode of panel * * This function is called only once at driver load to initialize basic @@ -5778,12 +5739,10 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,* from VBT setting). */ static struct drm_display_mode * -intel_dp_drrs_init (struct intel_connector *intel_connector, -struct drm_display_mode *fixed_mode) +intel_dp_drrs_init (struct intel_connector *connector, +struct drm_display_mode *fixed_mode) { -struct drm_connector *connector = &intel_connector->base; -struct drm_device *dev = connector->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct drm_display_mode *downclock_mode =NULL ;INIT_DELAYED_WORK (&dev_priv->drrs.work, intel_edp_drrs_downclock_work);@@ -5799,8 +5758,8 @@ intel_dp_drrs_init(struct intel_connector *intel_connector,return NULL ; } - downclock_mode =intel_find_panel_downclock - (dev_priv, fixed_mode, connector); + downclock_mode =intel_find_panel_downclock (dev_priv, fixed_mode, + &connector->base);if (!downclock_mode) {DRM_DEBUG_KMS ("Downclock mode is not found. DRRS not supported\n" );drivers/gpu/drm/i915/intel_dp.c intel_dp_drrs_init(struct intel_connector *intel_connector, · line 5779
Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +1
-4@@ -5817,11 +5776,9 @@ intel_dp_drrs_init(struct intel_connector *intel_connector,static bool intel_edp_init_connector (struct intel_dp *intel_dp,struct intel_connector *intel_connector) { -struct drm_connector *connector = &intel_connector->base; -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *intel_encoder = &intel_dig_port->base; -struct drm_device *dev = intel_encoder->base.dev; +struct drm_device *dev =intel_dp_to_dev (intel_dp);You have retained dev here but
Quoted 13 lines
drivers/gpu/drm/i915/intel_dp.c static bool intel_edp_init_connector(struct intel_dp *intel_dp, · line 5799
Quoted 11 lines
drivers/gpu/drm/i915/intel_dp.c +2
-1struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_connector *connector = &intel_connector->base;struct drm_display_mode *fixed_mode =NULL ;struct drm_display_mode *alt_fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;@@ -5839,7 +5796,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,* eDP and LVDS bail out early in this case to prevent interfering * with an already powered-on LVDS power sequencer. */ -if (intel_get_lvds_encoder (dev)) { +if (intel_get_lvds_encoder (&dev_priv->drm)) {but dereferenced
dev_priv->drmhere.
A bit redundant indeed. Although we should actually change intel_get_lvds_encoder() to take dev_priv instead of dev, at which point the issue becomes moot.
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +0
-0WARN_ON (!(HAS_PCH_IBX (dev_priv) ||HAS_PCH_CPT (dev_priv)));DRM_INFO ("LVDS was detected, not registering eDP\n" );
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 10/10 drm/i915: Clean up DP code local variables and calling conventions
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Eliminate a ton of pointless 'dev' variables in the DP code, and pass around 'dev_priv' instead of 'dev'.
v2: Rebase
--- drivers/gpu/drm/i915/intel_dp.c | 151 ++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 97 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +54 -97
@@ -438,10 +438,7 @@ intel_dp_pps_init(struct intel_dp *intel_dp);static void pps_lock (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *encoder = &intel_dig_port->base; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));/* * See vlv_power_sequencer_reset() why we need
@@ -454,10 +451,7 @@ static void pps_lock(struct intel_dp *intel_dp)static void pps_unlock (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *encoder = &intel_dig_port->base; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));mutex_unlock (&dev_priv->pps_mutex);
@@ -467,8 +461,8 @@ static void pps_unlock(struct intel_dp *intel_dp)static void vlv_power_sequencer_kick (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev);enum pipe pipe = intel_dp->pps_pipe;bool pll_enabled, release_cl_override = false;enum dpio_phy phy =DPIO_PHY (pipe);
@@ -733,7 +727,6 @@ vlv_initial_power_sequencer_setup(struct intel_dp *intel_dp)void intel_power_sequencer_reset (struct drm_i915_private *dev_priv) { -struct drm_device *dev = &dev_priv->drm;struct intel_encoder *encoder; if (WARN_ON(!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv) &&
@@ -750,7 +743,7 @@ void intel_power_sequencer_reset(struct drm_i915_private *dev_priv)* should use them always. */ -for_each_intel_encoder (dev, encoder) { +for_each_intel_encoder (&dev_priv->drm, encoder) {struct intel_dp *intel_dp; if (encoder->type != INTEL_OUTPUT_DP &&
@@ -832,8 +825,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code, {struct intel_dp *intel_dp =container_of (this,typeof (* intel_dp), edp_notifier); -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!intel_dp_is_edp (intel_dp) || code !=SYS_RESTART )return 0 ;
@@ -863,8 +855,7 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code,static bool edp_have_panel_power (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);
@@ -877,8 +868,7 @@ static bool edp_have_panel_power(struct intel_dp *intel_dp)static bool edp_have_panel_vdd (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);
@@ -892,8 +882,7 @@ static bool edp_have_panel_vdd(struct intel_dp *intel_dp)static void intel_dp_check_edp (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!intel_dp_is_edp (intel_dp))return ;
@@ -909,9 +898,7 @@ intel_dp_check_edp(struct intel_dp *intel_dp)static uint32_t intel_dp_aux_wait_done (struct intel_dp *intel_dp,bool has_aux_irq) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg;uint32_t status;bool done;
@@ -1478,8 +1465,7 @@ static void intel_dp_set_clock(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) { - struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);const struct dp_link_dpll *divisor =NULL ;int i, count =0 ;
@@ -1848,8 +1834,7 @@ void intel_dp_set_link_params(struct intel_dp *intel_dp,static void intel_dp_prepare (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) { -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port = encoder->port;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);
@@ -1945,8 +1930,7 @@ static void wait_panel_status(struct intel_dp *intel_dp, u32 mask, u32 value) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));i915_reg_t pp_stat_reg, pp_ctrl_reg;lockdep_assert_held (&dev_priv->pps_mutex);
@@ -2022,8 +2006,7 @@ static void edp_wait_backlight_off(struct intel_dp *intel_dp)static u32 ironlake_get_pp_control (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 control;lockdep_assert_held (&dev_priv->pps_mutex);
@@ -2044,9 +2027,8 @@ static u32 ironlake_get_pp_control(struct intel_dp *intel_dp)*/ static bool edp_panel_vdd_on (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev);u32 pp;i915_reg_t pp_stat_reg, pp_ctrl_reg;bool need_to_disable = !intel_dp->want_panel_vdd;
@@ -2116,8 +2098,7 @@ void intel_edp_panel_vdd_on(struct intel_dp *intel_dp)static void edp_panel_vdd_off_sync (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);u32 pp;
@@ -2203,8 +2184,7 @@ static void edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync)static void edp_panel_on (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;
@@ -2262,8 +2242,7 @@ void intel_edp_panel_on(struct intel_dp *intel_dp)static void edp_panel_off (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;
@@ -2311,9 +2290,7 @@ void intel_edp_panel_off(struct intel_dp *intel_dp)/* Enable backlight in the panel power control. */ static void _intel_edp_backlight_on (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;
@@ -2356,8 +2333,7 @@ void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state,/* Disable backlight in the panel power control. */ static void _intel_edp_backlight_off (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u32 pp;i915_reg_t pp_ctrl_reg;
@@ -2560,10 +2536,9 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode)static bool intel_dp_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);enum port port = encoder->port; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);u32 tmp;bool ret;
@@ -2612,10 +2587,9 @@ static bool intel_dp_get_hw_state(struct intel_encoder *encoder,static void intel_dp_get_config (struct intel_encoder *encoder,struct intel_crtc_state *pipe_config) { +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);u32 tmp, flags =0 ; -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = encoder->port;struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);
@@ -2782,9 +2756,8 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp, uint32_t *DP, uint8_t dp_train_pat) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = intel_dig_port->base.port;if (dp_train_pat &DP_TRAINING_PATTERN_MASK )
@@ -2868,8 +2841,7 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp,static void intel_dp_enable_port (struct intel_dp *intel_dp,const struct intel_crtc_state *old_crtc_state) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));/* enable with pattern 1 (as per spec) */
@@ -2893,9 +2865,8 @@ static void intel_enable_dp(struct intel_encoder *encoder,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_dp *intel_dp =enc_to_intel_dp (&encoder->base); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc);uint32_t dp_reg =I915_READ (intel_dp->output_reg);enum pipe pipe = crtc->pipe;
@@ -3519,10 +3490,9 @@ gen7_edp_signal_levels(uint8_t train_set)void intel_dp_set_signal_levels (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);enum port port = intel_dig_port->base.port; -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);uint32_t signal_levels, mask =0 ;uint8_t train_set = intel_dp->train_set[0 ];
@@ -3577,9 +3547,8 @@ intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,void intel_dp_set_idle_link_train (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = intel_dig_port->base.port;uint32_t val;
@@ -4303,11 +4272,11 @@ intel_dp_retrain_link(struct intel_dp *intel_dp)static void intel_dp_check_link_status (struct intel_dp *intel_dp) { +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base; -struct drm_device *dev =intel_dp_to_dev (intel_dp);u8 link_status[DP_LINK_STATUS_SIZE ]; -WARN_ON (!drm_modeset_is_locked (&dev->mode_config.connection_mutex)); +WARN_ON (!drm_modeset_is_locked (&dev_priv->drm.mode_config.connection_mutex));if (!intel_dp_get_link_status (intel_dp, link_status)) {DRM_ERROR ("Failed to get link status\n" );
@@ -4353,8 +4322,7 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)static bool intel_dp_short_pulse (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct intel_encoder *intel_encoder = &dp_to_dig_port (intel_dp)->base; +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));u8 sink_irq_vector =0 ;u8 old_sink_count = intel_dp->sink_count;bool ret;
@@ -4393,13 +4361,13 @@ intel_dp_short_pulse(struct intel_dp *intel_dp)DRM_DEBUG_DRIVER ("CP or sink specific irq unhandled\n" ); } -drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); +drm_modeset_lock (&dev_priv->drm.mode_config.connection_mutex,NULL );intel_dp_check_link_status (intel_dp); -drm_modeset_unlock (&dev->mode_config.connection_mutex); +drm_modeset_unlock (&dev_priv->drm.mode_config.connection_mutex);if (intel_dp->compliance.test_type ==DP_TEST_LINK_TRAINING ) {DRM_DEBUG_KMS ("Link Training Compliance Test requested\n" );/* Send a Hotplug Uevent to userspace to start modeset */ -drm_kms_helper_hotplug_event (intel_encoder->base.dev); +drm_kms_helper_hotplug_event (&dev_priv->drm); }return true;
@@ -4463,8 +4431,7 @@ intel_dp_detect_dpcd(struct intel_dp *intel_dp)static enum drm_connector_status edp_detect (struct intel_dp *intel_dp) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));enum drm_connector_status status; status =intel_panel_detect (dev_priv);
@@ -4720,22 +4687,21 @@ intel_dp_unset_edid(struct intel_dp *intel_dp) }static int -intel_dp_long_pulse (struct intel_connector *intel_connector) +intel_dp_long_pulse (struct intel_connector *connector) { -struct drm_connector *connector = &intel_connector->base; -struct intel_dp *intel_dp =intel_attached_dp (connector); -struct drm_device *dev = connector->dev; +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_dp *intel_dp =intel_attached_dp (&connector->base);enum drm_connector_status status;u8 sink_irq_vector =0 ; -WARN_ON (!drm_modeset_is_locked (&connector->dev->mode_config.connection_mutex)); +WARN_ON (!drm_modeset_is_locked (&dev_priv->drm.mode_config.connection_mutex)); -intel_display_power_get (to_i915 (dev), intel_dp->aux_power_domain); +intel_display_power_get (dev_priv, intel_dp->aux_power_domain);/* Can't disconnect eDP, but you can close the lid... */ if (intel_dp_is_edp (intel_dp)) status =edp_detect (intel_dp); -else if (intel_digital_port_connected (to_i915 (dev), +else if (intel_digital_port_connected (dev_priv,dp_to_dig_port (intel_dp))) status =intel_dp_detect_dpcd (intel_dp);else
@@ -4806,7 +4772,7 @@ intel_dp_long_pulse(struct intel_connector *intel_connector) intel_dp->aux.i2c_defer_count =0 ;intel_dp_set_edid (intel_dp); -if (intel_dp_is_edp (intel_dp) || intel_connector->detect_edid) +if (intel_dp_is_edp (intel_dp) || connector->detect_edid) status = connector_status_connected; intel_dp->detect_done = true;
@@ -4829,7 +4795,7 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)if (status != connector_status_connected && !intel_dp->is_mst)intel_dp_unset_edid (intel_dp); -intel_display_power_put (to_i915 (dev), intel_dp->aux_power_domain); +intel_display_power_put (dev_priv, intel_dp->aux_power_domain);return status; }
@@ -4996,9 +4962,7 @@ void intel_dp_encoder_suspend(struct intel_encoder *intel_encoder)static void intel_edp_panel_vdd_sanitize (struct intel_dp *intel_dp) { -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct drm_device *dev = intel_dig_port->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));lockdep_assert_held (&dev_priv->pps_mutex);
@@ -5086,8 +5050,7 @@ enum irqreturn intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) {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 drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));enum irqreturn ret =IRQ_NONE ;if (long_hpd && intel_dig_port->base.type ==INTEL_OUTPUT_EDP ) {
@@ -5546,8 +5509,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,void intel_edp_drrs_enable (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!crtc_state->has_drrs) {DRM_DEBUG_KMS ("Panel doesn't support DRRS\n" );
@@ -5582,8 +5544,7 @@ void intel_edp_drrs_enable(struct intel_dp *intel_dp,void intel_edp_drrs_disable (struct intel_dp *intel_dp,const struct intel_crtc_state *old_crtc_state) { -struct drm_device *dev =intel_dp_to_dev (intel_dp); -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (intel_dp_to_dev (intel_dp));if (!old_crtc_state->has_drrs)return ;
@@ -5766,7 +5727,7 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,/** * intel_dp_drrs_init - Init basic DRRS work and mutex. -* @intel_connector: eDP connector +* @connector: eDP connector * @fixed_mode: preferred mode of panel * * This function is called only once at driver load to initialize basic
@@ -5778,12 +5739,10 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,* from VBT setting). */ static struct drm_display_mode * -intel_dp_drrs_init (struct intel_connector *intel_connector, -struct drm_display_mode *fixed_mode) +intel_dp_drrs_init (struct intel_connector *connector, +struct drm_display_mode *fixed_mode) { -struct drm_connector *connector = &intel_connector->base; -struct drm_device *dev = connector->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct drm_display_mode *downclock_mode =NULL ;INIT_DELAYED_WORK (&dev_priv->drrs.work, intel_edp_drrs_downclock_work);
@@ -5799,8 +5758,8 @@ intel_dp_drrs_init(struct intel_connector *intel_connector,return NULL ; } - downclock_mode =intel_find_panel_downclock - (dev_priv, fixed_mode, connector); + downclock_mode =intel_find_panel_downclock (dev_priv, fixed_mode, + &connector->base);if (!downclock_mode) {DRM_DEBUG_KMS ("Downclock mode is not found. DRRS not supported\n" );
@@ -5817,11 +5776,9 @@ intel_dp_drrs_init(struct intel_connector *intel_connector,static bool intel_edp_init_connector (struct intel_dp *intel_dp,struct intel_connector *intel_connector) { -struct drm_connector *connector = &intel_connector->base; -struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); -struct intel_encoder *intel_encoder = &intel_dig_port->base; -struct drm_device *dev = intel_encoder->base.dev; +struct drm_device *dev =intel_dp_to_dev (intel_dp);struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_connector *connector = &intel_connector->base;struct drm_display_mode *fixed_mode =NULL ;struct drm_display_mode *alt_fixed_mode =NULL ;struct drm_display_mode *downclock_mode =NULL ;
@@ -5839,7 +5796,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,* eDP and LVDS bail out early in this case to prevent interfering * with an already powered-on LVDS power sequencer. */ -if (intel_get_lvds_encoder (dev)) { +if (intel_get_lvds_encoder (&dev_priv->drm)) {WARN_ON (!(HAS_PCH_IBX (dev_priv) ||HAS_PCH_CPT (dev_priv)));DRM_INFO ("LVDS was detected, not registering eDP\n" );
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for drm/i915: Nuke dig_port->port and assorted cleanups
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: drm/i915: Nuke dig_port->port and assorted cleanups
URL : https://patchwork.freedesktop.org/series/32928/
State : warning
== Summary ==
Series 32928v1 drm/i915: Nuke dig_port->port and assorted cleanups
https://patchwork.freedesktop.org/api/1.0/series/32928/revisions/1/mbox/
Test gem_mmap_gtt:
Subgroup basic-read-no-prefault:
dmesg-warn -> PASS (fi-bsw-n3050)
Test gem_ringfill:
Subgroup basic-default:
pass -> SKIP (fi-bsw-n3050)
Test kms_addfb_basic:
Subgroup invalid-set-prop:
incomplete -> PASS (fi-cnl-y)
Test kms_flip:
Subgroup basic-flip-vs-dpms:
notrun -> INCOMPLETE (fi-cnl-y)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> INCOMPLETE (fi-kbl-7560u) fdo#102846
Test drv_module_reload:
Subgroup basic-reload-inject:
pass -> DMESG-WARN (fi-bsw-n3050)fdo#102846 https://bugs.freedesktop.org/show_bug.cgi?id=102846
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:444s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:451s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:380s fi-bsw-n3050 total:289 pass:241 dwarn:1 dfail:0 fail:0 skip:47 time:544s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:280s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:513s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:505s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:512s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:496s fi-cfl-s total:289 pass:253 dwarn:4 dfail:0 fail:0 skip:32 time:558s fi-cnl-y total:217 pass:196 dwarn:0 dfail:0 fail:0 skip:20 fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:433s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:267s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:583s fi-glk-dsi total:289 pass:258 dwarn:0 dfail:0 fail:1 skip:30 time:493s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:432s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:432s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:434s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:500s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:465s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:495s fi-kbl-7560u total:246 pass:229 dwarn:0 dfail:0 fail:0 skip:16 fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:481s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:584s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:570s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:470s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:595s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:650s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:519s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:499s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:458s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:582s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:431s
411ec53a58b3cf22efe7e8c7e6af94945c15568d drm-tip: 2017y-10m-31d-18h-16m-29s UTC integration manifest d4826b1e0136 drm/i915: Clean up DP code local variables and calling conventions c4cdb306d950 drm/i915: Clean up PPS code calling conventionsf32265769a0c drm/i915: Nuke intel_digital_port->porta2d56e82ad90 drm/i915: Replace dig_port->port with encoder port for BXT DPLL selection 7a0ad2c31e0a drm/i915: Eliminate crtc->config usage from CRT codea8cc74c811fd drm/i915: Pass crtc state to DPIO PHY functionsf5828a2aae0d drm/i915: Eliminate some encoder->crtc usage from TV code8e9d9cab31e1 drm/i915: Eliminate some encoder->crtc usage from SDVO code 1c04393578a0 drm/i915: Eliminate some encoder->crtc usage from DSI code5f1fe1e2d77f drm/i915: Eliminate some encoder->crtc usage from DP code
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6283/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
The main attraction of this series is removal of
intel_digital_port->port. Ever since the introduction ofintel_encoder->portit has been redundant, and I figured it's high time we kill it.
Quoted 7 lines
The other stuff is mostly elimination of uses of the legacy
encoder->crtcpointer andintel_crtc->config. While those do still work we do kinda want to kill them off, and instead use the proper atomic states instead. Having multiple ways to do things also tends to confuse people so the sooner we get this cleaned utp the better. I think I mostly got the the encoder side done now, apart from link training related code which will need more thought.
For starters, on the series,
I glanced through everything but I can't say I reviewed it yet.
BR,
Jani.
Quoted 34 lines
Entire series available here:
git://github.com/vsyrjala/linux.gitnuke_dig_port_port_4Ville Syrjälä (10):
drm/i915: Eliminate someencoder->crtcusage from DP code drm/i915: Eliminate someencoder->crtcusage from DSI code drm/i915: Eliminate someencoder->crtcusage from SDVO code drm/i915: Eliminate someencoder->crtcusage from TV code drm/i915: Pass crtc state to DPIO PHY functions drm/i915: Eliminatecrtc->configusage from CRT code drm/i915: Replacedig_port->portwith encoder port for BXT DPLL
selection
drm/i915: Nukeintel_digital_port->port
drm/i915: Clean up PPS code calling conventions drm/i915: Clean up DP code local variables and calling conventionsdrivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 19 +- drivers/gpu/drm/i915/intel_crt.c | 44 ++-- drivers/gpu/drm/i915/intel_ddi.c | 13 +- drivers/gpu/drm/i915/intel_display.c | 13 +- drivers/gpu/drm/i915/intel_dp.c | 432 +++++++++++++++------------------- drivers/gpu/drm/i915/intel_dp_mst.c | 6 +- drivers/gpu/drm/i915/intel_dpio_phy.c | 99 ++++---- drivers/gpu/drm/i915/intel_dpll_mgr.c | 10 +- drivers/gpu/drm/i915/intel_drv.h | 5 +- drivers/gpu/drm/i915/intel_dsi.c | 17 +- drivers/gpu/drm/i915/intel_hdmi.c | 34 ++- drivers/gpu/drm/i915/intel_pipe_crc.c | 4 +- drivers/gpu/drm/i915/intel_psr.c | 4 +- drivers/gpu/drm/i915/intel_sdvo.c | 4 +- drivers/gpu/drm/i915/intel_tv.c | 4 +- 16 files changed, 316 insertions(+), 394 deletions(-)
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Pandiyan, Dhinakaran
Reviewed-byQuoted 16 lines · Jani Nikula
Quoted 7 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
The main attraction of this series is removal of
intel_digital_port->port. Ever since the introduction ofintel_encoder->portit has been redundant, and I figured it's high time we kill it.Quoted 7 lines
The other stuff is mostly elimination of uses of the legacy
encoder->crtcpointer andintel_crtc->config. While those do still work we do kinda want to kill them off, and instead use the proper atomic states instead. Having multiple ways to do things also tends to confuse people so the sooner we get this cleaned utp the better. I think I mostly got the the encoder side done now, apart from link training related code which will need more thought.
Quoted 9 lines
For starters, on the series,
Acked-by Jani Nikula <[email protected]>I glanced through everything but I can't say I reviewed it yet.
BR,
Jani.
Only nits in a couple of places, you can address them if you want to.
series.
Quoted 26 lines
Quoted 26 lines
Entire series available here:
git://github.com/vsyrjala/linux.gitnuke_dig_port_port_4Ville Syrjälä (10):
drm/i915: Eliminate someencoder->crtcusage from DP code drm/i915: Eliminate someencoder->crtcusage from DSI code drm/i915: Eliminate someencoder->crtcusage from SDVO code drm/i915: Eliminate someencoder->crtcusage from TV code drm/i915: Pass crtc state to DPIO PHY functions drm/i915: Eliminatecrtc->configusage from CRT code drm/i915: Replacedig_port->portwith encoder port for BXT DPLL
selection
drm/i915: Nukeintel_digital_port->port
drm/i915: Clean up PPS code calling conventions drm/i915: Clean up DP code local variables and calling conventionsdrivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 19 +- drivers/gpu/drm/i915/intel_crt.c | 44 ++-- drivers/gpu/drm/i915/intel_ddi.c | 13 +- drivers/gpu/drm/i915/intel_display.c | 13 +- drivers/gpu/drm/i915/intel_dp.c | 432 +++++++++++++++------------------- drivers/gpu/drm/i915/intel_dp_mst.c | 6 +- drivers/gpu/drm/i915/intel_dpio_phy.c | 99 ++++---- drivers/gpu/drm/i915/intel_dpll_mgr.c | 10 +-
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_drv.h | 5 +- drivers/gpu/drm/i915/intel_dsi.c | 17 +- drivers/gpu/drm/i915/intel_hdmi.c | 34 ++- drivers/gpu/drm/i915/intel_pipe_crc.c | 4 +- drivers/gpu/drm/i915/intel_psr.c | 4 +- drivers/gpu/drm/i915/intel_sdvo.c | 4 +- drivers/gpu/drm/i915/intel_tv.c | 4 +- 16 files changed, 316 insertions(+), 394 deletions(-)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 26 lines · Dhinakaran
Quoted 22 lines · Jani Nikula
Quoted 7 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
The main attraction of this series is removal of
intel_digital_port->port. Ever since the introduction ofintel_encoder->portit has been redundant, and I figured it's high time we kill it.Quoted 7 lines
The other stuff is mostly elimination of uses of the legacy
encoder->crtcpointer andintel_crtc->config. While those do still work we do kinda want to kill them off, and instead use the proper atomic states instead. Having multiple ways to do things also tends to confuse people so the sooner we get this cleaned utp the better. I think I mostly got the the encoder side done now, apart from link training related code which will need more thought.For starters, on the series,
Acked-by Jani Nikula <[email protected]>I glanced through everything but I can't say I reviewed it yet.
Quoted 7 lines
Quoted 3 lines
BR,
Jani.Only nits in a couple of places, you can address them if you want to.
Reviewed-by Dhinakaran Pandiyan <[email protected]> for theseries.
Series pushed to dinq. Thanks for the review.
Quoted 36 lines
Quoted 36 lines
Quoted 35 lines
Entire series available here:
git://github.com/vsyrjala/linux.gitnuke_dig_port_port_4Ville Syrjälä (10):
drm/i915: Eliminate someencoder->crtcusage from DP code drm/i915: Eliminate someencoder->crtcusage from DSI code drm/i915: Eliminate someencoder->crtcusage from SDVO code drm/i915: Eliminate someencoder->crtcusage from TV code drm/i915: Pass crtc state to DPIO PHY functions drm/i915: Eliminatecrtc->configusage from CRT code drm/i915: Replacedig_port->portwith encoder port for BXT DPLL
selection
drm/i915: Nukeintel_digital_port->port
drm/i915: Clean up PPS code calling conventions drm/i915: Clean up DP code local variables and calling conventionsdrivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 19 +- drivers/gpu/drm/i915/intel_crt.c | 44 ++-- drivers/gpu/drm/i915/intel_ddi.c | 13 +- drivers/gpu/drm/i915/intel_display.c | 13 +- drivers/gpu/drm/i915/intel_dp.c | 432 +++++++++++++++------------------- drivers/gpu/drm/i915/intel_dp_mst.c | 6 +- drivers/gpu/drm/i915/intel_dpio_phy.c | 99 ++++---- drivers/gpu/drm/i915/intel_dpll_mgr.c | 10 +- drivers/gpu/drm/i915/intel_drv.h | 5 +- drivers/gpu/drm/i915/intel_dsi.c | 17 +- drivers/gpu/drm/i915/intel_hdmi.c | 34 ++- drivers/gpu/drm/i915/intel_pipe_crc.c | 4 +- drivers/gpu/drm/i915/intel_psr.c | 4 +- drivers/gpu/drm/i915/intel_sdvo.c | 4 +- drivers/gpu/drm/i915/intel_tv.c | 4 +- 16 files changed, 316 insertions(+), 394 deletions(-)
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Nuke dig_port->port and assorted cleanups (rev3)
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: drm/i915: Nuke dig_port->port and assorted cleanups (rev3)
URL : https://patchwork.freedesktop.org/series/32928/
State : success
== Summary ==
Series 32928v3 drm/i915: Nuke dig_port->port and assorted cleanups
https://patchwork.freedesktop.org/api/1.0/series/32928/revisions/3/mbox/
Test gem_sync:
Subgroup basic-store-all:
fail -> PASS (fi-ivb-3520m) fdo#100007
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
pass -> FAIL (fi-gdg-551) fdo#102618fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#102618 https://bugs.freedesktop.org/show_bug.cgi?id=102618
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:450s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:453s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:381s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:539s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:274s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:495s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:502s fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:494s fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:488s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:430s fi-gdg-551 total:289 pass:177 dwarn:1 dfail:0 fail:2 skip:109 time:271s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:538s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:427s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:438s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:428s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:483s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:458s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:491s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:525s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:472s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:538s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:571s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:451s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:543s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:562s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:517s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:492s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:462s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:556s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:424s Blacklisted hosts: fi-cfl-s total:289 pass:254 dwarn:3 dfail:0 fail:0 skip:32 time:537s fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:568s fi-glk-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:488s
65dc54b704d3ee0486f9f5b11f00c28973f783a2 drm-tip: 2017y-11m-09d-08h-53m-46s UTC integration manifest 66eca6989fa5 drm/i915: Clean up DP code local variables and calling conventions 1437fc990e6e drm/i915: Clean up PPS code calling conventionsa82649720524 drm/i915: Nuke intel_digital_port->porte483a33f6279 drm/i915: Replace dig_port->port with encoder port for BXT DPLL selection d14af6b52647 drm/i915: Eliminate crtc->config usage from CRT codea8a9c5ca38fb drm/i915: Pass crtc state to DPIO PHY functions5136595f5130 drm/i915: Eliminate some encoder->crtc usage from TV codeeebb0a4a4cc7 drm/i915: Eliminate some encoder->crtc usage from SDVO code 75b9abc7749a drm/i915: Eliminate some encoder->crtc usage from DSI code85abe9744a15 drm/i915: Eliminate some encoder->crtc usage from DP code
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7040/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: Nuke dig_port->port and assorted cleanups (rev3)
In reply to Ville Syrjala== Series Details ==
== Series Details ==
Series: drm/i915: Nuke dig_port->port and assorted cleanups (rev3)
URL : https://patchwork.freedesktop.org/series/32928/
State : success
== Summary ==
shard-hsw total:2584 pass:1452 dwarn:2 dfail:2 fail:10 skip:1118 time:9347s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7040/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx