| Message ID | b133e7ed50ae860e81916fd7a44947397e1df641.1730740629.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/display: convert display feature helpers to struct intel_display | expand |
On Mon, 2024-11-04 at 19:19 +0200, Jani Nikula wrote: > Convert HAS_DP20() to struct intel_display. Do minimal drive-by > conversions to struct intel_display in the callers while at it. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/intel_audio.c | 7 +++-- > drivers/gpu/drm/i915/display/intel_ddi.c | 26 ++++++++++--------- > .../drm/i915/display/intel_display_device.h | 2 +- > drivers/gpu/drm/i915/display/intel_psr.c | 8 +++--- > 4 files changed, 21 insertions(+), 22 deletions(-) Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com> > > diff --git a/drivers/gpu/drm/i915/display/intel_audio.c > b/drivers/gpu/drm/i915/display/intel_audio.c > index 32aa9ec1a204..4cc70da8f467 100644 > --- a/drivers/gpu/drm/i915/display/intel_audio.c > +++ b/drivers/gpu/drm/i915/display/intel_audio.c > @@ -681,12 +681,11 @@ static void ibx_audio_codec_enable(struct intel_encoder *encoder, > > void intel_audio_sdp_split_update(const struct intel_crtc_state *crtc_state) > { > - struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); > - struct drm_i915_private *i915 = to_i915(crtc->base.dev); > + struct intel_display *display = to_intel_display(crtc_state); > enum transcoder trans = crtc_state->cpu_transcoder; > > - if (HAS_DP20(i915)) > - intel_de_rmw(i915, AUD_DP_2DOT0_CTRL(trans), AUD_ENABLE_SDP_SPLIT, > + if (HAS_DP20(display)) > + intel_de_rmw(display, AUD_DP_2DOT0_CTRL(trans), AUD_ENABLE_SDP_SPLIT, > crtc_state->sdp_split_enable ? AUD_ENABLE_SDP_SPLIT : 0); > } > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 49b5cc01ce40..46b7b90d3d98 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -700,8 +700,8 @@ int intel_ddi_toggle_hdcp_bits(struct intel_encoder *intel_encoder, > > bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector) > { > - struct drm_device *dev = intel_connector->base.dev; > - struct drm_i915_private *dev_priv = to_i915(dev); > + struct intel_display *display = to_intel_display(intel_connector); > + struct drm_i915_private *dev_priv = to_i915(display->drm); > struct intel_encoder *encoder = intel_attached_encoder(intel_connector); > int type = intel_connector->base.connector_type; > enum port port = encoder->port; > @@ -747,7 +747,7 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector) > break; > > case TRANS_DDI_MODE_SELECT_FDI_OR_128B132B: > - if (HAS_DP20(dev_priv)) > + if (HAS_DP20(display)) > /* 128b/132b */ > ret = false; > else > @@ -769,8 +769,8 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector) > static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, > u8 *pipe_mask, bool *is_dp_mst) > { > - struct drm_device *dev = encoder->base.dev; > - struct drm_i915_private *dev_priv = to_i915(dev); > + struct intel_display *display = to_intel_display(encoder); > + struct drm_i915_private *dev_priv = to_i915(display->drm); > enum port port = encoder->port; > intel_wakeref_t wakeref; > enum pipe p; > @@ -840,7 +840,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, > continue; > > if ((tmp & TRANS_DDI_MODE_SELECT_MASK) == TRANS_DDI_MODE_SELECT_DP_MST || > - (HAS_DP20(dev_priv) && > + (HAS_DP20(display) && > (tmp & TRANS_DDI_MODE_SELECT_MASK) == TRANS_DDI_MODE_SELECT_FDI_OR_128B132B)) > mst_pipe_mask |= BIT(p); > > @@ -2653,6 +2653,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state, > const struct intel_crtc_state *crtc_state, > const struct drm_connector_state *conn_state) > { > + struct intel_display *display = to_intel_display(encoder); > struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > struct intel_digital_port *dig_port = enc_to_dig_port(encoder); > @@ -2721,7 +2722,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state, > */ > intel_ddi_enable_transcoder_clock(encoder, crtc_state); > > - if (HAS_DP20(dev_priv)) > + if (HAS_DP20(display)) > intel_ddi_config_transcoder_dp2(encoder, crtc_state); > > /* > @@ -2862,9 +2863,9 @@ static void intel_ddi_pre_enable_dp(struct intel_atomic_state *state, > const struct intel_crtc_state *crtc_state, > const struct drm_connector_state *conn_state) > { > - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > + struct intel_display *display = to_intel_display(encoder); > > - if (HAS_DP20(dev_priv)) > + if (HAS_DP20(display)) > intel_dp_128b132b_sdp_crc16(enc_to_intel_dp(encoder), > crtc_state); > > @@ -2872,9 +2873,9 @@ static void intel_ddi_pre_enable_dp(struct intel_atomic_state *state, > if (crtc_state->has_panel_replay) > intel_psr_enable_sink(enc_to_intel_dp(encoder), crtc_state); > > - if (DISPLAY_VER(dev_priv) >= 14) > + if (DISPLAY_VER(display) >= 14) > mtl_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state); > - else if (DISPLAY_VER(dev_priv) >= 12) > + else if (DISPLAY_VER(display) >= 12) > tgl_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state); > else > hsw_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state); > @@ -3871,6 +3872,7 @@ static void bdw_get_trans_port_sync_config(struct intel_crtc_state > *crtc_state) > static void intel_ddi_read_func_ctl(struct intel_encoder *encoder, > struct intel_crtc_state *pipe_config) > { > + struct intel_display *display = to_intel_display(encoder); > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc); > enum transcoder cpu_transcoder = pipe_config->cpu_transcoder; > @@ -3960,7 +3962,7 @@ static void intel_ddi_read_func_ctl(struct intel_encoder *encoder, > intel_hdmi_infoframes_enabled(encoder, pipe_config); > break; > case TRANS_DDI_MODE_SELECT_FDI_OR_128B132B: > - if (!HAS_DP20(dev_priv)) { > + if (!HAS_DP20(display)) { > /* FDI */ > pipe_config->output_types |= BIT(INTEL_OUTPUT_ANALOG); > pipe_config->enhanced_framing = > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h > b/drivers/gpu/drm/i915/display/intel_display_device.h > index e11993a6f042..c861a61839b8 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_device.h > +++ b/drivers/gpu/drm/i915/display/intel_display_device.h > @@ -151,7 +151,7 @@ struct intel_display_platforms { > #define HAS_DMC(i915) (DISPLAY_RUNTIME_INFO(i915)->has_dmc) > #define HAS_DOUBLE_BUFFERED_M_N(__display) (DISPLAY_VER(__display) >= 9 || (__display)- > >platform.broadwell) > #define HAS_DP_MST(i915) (DISPLAY_INFO(i915)->has_dp_mst) > -#define HAS_DP20(i915) (IS_DG2(i915) || DISPLAY_VER(i915) >= 14) > +#define HAS_DP20(__display) ((__display)->platform.dg2 || DISPLAY_VER(__display) >= > 14) > #define HAS_DPT(i915) (DISPLAY_VER(i915) >= 13) > #define HAS_DSB(i915) (DISPLAY_INFO(i915)->has_dsb) > #define HAS_DSC(__i915) (DISPLAY_RUNTIME_INFO(__i915)->has_dsc) > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c > index a784c0b81556..74c2e3635d9e 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -3335,11 +3335,10 @@ void intel_psr_flush(struct intel_display *display, > void intel_psr_init(struct intel_dp *intel_dp) > { > struct intel_display *display = to_intel_display(intel_dp); > - struct drm_i915_private *dev_priv = to_i915(display->drm); > struct intel_connector *connector = intel_dp->attached_connector; > struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); > > - if (!(HAS_PSR(display) || HAS_DP20(dev_priv))) > + if (!(HAS_PSR(display) || HAS_DP20(display))) > return; > > /* > @@ -3357,7 +3356,7 @@ void intel_psr_init(struct intel_dp *intel_dp) > return; > } > > - if ((HAS_DP20(dev_priv) && !intel_dp_is_edp(intel_dp)) || > + if ((HAS_DP20(display) && !intel_dp_is_edp(intel_dp)) || > DISPLAY_VER(display) >= 20) > intel_dp->psr.source_panel_replay_support = true; > > @@ -3974,7 +3973,6 @@ DEFINE_SHOW_ATTRIBUTE(i915_psr_status); > void intel_psr_connector_debugfs_add(struct intel_connector *connector) > { > struct intel_display *display = to_intel_display(connector); > - struct drm_i915_private *i915 = to_i915(connector->base.dev); > struct dentry *root = connector->base.debugfs_entry; > > if (connector->base.connector_type != DRM_MODE_CONNECTOR_eDP && > @@ -3984,7 +3982,7 @@ void intel_psr_connector_debugfs_add(struct intel_connector *connector) > debugfs_create_file("i915_psr_sink_status", 0444, root, > connector, &i915_psr_sink_status_fops); > > - if (HAS_PSR(display) || HAS_DP20(i915)) > + if (HAS_PSR(display) || HAS_DP20(display)) > debugfs_create_file("i915_psr_status", 0444, root, > connector, &i915_psr_status_fops); > }
On Mon, Nov 04, 2024 at 07:19:19PM +0200, Jani Nikula wrote: > Convert HAS_DP20() to struct intel_display. Do minimal drive-by > conversions to struct intel_display in the callers while at it. Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/display/intel_audio.c | 7 +++-- > drivers/gpu/drm/i915/display/intel_ddi.c | 26 ++++++++++--------- > .../drm/i915/display/intel_display_device.h | 2 +- > drivers/gpu/drm/i915/display/intel_psr.c | 8 +++--- > 4 files changed, 21 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c > index 32aa9ec1a204..4cc70da8f467 100644 > --- a/drivers/gpu/drm/i915/display/intel_audio.c > +++ b/drivers/gpu/drm/i915/display/intel_audio.c > @@ -681,12 +681,11 @@ static void ibx_audio_codec_enable(struct intel_encoder *encoder, > > void intel_audio_sdp_split_update(const struct intel_crtc_state *crtc_state) > { > - struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); > - struct drm_i915_private *i915 = to_i915(crtc->base.dev); > + struct intel_display *display = to_intel_display(crtc_state); > enum transcoder trans = crtc_state->cpu_transcoder; > > - if (HAS_DP20(i915)) > - intel_de_rmw(i915, AUD_DP_2DOT0_CTRL(trans), AUD_ENABLE_SDP_SPLIT, > + if (HAS_DP20(display)) > + intel_de_rmw(display, AUD_DP_2DOT0_CTRL(trans), AUD_ENABLE_SDP_SPLIT, > crtc_state->sdp_split_enable ? AUD_ENABLE_SDP_SPLIT : 0); > } > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 49b5cc01ce40..46b7b90d3d98 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -700,8 +700,8 @@ int intel_ddi_toggle_hdcp_bits(struct intel_encoder *intel_encoder, > > bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector) > { > - struct drm_device *dev = intel_connector->base.dev; > - struct drm_i915_private *dev_priv = to_i915(dev); > + struct intel_display *display = to_intel_display(intel_connector); > + struct drm_i915_private *dev_priv = to_i915(display->drm); > struct intel_encoder *encoder = intel_attached_encoder(intel_connector); > int type = intel_connector->base.connector_type; > enum port port = encoder->port; > @@ -747,7 +747,7 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector) > break; > > case TRANS_DDI_MODE_SELECT_FDI_OR_128B132B: > - if (HAS_DP20(dev_priv)) > + if (HAS_DP20(display)) > /* 128b/132b */ > ret = false; > else > @@ -769,8 +769,8 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector) > static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, > u8 *pipe_mask, bool *is_dp_mst) > { > - struct drm_device *dev = encoder->base.dev; > - struct drm_i915_private *dev_priv = to_i915(dev); > + struct intel_display *display = to_intel_display(encoder); > + struct drm_i915_private *dev_priv = to_i915(display->drm); > enum port port = encoder->port; > intel_wakeref_t wakeref; > enum pipe p; > @@ -840,7 +840,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, > continue; > > if ((tmp & TRANS_DDI_MODE_SELECT_MASK) == TRANS_DDI_MODE_SELECT_DP_MST || > - (HAS_DP20(dev_priv) && > + (HAS_DP20(display) && > (tmp & TRANS_DDI_MODE_SELECT_MASK) == TRANS_DDI_MODE_SELECT_FDI_OR_128B132B)) > mst_pipe_mask |= BIT(p); > > @@ -2653,6 +2653,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state, > const struct intel_crtc_state *crtc_state, > const struct drm_connector_state *conn_state) > { > + struct intel_display *display = to_intel_display(encoder); > struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > struct intel_digital_port *dig_port = enc_to_dig_port(encoder); > @@ -2721,7 +2722,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state, > */ > intel_ddi_enable_transcoder_clock(encoder, crtc_state); > > - if (HAS_DP20(dev_priv)) > + if (HAS_DP20(display)) > intel_ddi_config_transcoder_dp2(encoder, crtc_state); > > /* > @@ -2862,9 +2863,9 @@ static void intel_ddi_pre_enable_dp(struct intel_atomic_state *state, > const struct intel_crtc_state *crtc_state, > const struct drm_connector_state *conn_state) > { > - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > + struct intel_display *display = to_intel_display(encoder); > > - if (HAS_DP20(dev_priv)) > + if (HAS_DP20(display)) > intel_dp_128b132b_sdp_crc16(enc_to_intel_dp(encoder), > crtc_state); > > @@ -2872,9 +2873,9 @@ static void intel_ddi_pre_enable_dp(struct intel_atomic_state *state, > if (crtc_state->has_panel_replay) > intel_psr_enable_sink(enc_to_intel_dp(encoder), crtc_state); > > - if (DISPLAY_VER(dev_priv) >= 14) > + if (DISPLAY_VER(display) >= 14) > mtl_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state); > - else if (DISPLAY_VER(dev_priv) >= 12) > + else if (DISPLAY_VER(display) >= 12) > tgl_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state); > else > hsw_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state); > @@ -3871,6 +3872,7 @@ static void bdw_get_trans_port_sync_config(struct intel_crtc_state *crtc_state) > static void intel_ddi_read_func_ctl(struct intel_encoder *encoder, > struct intel_crtc_state *pipe_config) > { > + struct intel_display *display = to_intel_display(encoder); > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc); > enum transcoder cpu_transcoder = pipe_config->cpu_transcoder; > @@ -3960,7 +3962,7 @@ static void intel_ddi_read_func_ctl(struct intel_encoder *encoder, > intel_hdmi_infoframes_enabled(encoder, pipe_config); > break; > case TRANS_DDI_MODE_SELECT_FDI_OR_128B132B: > - if (!HAS_DP20(dev_priv)) { > + if (!HAS_DP20(display)) { > /* FDI */ > pipe_config->output_types |= BIT(INTEL_OUTPUT_ANALOG); > pipe_config->enhanced_framing = > diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h > index e11993a6f042..c861a61839b8 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_device.h > +++ b/drivers/gpu/drm/i915/display/intel_display_device.h > @@ -151,7 +151,7 @@ struct intel_display_platforms { > #define HAS_DMC(i915) (DISPLAY_RUNTIME_INFO(i915)->has_dmc) > #define HAS_DOUBLE_BUFFERED_M_N(__display) (DISPLAY_VER(__display) >= 9 || (__display)->platform.broadwell) > #define HAS_DP_MST(i915) (DISPLAY_INFO(i915)->has_dp_mst) > -#define HAS_DP20(i915) (IS_DG2(i915) || DISPLAY_VER(i915) >= 14) > +#define HAS_DP20(__display) ((__display)->platform.dg2 || DISPLAY_VER(__display) >= 14) > #define HAS_DPT(i915) (DISPLAY_VER(i915) >= 13) > #define HAS_DSB(i915) (DISPLAY_INFO(i915)->has_dsb) > #define HAS_DSC(__i915) (DISPLAY_RUNTIME_INFO(__i915)->has_dsc) > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c > index a784c0b81556..74c2e3635d9e 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -3335,11 +3335,10 @@ void intel_psr_flush(struct intel_display *display, > void intel_psr_init(struct intel_dp *intel_dp) > { > struct intel_display *display = to_intel_display(intel_dp); > - struct drm_i915_private *dev_priv = to_i915(display->drm); > struct intel_connector *connector = intel_dp->attached_connector; > struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); > > - if (!(HAS_PSR(display) || HAS_DP20(dev_priv))) > + if (!(HAS_PSR(display) || HAS_DP20(display))) > return; > > /* > @@ -3357,7 +3356,7 @@ void intel_psr_init(struct intel_dp *intel_dp) > return; > } > > - if ((HAS_DP20(dev_priv) && !intel_dp_is_edp(intel_dp)) || > + if ((HAS_DP20(display) && !intel_dp_is_edp(intel_dp)) || > DISPLAY_VER(display) >= 20) > intel_dp->psr.source_panel_replay_support = true; > > @@ -3974,7 +3973,6 @@ DEFINE_SHOW_ATTRIBUTE(i915_psr_status); > void intel_psr_connector_debugfs_add(struct intel_connector *connector) > { > struct intel_display *display = to_intel_display(connector); > - struct drm_i915_private *i915 = to_i915(connector->base.dev); > struct dentry *root = connector->base.debugfs_entry; > > if (connector->base.connector_type != DRM_MODE_CONNECTOR_eDP && > @@ -3984,7 +3982,7 @@ void intel_psr_connector_debugfs_add(struct intel_connector *connector) > debugfs_create_file("i915_psr_sink_status", 0444, root, > connector, &i915_psr_sink_status_fops); > > - if (HAS_PSR(display) || HAS_DP20(i915)) > + if (HAS_PSR(display) || HAS_DP20(display)) > debugfs_create_file("i915_psr_status", 0444, root, > connector, &i915_psr_status_fops); > } > -- > 2.39.5 >
diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c index 32aa9ec1a204..4cc70da8f467 100644 --- a/drivers/gpu/drm/i915/display/intel_audio.c +++ b/drivers/gpu/drm/i915/display/intel_audio.c @@ -681,12 +681,11 @@ static void ibx_audio_codec_enable(struct intel_encoder *encoder, void intel_audio_sdp_split_update(const struct intel_crtc_state *crtc_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); - struct drm_i915_private *i915 = to_i915(crtc->base.dev); + struct intel_display *display = to_intel_display(crtc_state); enum transcoder trans = crtc_state->cpu_transcoder; - if (HAS_DP20(i915)) - intel_de_rmw(i915, AUD_DP_2DOT0_CTRL(trans), AUD_ENABLE_SDP_SPLIT, + if (HAS_DP20(display)) + intel_de_rmw(display, AUD_DP_2DOT0_CTRL(trans), AUD_ENABLE_SDP_SPLIT, crtc_state->sdp_split_enable ? AUD_ENABLE_SDP_SPLIT : 0); } diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 49b5cc01ce40..46b7b90d3d98 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -700,8 +700,8 @@ int intel_ddi_toggle_hdcp_bits(struct intel_encoder *intel_encoder, bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector) { - struct drm_device *dev = intel_connector->base.dev; - struct drm_i915_private *dev_priv = to_i915(dev); + struct intel_display *display = to_intel_display(intel_connector); + struct drm_i915_private *dev_priv = to_i915(display->drm); struct intel_encoder *encoder = intel_attached_encoder(intel_connector); int type = intel_connector->base.connector_type; enum port port = encoder->port; @@ -747,7 +747,7 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector) break; case TRANS_DDI_MODE_SELECT_FDI_OR_128B132B: - if (HAS_DP20(dev_priv)) + if (HAS_DP20(display)) /* 128b/132b */ ret = false; else @@ -769,8 +769,8 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector) static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, u8 *pipe_mask, bool *is_dp_mst) { - struct drm_device *dev = encoder->base.dev; - struct drm_i915_private *dev_priv = to_i915(dev); + struct intel_display *display = to_intel_display(encoder); + struct drm_i915_private *dev_priv = to_i915(display->drm); enum port port = encoder->port; intel_wakeref_t wakeref; enum pipe p; @@ -840,7 +840,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, continue; if ((tmp & TRANS_DDI_MODE_SELECT_MASK) == TRANS_DDI_MODE_SELECT_DP_MST || - (HAS_DP20(dev_priv) && + (HAS_DP20(display) && (tmp & TRANS_DDI_MODE_SELECT_MASK) == TRANS_DDI_MODE_SELECT_FDI_OR_128B132B)) mst_pipe_mask |= BIT(p); @@ -2653,6 +2653,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state, const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(encoder); struct intel_dp *intel_dp = enc_to_intel_dp(encoder); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct intel_digital_port *dig_port = enc_to_dig_port(encoder); @@ -2721,7 +2722,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state, */ intel_ddi_enable_transcoder_clock(encoder, crtc_state); - if (HAS_DP20(dev_priv)) + if (HAS_DP20(display)) intel_ddi_config_transcoder_dp2(encoder, crtc_state); /* @@ -2862,9 +2863,9 @@ static void intel_ddi_pre_enable_dp(struct intel_atomic_state *state, const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(encoder); - if (HAS_DP20(dev_priv)) + if (HAS_DP20(display)) intel_dp_128b132b_sdp_crc16(enc_to_intel_dp(encoder), crtc_state); @@ -2872,9 +2873,9 @@ static void intel_ddi_pre_enable_dp(struct intel_atomic_state *state, if (crtc_state->has_panel_replay) intel_psr_enable_sink(enc_to_intel_dp(encoder), crtc_state); - if (DISPLAY_VER(dev_priv) >= 14) + if (DISPLAY_VER(display) >= 14) mtl_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state); - else if (DISPLAY_VER(dev_priv) >= 12) + else if (DISPLAY_VER(display) >= 12) tgl_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state); else hsw_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state); @@ -3871,6 +3872,7 @@ static void bdw_get_trans_port_sync_config(struct intel_crtc_state *crtc_state) static void intel_ddi_read_func_ctl(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) { + struct intel_display *display = to_intel_display(encoder); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc); enum transcoder cpu_transcoder = pipe_config->cpu_transcoder; @@ -3960,7 +3962,7 @@ static void intel_ddi_read_func_ctl(struct intel_encoder *encoder, intel_hdmi_infoframes_enabled(encoder, pipe_config); break; case TRANS_DDI_MODE_SELECT_FDI_OR_128B132B: - if (!HAS_DP20(dev_priv)) { + if (!HAS_DP20(display)) { /* FDI */ pipe_config->output_types |= BIT(INTEL_OUTPUT_ANALOG); pipe_config->enhanced_framing = diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h b/drivers/gpu/drm/i915/display/intel_display_device.h index e11993a6f042..c861a61839b8 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.h +++ b/drivers/gpu/drm/i915/display/intel_display_device.h @@ -151,7 +151,7 @@ struct intel_display_platforms { #define HAS_DMC(i915) (DISPLAY_RUNTIME_INFO(i915)->has_dmc) #define HAS_DOUBLE_BUFFERED_M_N(__display) (DISPLAY_VER(__display) >= 9 || (__display)->platform.broadwell) #define HAS_DP_MST(i915) (DISPLAY_INFO(i915)->has_dp_mst) -#define HAS_DP20(i915) (IS_DG2(i915) || DISPLAY_VER(i915) >= 14) +#define HAS_DP20(__display) ((__display)->platform.dg2 || DISPLAY_VER(__display) >= 14) #define HAS_DPT(i915) (DISPLAY_VER(i915) >= 13) #define HAS_DSB(i915) (DISPLAY_INFO(i915)->has_dsb) #define HAS_DSC(__i915) (DISPLAY_RUNTIME_INFO(__i915)->has_dsc) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index a784c0b81556..74c2e3635d9e 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -3335,11 +3335,10 @@ void intel_psr_flush(struct intel_display *display, void intel_psr_init(struct intel_dp *intel_dp) { struct intel_display *display = to_intel_display(intel_dp); - struct drm_i915_private *dev_priv = to_i915(display->drm); struct intel_connector *connector = intel_dp->attached_connector; struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); - if (!(HAS_PSR(display) || HAS_DP20(dev_priv))) + if (!(HAS_PSR(display) || HAS_DP20(display))) return; /* @@ -3357,7 +3356,7 @@ void intel_psr_init(struct intel_dp *intel_dp) return; } - if ((HAS_DP20(dev_priv) && !intel_dp_is_edp(intel_dp)) || + if ((HAS_DP20(display) && !intel_dp_is_edp(intel_dp)) || DISPLAY_VER(display) >= 20) intel_dp->psr.source_panel_replay_support = true; @@ -3974,7 +3973,6 @@ DEFINE_SHOW_ATTRIBUTE(i915_psr_status); void intel_psr_connector_debugfs_add(struct intel_connector *connector) { struct intel_display *display = to_intel_display(connector); - struct drm_i915_private *i915 = to_i915(connector->base.dev); struct dentry *root = connector->base.debugfs_entry; if (connector->base.connector_type != DRM_MODE_CONNECTOR_eDP && @@ -3984,7 +3982,7 @@ void intel_psr_connector_debugfs_add(struct intel_connector *connector) debugfs_create_file("i915_psr_sink_status", 0444, root, connector, &i915_psr_sink_status_fops); - if (HAS_PSR(display) || HAS_DP20(i915)) + if (HAS_PSR(display) || HAS_DP20(display)) debugfs_create_file("i915_psr_status", 0444, root, connector, &i915_psr_status_fops); }
Convert HAS_DP20() to struct intel_display. Do minimal drive-by conversions to struct intel_display in the callers while at it. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/display/intel_audio.c | 7 +++-- drivers/gpu/drm/i915/display/intel_ddi.c | 26 ++++++++++--------- .../drm/i915/display/intel_display_device.h | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 8 +++--- 4 files changed, 21 insertions(+), 22 deletions(-)