drm/i915/dp: Fix dsc bpp calculations, v2.
Subsystems (5)
Maarten Lankhorst
maintainerPATCH 1/23 drm/i915/dp: Fix dsc bpp calculations, v2.
There was a integer wraparound when mode_clock became too high, and we didn't correct for the FEC overhead factor when dividing, with the calculations breaking at HBR3.
As a result our calculated bpp was way too high, and the link width limitation never came into effect.
Print out the resulting bpp calcululations as a sanity check, just in case we ever have to debug it later on again.
We also used the wrong factor for FEC. While bspec mentions 2.4%, all the calculations use 1/0.972261, and the same ratio should be applied to data M/N as well, so use it there when FEC is enabled.
Make sure we don't break hw readout, and read out FEC enable state and correct the DDI clock readout for the new values.
Together with the next commit, this causes FEC to work correctly with big joiner, while also having the correct refresh rate reported in kms_setmode.basic.
--- drivers/gpu/drm/i915/display/intel_ddi.c | 19 +- drivers/gpu/drm/i915/display/intel_display.c | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 195 ++++++++++--------- drivers/gpu/drm/i915/display/intel_dp.h | 6 +- 4 files changed, 128 insertions(+), 93 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +18 -1
@@ -1479,6 +1479,10 @@ static void ddi_dotclock_get(struct intel_crtc_state *pipe_config)if (pipe_config->pixel_multiplier) dotclock /= pipe_config->pixel_multiplier; +/* fec adds overhead to the data M/N values, correct for it */ +if (pipe_config->fec_enable) + dotclock =intel_dp_fec_to_mode_clock (dotclock); + pipe_config->base.adjusted_mode.crtc_clock = dotclock; }
@@ -4031,7 +4035,9 @@ void intel_ddi_get_config(struct intel_encoder *encoder,case TRANS_DDI_MODE_SELECT_FDI : pipe_config->output_types |=BIT (INTEL_OUTPUT_ANALOG );break ; -case TRANS_DDI_MODE_SELECT_DP_SST : +case TRANS_DDI_MODE_SELECT_DP_SST : { +struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base); +if (encoder->type ==INTEL_OUTPUT_EDP ) pipe_config->output_types |=BIT (INTEL_OUTPUT_EDP );else
@@ -4039,7 +4045,18 @@ void intel_ddi_get_config(struct intel_encoder *encoder, pipe_config->lane_count = ((temp &DDI_PORT_WIDTH_MASK ) >>DDI_PORT_WIDTH_SHIFT ) +1 ;intel_dp_get_m_n (intel_crtc, pipe_config); + +if (INTEL_GEN (dev_priv) >=11 ) { + pipe_config->fec_enable = +I915_READ (intel_dp->regs.dp_tp_ctl) & +DP_TP_CTL_FEC_ENABLE ; +DRM_DEBUG_KMS ("[ENCODER:%d:%s] Fec status: %u\n" , + encoder->base.base.id, encoder->base.name, + pipe_config->fec_enable); + } +break ; + }case TRANS_DDI_MODE_SELECT_DP_MST : pipe_config->output_types |=BIT (INTEL_OUTPUT_DP_MST ); pipe_config->lane_count =
drivers/gpu/drm/i915/display/intel_display.c +1 -0
@@ -12773,6 +12773,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_BOOL (hdmi_scrambling);PIPE_CONF_CHECK_BOOL (hdmi_high_tmds_clock_ratio);PIPE_CONF_CHECK_BOOL (has_infoframe); +PIPE_CONF_CHECK_BOOL (fec_enable);PIPE_CONF_CHECK_BOOL_INCOMPLETE (has_audio);
drivers/gpu/drm/i915/display/intel_dp.c +107 -88
227 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dp.h +2 -4
@@ -103,10 +103,6 @@ bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp);bool intel_dp_source_supports_hbr3 (struct intel_dp *intel_dp);bool intel_dp_get_link_status (struct intel_dp *intel_dp,u8 *link_status); -u16 intel_dp_dsc_get_output_bpp (int link_clock,u8 lane_count, -int mode_clock,int mode_hdisplay); -u8 intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp,int mode_clock, -int mode_hdisplay);bool intel_dp_read_dpcd (struct intel_dp *intel_dp);bool intel_dp_get_colorimetry_status (struct intel_dp *intel_dp);
@@ -119,4 +115,6 @@ static inline unsigned int intel_dp_unused_lane_mask(int lane_count) return ~((1 << lane_count) - 1) & 0xf; } +u32 intel_dp_fec_to_mode_clock (u32 fec_clock); +#endif /* __INTEL_DP_H__ */
Signature · 1 line
2.20.1
Maarten Lankhorst
maintainerPATCH 2/23 HAX drm/i915: Disable FEC entirely for now
I get a permanent FIFO underrun when enabling FEC with big joiner, so for now disable it.
It seems that even at 1024x768 resolution without bigjoiner we don't get a working configuration. Flag is set but vblank timing shows that vblanks are delivered slightly faster, so the extra overhead we calculated for data M/N goes unused.
--- drivers/gpu/drm/i915/display/intel_dp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +4 -2
@@ -1877,7 +1877,8 @@ static bool intel_dp_source_supports_dsc(struct intel_dp *intel_dp,static bool intel_dp_supports_dsc (struct intel_dp *intel_dp,const struct intel_crtc_state *pipe_config) { -if (!intel_dp_is_edp (intel_dp) && !pipe_config->fec_enable) +/* HACK: Disable FEC until we solved FIFO underruns */ +if (!intel_dp_is_edp (intel_dp) && !pipe_config->fec_enable &&0 )return false; return intel_dp_source_supports_dsc(intel_dp, pipe_config) &&
@@ -2024,8 +2025,9 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,int pipe_bpp;int ret; +/* HACK: Disable FEC until we solved FIFO underruns */ pipe_config->fec_enable = !intel_dp_is_edp (intel_dp) && -intel_dp_supports_fec (intel_dp, pipe_config); +intel_dp_supports_fec (intel_dp, pipe_config) &&0 ;if (!intel_dp_supports_dsc (intel_dp, pipe_config))return -EINVAL ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH 02/23] HAX drm/i915: Disable FEC entirely for now
Op 20-09-2019 om 13:42 schreef Maarten Lankhorst:
Quoted 28 lines
I get a permanent FIFO underrun when enabling FEC with big joiner, so for now disable it.
It seems that even at 1024x768 resolution without bigjoiner we don't get a working configuration. Flag is set but vblank timing shows that vblanks are delivered slightly faster, so the extra overhead we calculated for data M/N goes unused.
Not-Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +2
-1@@ -1877,7 +1877,8 @@ static bool intel_dp_source_supports_dsc(struct intel_dp *intel_dp,static bool intel_dp_supports_dsc (struct intel_dp *intel_dp,const struct intel_crtc_state *pipe_config) { -if (!intel_dp_is_edp (intel_dp) && !pipe_config->fec_enable) +/* HACK: Disable FEC until we solved FIFO underruns */ +if (!intel_dp_is_edp (intel_dp) && !pipe_config->fec_enable &&0 )return false; return intel_dp_source_supports_dsc(intel_dp, pipe_config) &&
drivers/gpu/drm/i915/display/intel_dp.c static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, · line 2033
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp.c +2
-1@@ -2024,8 +2025,9 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,int pipe_bpp;int ret; +/* HACK: Disable FEC until we solved FIFO underruns */ pipe_config->fec_enable = !intel_dp_is_edp (intel_dp) && -intel_dp_supports_fec (intel_dp, pipe_config); +intel_dp_supports_fec (intel_dp, pipe_config) &&0 ;if (!intel_dp_supports_dsc (intel_dp, pipe_config))return -EINVAL ;
With v3 of the previous patch, this is now obsolete and confirmed working on ICL.
So this can finally be dropped. :)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 3/23 drm/i915: Prepare to split crtc state in uapi and hw state
In reply to Maarten LankhorstWe want to split drm_crtc_state into the user visible state and actual hardware state. To prepare for this, we need some ground rules what should be in each state:
In uapi we use:
- crtc, *_changed flags, event, commit, state, mode_blob, (plane/connector/encoder)_mask.
In hw state we use what's displayed in hardware:
- enable, active, (adjusted) mode, color property blobs.
clear_intel_crtc_state and hw readout need to be updated for these rules, which will allow us to enable 2 joined pipes.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 18 +- drivers/gpu/drm/i915/display/intel_atomic.c | 14 +- .../gpu/drm/i915/display/intel_atomic_plane.c | 6 +- drivers/gpu/drm/i915/display/intel_audio.c | 12 +- drivers/gpu/drm/i915/display/intel_bw.c | 4 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 16 +- drivers/gpu/drm/i915/display/intel_color.c | 180 +++--- drivers/gpu/drm/i915/display/intel_crt.c | 24 +- drivers/gpu/drm/i915/display/intel_ddi.c | 34 +- drivers/gpu/drm/i915/display/intel_display.c | 540 +++++++++--------- .../drm/i915/display/intel_display_types.h | 28 +- drivers/gpu/drm/i915/display/intel_dp.c | 42 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 14 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 20 +- drivers/gpu/drm/i915/display/intel_dvo.c | 14 +- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 62 +- drivers/gpu/drm/i915/display/intel_lspcon.c | 4 +- drivers/gpu/drm/i915/display/intel_lvds.c | 12 +- drivers/gpu/drm/i915/display/intel_panel.c | 14 +- drivers/gpu/drm/i915/display/intel_pipe_crc.c | 6 +- drivers/gpu/drm/i915/display/intel_psr.c | 10 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 22 +- drivers/gpu/drm/i915/display/intel_sprite.c | 25 +- drivers/gpu/drm/i915/display/intel_tv.c | 8 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 12 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 20 +- drivers/gpu/drm/i915/i915_debugfs.c | 14 +- drivers/gpu/drm/i915/intel_pm.c | 180 +++--- 30 files changed, 699 insertions(+), 664 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +9 -9
@@ -276,7 +276,7 @@ static void configure_dual_link_mode(struct intel_encoder *encoder,if (intel_dsi->dual_link ==DSI_DUAL_LINK_FRONT_BACK ) {const struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;u32 dss_ctl2;u16 hactive = adjusted_mode->crtc_hdisplay;u16 dl_buffer_depth;
@@ -625,7 +625,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); -struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);enum pipe pipe = intel_crtc->pipe;u32 tmp;enum port port;
@@ -768,7 +768,7 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);const struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;enum port port;enum transcoder dsi_trans;/* horizontal timings */
@@ -1216,7 +1216,7 @@ static void gen11_dsi_get_timings(struct intel_encoder *encoder, {struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (intel_dsi->dual_link) { adjusted_mode->crtc_hdisplay *=2 ;
@@ -1242,16 +1242,16 @@ static void gen11_dsi_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_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);/* FIXME: adapt icl_ddi_clock_get() for DSI and use that? */ pipe_config->port_clock =cnl_calc_wrpll_link (dev_priv, &pipe_config->dpll_hw_state); - pipe_config->base.adjusted_mode.crtc_clock = intel_dsi->pclk; + pipe_config->hw.adjusted_mode.crtc_clock = intel_dsi->pclk;if (intel_dsi->dual_link) - pipe_config->base.adjusted_mode.crtc_clock *=2 ; + pipe_config->hw.adjusted_mode.crtc_clock *=2 ;gen11_dsi_get_timings (encoder, pipe_config); pipe_config->output_types |=BIT (INTEL_OUTPUT_DSI );
@@ -1265,11 +1265,11 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, base);struct intel_connector *intel_connector = intel_dsi->attached_connector; -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);const struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode; pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ;intel_fixed_panel_mode (fixed_mode, adjusted_mode);
drivers/gpu/drm/i915/display/intel_atomic.c +9 -5
@@ -186,13 +186,14 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector)struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc) { +const struct intel_crtc_state *old_crtc_state =to_intel_crtc_state (crtc->state);struct intel_crtc_state *crtc_state; - crtc_state =kmemdup (crtc->state,sizeof (*crtc_state),GFP_KERNEL ); + crtc_state =kmemdup (old_crtc_state,sizeof (*crtc_state),GFP_KERNEL );if (!crtc_state)return NULL ; -__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->base); +__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false;
@@ -205,7 +206,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) crtc_state->fb_bits =0 ; crtc_state->update_planes =0 ; -return &crtc_state->base; +return &crtc_state->uapi; }/**
@@ -220,7 +221,10 @@ void intel_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state) { -drm_atomic_helper_crtc_destroy_state (crtc, state); + struct intel_crtc_state *crtc_state = to_intel_crtc_state(state); + +__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +kfree (crtc_state); } static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_state,
@@ -316,7 +320,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,struct intel_plane_state *plane_state =NULL ;struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state; -struct drm_atomic_state *drm_state = crtc_state->base.state; +struct drm_atomic_state *drm_state = crtc_state->uapi.state;struct intel_atomic_state *intel_state =to_intel_atomic_state (drm_state);int num_scalers_need;int i;
drivers/gpu/drm/i915/display/intel_atomic_plane.c +3 -3
@@ -271,7 +271,7 @@ void intel_update_plane(struct intel_plane *plane,const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);trace_intel_update_plane (&plane->base, crtc); plane->update_plane (plane, crtc_state, plane_state);
@@ -281,7 +281,7 @@ void intel_update_slave(struct intel_plane *plane,const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);trace_intel_update_plane (&plane->base, crtc); plane->update_slave (plane, crtc_state, plane_state);
@@ -290,7 +290,7 @@ void intel_update_slave(struct intel_plane *plane,void intel_disable_plane (struct intel_plane *plane,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);trace_intel_disable_plane (&plane->base, crtc); plane->disable_plane (plane, crtc_state);
drivers/gpu/drm/i915/display/intel_audio.c +6 -6
@@ -233,7 +233,7 @@ static const struct hdmi_aud_ncts hdmi_aud_ncts_36bpp[] = {static u32 audio_config_hdmi_pixel_clock (const struct intel_crtc_state *crtc_state) {const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;int i;for (i =0 ; i <ARRAY_SIZE (hdmi_audio_clock); i++) {
@@ -554,7 +554,7 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder, const struct drm_connector_state *old_conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;enum port port = encoder->port;u32 tmp, eldv;
@@ -601,7 +601,7 @@ static void ilk_audio_codec_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 *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_connector *connector = conn_state->connector;enum pipe pipe = crtc->pipe;enum port port = encoder->port;
@@ -691,10 +691,10 @@ void intel_audio_codec_enable(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_connector *connector = conn_state->connector;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;enum port port = encoder->port;enum pipe pipe = crtc->pipe;
@@ -752,7 +752,7 @@ void intel_audio_codec_disable(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum port port = encoder->port;enum pipe pipe = crtc->pipe;
drivers/gpu/drm/i915/display/intel_bw.c +2 -2
@@ -264,7 +264,7 @@ static unsigned int intel_bw_crtc_num_active_planes(const struct intel_crtc_statstatic unsigned int intel_bw_crtc_data_rate (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);unsigned int data_rate =0 ;enum plane_id plane_id;
@@ -285,7 +285,7 @@ static unsigned int intel_bw_crtc_data_rate(const struct intel_crtc_state *crtc_void intel_bw_crtc_update (struct intel_bw_state *bw_state,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); bw_state->data_rate[crtc->pipe] =intel_bw_crtc_data_rate (crtc_state);
drivers/gpu/drm/i915/display/intel_cdclk.c +8 -8
@@ -1917,10 +1917,10 @@ static int intel_pixel_rate_to_cdclk(struct drm_i915_private *dev_priv,int intel_crtc_compute_min_cdclk (const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv = -to_i915 (crtc_state->base.crtc->dev); +to_i915 (crtc_state->uapi.crtc->dev);int min_cdclk; -if (!crtc_state->base.enable) +if (!crtc_state->hw.enable)return 0 ; min_cdclk =intel_pixel_rate_to_cdclk (dev_priv, crtc_state->pixel_rate);
@@ -2043,7 +2043,7 @@ static u8 bxt_compute_min_voltage_level(struct intel_atomic_state *state) sizeof(state->min_voltage_level));for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) { -if (crtc_state->base.enable) +if (crtc_state->hw.enable) state->min_voltage_level[i] = crtc_state->min_voltage_level;else
@@ -2129,7 +2129,7 @@ static int skl_dpll0_vco(struct intel_atomic_state *state) vco = dev_priv->skl_preferred_vco_freq;for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) { -if (!crtc_state->base.enable) +if (!crtc_state->hw.enable)continue ;if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_EDP ))
@@ -2255,11 +2255,11 @@ static int intel_modeset_all_pipes(struct intel_atomic_state *state)if (IS_ERR (crtc_state))return PTR_ERR (crtc_state); -if (!crtc_state->base.active || -drm_atomic_crtc_needs_modeset (&crtc_state->base)) +if (!crtc_state->hw.active || +drm_atomic_crtc_needs_modeset (&crtc_state->uapi))continue ; - crtc_state->base.mode_changed = true; + crtc_state->uapi.mode_changed = true; ret =drm_atomic_add_affected_connectors (&state->base, &crtc->base);
@@ -2310,7 +2310,7 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state) crtc =intel_get_crtc_for_pipe (dev_priv, pipe); crtc_state =intel_atomic_get_new_crtc_state (state, crtc);if (crtc_state && -drm_atomic_crtc_needs_modeset (&crtc_state->base)) +drm_atomic_crtc_needs_modeset (&crtc_state->uapi)) pipe =INVALID_PIPE ; }else { pipe =INVALID_PIPE ;
drivers/gpu/drm/i915/display/intel_color.c +90 -90
520 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_crt.c +12 -12
@@ -132,9 +132,9 @@ static void intel_crt_get_config(struct intel_encoder *encoder, { pipe_config->output_types |=BIT (INTEL_OUTPUT_ANALOG ); - pipe_config->base.adjusted_mode.flags |=intel_crt_get_flags (encoder); + pipe_config->hw.adjusted_mode.flags |=intel_crt_get_flags (encoder); - pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->hw.adjusted_mode.crtc_clock = pipe_config->port_clock; } static void hsw_crt_get_config(struct intel_encoder *encoder,
@@ -144,13 +144,13 @@ static void hsw_crt_get_config(struct intel_encoder *encoder,intel_ddi_get_config (encoder, pipe_config); - pipe_config->base.adjusted_mode.flags &= ~(DRM_MODE_FLAG_PHSYNC | + pipe_config->hw.adjusted_mode.flags &= ~(DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC |DRM_MODE_FLAG_NVSYNC ); - pipe_config->base.adjusted_mode.flags |=intel_crt_get_flags (encoder); + pipe_config->hw.adjusted_mode.flags |=intel_crt_get_flags (encoder); - pipe_config->base.adjusted_mode.crtc_clock =lpt_get_iclkip (dev_priv); + pipe_config->hw.adjusted_mode.crtc_clock =lpt_get_iclkip (dev_priv); }/* Note: The caller is required to filter out dpms modes not supported by the
@@ -161,8 +161,8 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crt *crt =intel_encoder_to_crt (encoder); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;u32 adpa;if (INTEL_GEN (dev_priv) >=5 )
@@ -271,7 +271,7 @@ static void hsw_pre_enable_crt(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 *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;WARN_ON (!crtc_state->has_pch_encoder);
@@ -288,7 +288,7 @@ static void hsw_enable_crt(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 *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;WARN_ON (!crtc_state->has_pch_encoder);
@@ -358,7 +358,7 @@ static int intel_crt_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLSCAN )return -EINVAL ;
@@ -373,7 +373,7 @@ static int pch_crt_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLSCAN )return -EINVAL ;
@@ -390,7 +390,7 @@ static int hsw_crt_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; + &pipe_config->hw.adjusted_mode;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLSCAN )return -EINVAL ;
drivers/gpu/drm/i915/display/intel_ddi.c +17 -17
@@ -1483,7 +1483,7 @@ static void ddi_dotclock_get(struct intel_crtc_state *pipe_config)if (pipe_config->fec_enable) dotclock =intel_dp_fec_to_mode_clock (dotclock); - pipe_config->base.adjusted_mode.crtc_clock = dotclock; + pipe_config->hw.adjusted_mode.crtc_clock = dotclock; } static void icl_ddi_clock_get(struct intel_encoder *encoder,
@@ -1698,7 +1698,7 @@ static void intel_ddi_clock_get(struct intel_encoder *encoder,void intel_ddi_set_pipe_settings (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;
@@ -1752,7 +1752,7 @@ void intel_ddi_set_pipe_settings(const struct intel_crtc_state *crtc_state)void intel_ddi_set_vc_payload_alloc (const struct intel_crtc_state *crtc_state,bool state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;
@@ -1774,7 +1774,7 @@ void intel_ddi_set_vc_payload_alloc(const struct intel_crtc_state *crtc_state,static u32 intel_ddi_transcoder_func_reg_val_get (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_encoder *encoder =intel_ddi_get_crtc_encoder (crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;
@@ -1806,9 +1806,9 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state)BUG (); } -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) temp |=TRANS_DDI_PVSYNC ; -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) temp |=TRANS_DDI_PHSYNC ;if (cpu_transcoder ==TRANSCODER_EDP ) {
@@ -1861,7 +1861,7 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state)void intel_ddi_enable_transcoder_func (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;
@@ -1877,7 +1877,7 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)static void intel_ddi_config_transcoder_func (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;
@@ -1889,7 +1889,7 @@ intel_ddi_config_transcoder_func(const struct intel_crtc_state *crtc_state)void intel_ddi_disable_transcoder_func (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;i915_reg_t reg =TRANS_DDI_FUNC_CTL (cpu_transcoder);
@@ -2187,7 +2187,7 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder,void intel_ddi_enable_pipe_clock (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_encoder *encoder =intel_ddi_get_crtc_encoder (crtc);enum port port = encoder->port;
@@ -2205,7 +2205,7 @@ void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state)void intel_ddi_disable_pipe_clock (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;if (cpu_transcoder !=TRANSCODER_EDP ) {
@@ -3421,7 +3421,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;
@@ -3846,7 +3846,7 @@ intel_ddi_update_prepare(struct intel_atomic_state *state,WARN_ON (crtc && crtc->active);intel_tc_port_get_link (enc_to_dig_port (&encoder->base), required_lanes); -if (crtc_state && crtc_state->base.active) +if (crtc_state && crtc_state->hw.active)intel_update_active_dpll (state, crtc, encoder); }
@@ -3976,7 +3976,7 @@ void intel_ddi_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_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;u32 temp, flags =0 ;
@@ -3994,7 +3994,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,else flags |=DRM_MODE_FLAG_NVSYNC ; - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags;switch (temp &TRANS_DDI_BPC_MASK ) {case TRANS_DDI_BPC_6 :
@@ -4136,7 +4136,7 @@ static int intel_ddi_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port = encoder->port;int ret;
@@ -4267,7 +4267,7 @@ static int intel_hdmi_reset_link(struct intel_encoder *encoder,WARN_ON (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )); -if (!crtc_state->base.active) +if (!crtc_state->hw.active)return 0 ; if (!crtc_state->hdmi_high_tmds_clock_ratio &&
drivers/gpu/drm/i915/display/intel_display.c +274 -266
1,630 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_types.h +26 -2
@@ -749,7 +749,31 @@ enum intel_output_format { };struct intel_crtc_state { -struct drm_crtc_state base; +union { +/* +* uapi (drm) state. This is the software state shown to userspace. +* In particular, the following members are used for bookkeeping: +* - crtc +* - state +* - *_changed +* - event +* - commit +* - mode_blob +*/ +struct drm_crtc_state uapi; + +/* +* actual hardware state, the state we program to the hardware. +* The following members are used to verify the hardware state: +* - enable +* - active +* - mode / adjusted_mode +* - color property blobs. +* +* During initial hw readout, they need to be copied to uapi. +*/ +struct drm_crtc_state hw; + };/** * quirks - bitfield with hw state readout quirks
@@ -1091,7 +1115,7 @@ struct cxsr_latency {#define to_intel_atomic_state (x) container_of(x, struct intel_atomic_state, base)#define to_intel_crtc (x) container_of(x, struct intel_crtc, base) -#define to_intel_crtc_state (x) container_of(x, struct intel_crtc_state, base) +#define to_intel_crtc_state (x) container_of(x, struct intel_crtc_state, uapi)#define to_intel_connector (x) container_of(x, struct intel_connector, base)#define to_intel_encoder (x) container_of(x, struct intel_encoder, base)#define to_intel_framebuffer (x) container_of(x, struct intel_framebuffer, base)
drivers/gpu/drm/i915/display/intel_dp.c +21 -21
153 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dp_mst.c +3 -3
@@ -42,13 +42,13 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,struct drm_connector_state *conn_state, struct link_config_limits *limits) { - struct drm_atomic_state *state = crtc_state->base.state; + struct drm_atomic_state *state = crtc_state->uapi.state;struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_dp *intel_dp = &intel_mst->primary->dp;struct intel_connector *connector =to_intel_connector (conn_state->connector);const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;void *port = connector->port;bool constant_n =drm_dp_has_quirk (&intel_dp->desc,DP_DPCD_QUIRK_CONSTANT_N );
@@ -99,7 +99,7 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (conn_state);const struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;void *port = connector->port;struct link_config_limits limits;int ret;
drivers/gpu/drm/i915/display/intel_dpio_phy.c +7 -7
@@ -739,7 +739,7 @@ void chv_data_lane_soft_reset(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum dpio_channel ch =vlv_dport_to_channel (enc_to_dig_port (&encoder->base)); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;u32 val;
@@ -783,7 +783,7 @@ void chv_phy_pre_pll_enable(struct intel_encoder *encoder, {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel ch =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe; unsigned int lane_mask =
@@ -864,7 +864,7 @@ void chv_phy_pre_encoder_enable(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel ch =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;int data, i, stagger;
@@ -953,7 +953,7 @@ void chv_phy_post_pll_disable(struct intel_encoder *encoder, const struct intel_crtc_state *old_crtc_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum pipe pipe =to_intel_crtc (old_crtc_state->base.crtc)->pipe; +enum pipe pipe =to_intel_crtc (old_crtc_state->uapi.crtc)->pipe;u32 val;vlv_dpio_get (dev_priv);
@@ -1016,7 +1016,7 @@ void vlv_phy_pre_pll_enable(struct intel_encoder *encoder, {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel port =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;
@@ -1046,7 +1046,7 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel port =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;u32 val;
@@ -1075,7 +1075,7 @@ void vlv_phy_reset_lanes(struct intel_encoder *encoder, {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum dpio_channel port =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +10 -10
@@ -136,7 +136,7 @@ void assert_shared_dpll(struct drm_i915_private *dev_priv,*/ void intel_prepare_shared_dpll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc_state->shared_dpll;
@@ -163,7 +163,7 @@ void intel_prepare_shared_dpll(const struct intel_crtc_state *crtc_state)*/ void intel_enable_shared_dpll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc_state->shared_dpll;unsigned int crtc_mask =drm_crtc_mask (&crtc->base);
@@ -208,7 +208,7 @@ void intel_enable_shared_dpll(const struct intel_crtc_state *crtc_state)*/ void intel_disable_shared_dpll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc_state->shared_dpll;unsigned int crtc_mask =drm_crtc_mask (&crtc->base);
@@ -825,7 +825,7 @@ hsw_ddi_hdmi_get_dpll(struct intel_atomic_state *state,static struct intel_shared_dpll *hsw_ddi_dp_get_dpll (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);struct intel_shared_dpll *pll;enum intel_dpll_id pll_id;int clock = crtc_state->port_clock;
@@ -1734,7 +1734,7 @@ static bool bxt_ddi_hdmi_pll_dividers(struct intel_crtc_state *crtc_state, struct bxt_clk_div *clk_div) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct dpll best_clock;/* Calculate HDMI div */
@@ -2257,7 +2257,7 @@ static bool cnl_ddi_calculate_wrpll(struct intel_crtc_state *crtc_state, struct skl_wrpll_params *wrpll_params) { - struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev); + struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);u32 afe_clock = crtc_state->port_clock *5 ;u32 ref_clock;u32 dco_min =7998000 ;
@@ -2523,7 +2523,7 @@ static const struct skl_wrpll_params icl_tbt_pll_19_2MHz_values = {static bool icl_calc_dp_combo_pll (struct intel_crtc_state *crtc_state,struct skl_wrpll_params *pll_params) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);const struct icl_combo_pll_params *params = dev_priv->cdclk.hw.ref ==24000 ? icl_dp_combo_pll_24MHz_values :
@@ -2545,7 +2545,7 @@ static bool icl_calc_dp_combo_pll(struct intel_crtc_state *crtc_state,static bool icl_calc_tbt_pll (struct intel_crtc_state *crtc_state,struct skl_wrpll_params *pll_params) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); *pll_params = dev_priv->cdclk.hw.ref ==24000 ? icl_tbt_pll_24MHz_values : icl_tbt_pll_19_2MHz_values;
@@ -2556,7 +2556,7 @@ static bool icl_calc_dpll_state(struct intel_crtc_state *crtc_state,struct intel_encoder *encoder, struct intel_dpll_hw_state *pll_state) { - struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev); + struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);u32 cfgcr0, cfgcr1;struct skl_wrpll_params pll_params = {0 };bool ret;
@@ -2682,7 +2682,7 @@ static bool icl_mg_pll_find_divisors(int clock_khz, bool is_dp, bool use_ssc,static bool icl_calc_mg_pll_state (struct intel_crtc_state *crtc_state,struct intel_dpll_hw_state *pll_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);int refclk_khz = dev_priv->cdclk.hw.ref;int clock = crtc_state->port_clock;u32 dco_khz, m1div, m2div_int, m2div_rem, m2div_frac;
drivers/gpu/drm/i915/display/intel_dvo.c +7 -7
@@ -178,9 +178,9 @@ static void intel_dvo_get_config(struct intel_encoder *encoder,else flags |=DRM_MODE_FLAG_NVSYNC ; - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags; - pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->hw.adjusted_mode.crtc_clock = pipe_config->port_clock; } static void intel_disable_dvo(struct intel_encoder *encoder,
@@ -207,8 +207,8 @@ static void intel_enable_dvo(struct intel_encoder *encoder,u32 temp =I915_READ (dvo_reg); intel_dvo->dev.dev_ops->mode_set (&intel_dvo->dev, - &pipe_config->base.mode, - &pipe_config->base.adjusted_mode); + &pipe_config->hw.mode, + &pipe_config->hw.adjusted_mode);I915_WRITE (dvo_reg, temp |DVO_ENABLE );I915_READ (dvo_reg);
@@ -253,7 +253,7 @@ static int intel_dvo_compute_config(struct intel_encoder *encoder,struct intel_dvo *intel_dvo =enc_to_dvo (encoder);const struct drm_display_mode *fixed_mode = intel_dvo->attached_connector->panel.fixed_mode; -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;/* * If we have timings from the BIOS for the panel, put them in
@@ -277,8 +277,8 @@ static void intel_dvo_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 *crtc =to_intel_crtc (pipe_config->base.crtc); -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc); +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dvo *intel_dvo =enc_to_dvo (encoder);enum pipe pipe = crtc->pipe;u32 dvo_val;
drivers/gpu/drm/i915/display/intel_fbc.c +1 -1
@@ -667,7 +667,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->vma =NULL ; cache->flags =0 ; - cache->crtc.mode_flags = crtc_state->base.adjusted_mode.flags; + cache->crtc.mode_flags = crtc_state->hw.adjusted_mode.flags;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) cache->crtc.hsw_bdw_pixel_rate = crtc_state->pixel_rate;
drivers/gpu/drm/i915/display/intel_hdmi.c +31 -31
2 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_lspcon.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_lvds.c +6 -6
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_panel.c +7 -7
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_pipe_crc.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_psr.c +5 -5
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_sdvo.c +11 -11
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_sprite.c +13 -12
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_tv.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_vdsc.c +6 -6
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/vlv_dsi.c +10 -10
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/intel_pm.c +89 -91
180 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Part of the diff is not shown here. View the raw message.
Re: [PATCH 03/23] drm/i915: Prepare to split crtc state in uapi and hw state
Quoted 9 lines · Maarten Lankhorst
We want to split
drm_crtc_stateinto the user visible state and actual hardware state. To prepare for this, we need some ground rules what should be in each state:In uapi we use:
- crtc,*_changedflags, event, commit, state,mode_blob, (plane/connector/encoder)_mask.In hw state we use what's displayed in hardware:
- enable, active, (adjusted) mode, color property blobs.
I'd suggest elaborating a bit that the union we add in this patch is just an intermediate step and that the end goal is that we'll eventually be maintaining two separate copies of some of the data.
Quoted 5 lines
clear_intel_crtc_stateand hw readout need to be updated for these rules, which will allow us to enable 2 joined pipes.Signed-off-by Maarten Lankhorst <[email protected]>
It might be worth providing some Coccinelle rules to apply these changes in a semi-automated manner; otherwise it's going to be a hassle to constantly resolve conflicts with pretty much any other display patches that land upstream.
Otherwise,
Quoted 4,948 lines
--- drivers/gpu/drm/i915/display/icl_dsi.c | 18 +- drivers/gpu/drm/i915/display/intel_atomic.c | 14 +- .../gpu/drm/i915/display/intel_atomic_plane.c | 6 +- drivers/gpu/drm/i915/display/intel_audio.c | 12 +- drivers/gpu/drm/i915/display/intel_bw.c | 4 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 16 +- drivers/gpu/drm/i915/display/intel_color.c | 180 +++--- drivers/gpu/drm/i915/display/intel_crt.c | 24 +- drivers/gpu/drm/i915/display/intel_ddi.c | 34 +- drivers/gpu/drm/i915/display/intel_display.c | 540 +++++++++--------- .../drm/i915/display/intel_display_types.h | 28 +- drivers/gpu/drm/i915/display/intel_dp.c | 42 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 14 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 20 +- drivers/gpu/drm/i915/display/intel_dvo.c | 14 +- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 62 +- drivers/gpu/drm/i915/display/intel_lspcon.c | 4 +- drivers/gpu/drm/i915/display/intel_lvds.c | 12 +- drivers/gpu/drm/i915/display/intel_panel.c | 14 +- drivers/gpu/drm/i915/display/intel_pipe_crc.c | 6 +- drivers/gpu/drm/i915/display/intel_psr.c | 10 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 22 +- drivers/gpu/drm/i915/display/intel_sprite.c | 25 +- drivers/gpu/drm/i915/display/intel_tv.c | 8 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 12 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 20 +- drivers/gpu/drm/i915/i915_debugfs.c | 14 +- drivers/gpu/drm/i915/intel_pm.c | 180 +++--- 30 files changed, 699 insertions(+), 664 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +9
-9@@ -276,7 +276,7 @@ static void configure_dual_link_mode(struct intel_encoder *encoder,if (intel_dsi->dual_link ==DSI_DUAL_LINK_FRONT_BACK ) {const struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;u32 dss_ctl2;u16 hactive = adjusted_mode->crtc_hdisplay;u16 dl_buffer_depth;@@ -625,7 +625,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); -struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);enum pipe pipe = intel_crtc->pipe;u32 tmp;enum port port;@@ -768,7 +768,7 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);const struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;enum port port;enum transcoder dsi_trans;/* horizontal timings */ @@ -1216,7 +1216,7 @@ static void gen11_dsi_get_timings(struct intel_encoder *encoder, {struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (intel_dsi->dual_link) { adjusted_mode->crtc_hdisplay *=2 ;@@ -1242,16 +1242,16 @@ static void gen11_dsi_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_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);/* FIXME: adapt icl_ddi_clock_get() for DSI and use that? */ pipe_config->port_clock =cnl_calc_wrpll_link (dev_priv, &pipe_config->dpll_hw_state); - pipe_config->base.adjusted_mode.crtc_clock = intel_dsi->pclk; + pipe_config->hw.adjusted_mode.crtc_clock = intel_dsi->pclk;if (intel_dsi->dual_link) - pipe_config->base.adjusted_mode.crtc_clock *=2 ; + pipe_config->hw.adjusted_mode.crtc_clock *=2 ;gen11_dsi_get_timings (encoder, pipe_config); pipe_config->output_types |=BIT (INTEL_OUTPUT_DSI );@@ -1265,11 +1265,11 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, base);struct intel_connector *intel_connector = intel_dsi->attached_connector; -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);const struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode; pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ;intel_fixed_panel_mode (fixed_mode, adjusted_mode);drivers/gpu/drm/i915/display/intel_atomic.c +9
-5@@ -186,13 +186,14 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector)struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc) { +const struct intel_crtc_state *old_crtc_state =to_intel_crtc_state (crtc->state);struct intel_crtc_state *crtc_state; - crtc_state =kmemdup (crtc->state,sizeof (*crtc_state),GFP_KERNEL ); + crtc_state =kmemdup (old_crtc_state,sizeof (*crtc_state),GFP_KERNEL );if (!crtc_state)return NULL ; -__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->base); +__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false;@@ -205,7 +206,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) crtc_state->fb_bits =0 ; crtc_state->update_planes =0 ; -return &crtc_state->base; +return &crtc_state->uapi; }/** @@ -220,7 +221,10 @@ void intel_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state) { -drm_atomic_helper_crtc_destroy_state (crtc, state); + struct intel_crtc_state *crtc_state = to_intel_crtc_state(state); + +__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +kfree (crtc_state); } static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_state,@@ -316,7 +320,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,struct intel_plane_state *plane_state =NULL ;struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state; -struct drm_atomic_state *drm_state = crtc_state->base.state; +struct drm_atomic_state *drm_state = crtc_state->uapi.state;struct intel_atomic_state *intel_state =to_intel_atomic_state (drm_state);int num_scalers_need;int i;drivers/gpu/drm/i915/display/intel_atomic_plane.c +3
-3@@ -271,7 +271,7 @@ void intel_update_plane(struct intel_plane *plane,const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);trace_intel_update_plane (&plane->base, crtc); plane->update_plane (plane, crtc_state, plane_state);@@ -281,7 +281,7 @@ void intel_update_slave(struct intel_plane *plane,const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);trace_intel_update_plane (&plane->base, crtc); plane->update_slave (plane, crtc_state, plane_state);@@ -290,7 +290,7 @@ void intel_update_slave(struct intel_plane *plane,void intel_disable_plane (struct intel_plane *plane,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);trace_intel_disable_plane (&plane->base, crtc); plane->disable_plane (plane, crtc_state);drivers/gpu/drm/i915/display/intel_audio.c +6
-6@@ -233,7 +233,7 @@ static const struct hdmi_aud_ncts hdmi_aud_ncts_36bpp[] = {static u32 audio_config_hdmi_pixel_clock (const struct intel_crtc_state *crtc_state) {const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;int i;for (i =0 ; i <ARRAY_SIZE (hdmi_audio_clock); i++) {@@ -554,7 +554,7 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder, const struct drm_connector_state *old_conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;enum port port = encoder->port;u32 tmp, eldv;@@ -601,7 +601,7 @@ static void ilk_audio_codec_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 *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_connector *connector = conn_state->connector;enum pipe pipe = crtc->pipe;enum port port = encoder->port;@@ -691,10 +691,10 @@ void intel_audio_codec_enable(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_connector *connector = conn_state->connector;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;enum port port = encoder->port;enum pipe pipe = crtc->pipe;@@ -752,7 +752,7 @@ void intel_audio_codec_disable(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum port port = encoder->port;enum pipe pipe = crtc->pipe;drivers/gpu/drm/i915/display/intel_bw.c +2
-2@@ -264,7 +264,7 @@ static unsigned int intel_bw_crtc_num_active_planes(const struct intel_crtc_statstatic unsigned int intel_bw_crtc_data_rate (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);unsigned int data_rate =0 ;enum plane_id plane_id;@@ -285,7 +285,7 @@ static unsigned int intel_bw_crtc_data_rate(const struct intel_crtc_state *crtc_void intel_bw_crtc_update (struct intel_bw_state *bw_state,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); bw_state->data_rate[crtc->pipe] =intel_bw_crtc_data_rate (crtc_state);drivers/gpu/drm/i915/display/intel_cdclk.c +8
-8@@ -1917,10 +1917,10 @@ static int intel_pixel_rate_to_cdclk(struct drm_i915_private *dev_priv,int intel_crtc_compute_min_cdclk (const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv = -to_i915 (crtc_state->base.crtc->dev); +to_i915 (crtc_state->uapi.crtc->dev);int min_cdclk; -if (!crtc_state->base.enable) +if (!crtc_state->hw.enable)return 0 ; min_cdclk =intel_pixel_rate_to_cdclk (dev_priv, crtc_state->pixel_rate);@@ -2043,7 +2043,7 @@ static u8 bxt_compute_min_voltage_level(struct intel_atomic_state *state) sizeof(state->min_voltage_level));for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) { -if (crtc_state->base.enable) +if (crtc_state->hw.enable) state->min_voltage_level[i] = crtc_state->min_voltage_level;else @@ -2129,7 +2129,7 @@ static int skl_dpll0_vco(struct intel_atomic_state *state) vco = dev_priv->skl_preferred_vco_freq;for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) { -if (!crtc_state->base.enable) +if (!crtc_state->hw.enable)continue ;if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_EDP ))@@ -2255,11 +2255,11 @@ static int intel_modeset_all_pipes(struct intel_atomic_state *state)if (IS_ERR (crtc_state))return PTR_ERR (crtc_state); -if (!crtc_state->base.active || -drm_atomic_crtc_needs_modeset (&crtc_state->base)) +if (!crtc_state->hw.active || +drm_atomic_crtc_needs_modeset (&crtc_state->uapi))continue ; - crtc_state->base.mode_changed = true; + crtc_state->uapi.mode_changed = true; ret =drm_atomic_add_affected_connectors (&state->base, &crtc->base);@@ -2310,7 +2310,7 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state) crtc =intel_get_crtc_for_pipe (dev_priv, pipe); crtc_state =intel_atomic_get_new_crtc_state (state, crtc);if (crtc_state && -drm_atomic_crtc_needs_modeset (&crtc_state->base)) +drm_atomic_crtc_needs_modeset (&crtc_state->uapi)) pipe =INVALID_PIPE ; }else { pipe =INVALID_PIPE ;drivers/gpu/drm/i915/display/intel_color.c +90
-90@@ -101,10 +101,10 @@ static bool lut_is_legacy(const struct drm_property_blob *lut)static bool crtc_state_is_legacy_gamma (const struct intel_crtc_state *crtc_state) { -return !crtc_state->base.degamma_lut && - !crtc_state->base.ctm && - crtc_state->base.gamma_lut && -lut_is_legacy (crtc_state->base.gamma_lut); +return !crtc_state->hw.degamma_lut && + !crtc_state->hw.ctm && + crtc_state->hw.gamma_lut && +lut_is_legacy (crtc_state->hw.gamma_lut); }/* @@ -189,7 +189,7 @@ static void icl_update_output_csc(struct intel_crtc *crtc,static bool ilk_csc_limited_range (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);/* * FIXME if there's a gamma LUT after the CSC, we should @@ -203,7 +203,7 @@ static bool ilk_csc_limited_range(const struct intel_crtc_state *crtc_state)static void ilk_csc_convert_ctm (const struct intel_crtc_state *crtc_state,u16 coeffs[9 ]) { -const struct drm_color_ctm *ctm = crtc_state->base.ctm->data; +const struct drm_color_ctm *ctm = crtc_state->hw.ctm->data;const u64 *input;u64 temp[9 ];int i;@@ -254,11 +254,11 @@ static void ilk_csc_convert_ctm(const struct intel_crtc_state *crtc_state,static void ilk_load_csc_matrix (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);bool limited_color_range =ilk_csc_limited_range (crtc_state); -if (crtc_state->base.ctm) { +if (crtc_state->hw.ctm) {u16 coeff[9 ];ilk_csc_convert_ctm (crtc_state, coeff);@@ -293,10 +293,10 @@ static void ilk_load_csc_matrix(const struct intel_crtc_state *crtc_state)static void icl_load_csc_matrix (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -if (crtc_state->base.ctm) { +if (crtc_state->hw.ctm) {u16 coeff[9 ];ilk_csc_convert_ctm (crtc_state, coeff);@@ -322,12 +322,12 @@ static void icl_load_csc_matrix(const struct intel_crtc_state *crtc_state)*/ static void cherryview_load_csc_matrix (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -if (crtc_state->base.ctm) { -const struct drm_color_ctm *ctm = crtc_state->base.ctm->data; +if (crtc_state->hw.ctm) { +const struct drm_color_ctm *ctm = crtc_state->hw.ctm->data;u16 coeffs[9 ] = {};int i;@@ -388,7 +388,7 @@ static u32 ilk_lut_10(const struct drm_color_lut *color)static void i9xx_load_luts_internal (const struct intel_crtc_state *crtc_state,const struct drm_property_blob *blob) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;int i;@@ -419,12 +419,12 @@ static void i9xx_load_luts_internal(const struct intel_crtc_state *crtc_state,static void i9xx_load_luts (const struct intel_crtc_state *crtc_state) { -i9xx_load_luts_internal (crtc_state, crtc_state->base.gamma_lut); +i9xx_load_luts_internal (crtc_state, crtc_state->hw.gamma_lut); }static void i9xx_color_commit (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;u32 val;@@ -437,7 +437,7 @@ static void i9xx_color_commit(const struct intel_crtc_state *crtc_state)static void ilk_color_commit (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;u32 val;@@ -452,7 +452,7 @@ static void ilk_color_commit(const struct intel_crtc_state *crtc_state)static void hsw_color_commit (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);I915_WRITE (GAMMA_MODE (crtc->pipe), crtc_state->gamma_mode);@@ -462,7 +462,7 @@ static void hsw_color_commit(const struct intel_crtc_state *crtc_state)static void skl_color_commit (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;u32 val =0 ;@@ -508,8 +508,8 @@ static void i965_load_lut_10p6(struct intel_crtc *crtc,static void i965_load_luts (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut;if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT )i9xx_load_luts (crtc_state);@@ -531,8 +531,8 @@ static void ilk_load_lut_10(struct intel_crtc *crtc,static void ilk_load_luts (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut;if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT )i9xx_load_luts (crtc_state);@@ -632,9 +632,9 @@ static void ivb_load_lut_ext_max(struct intel_crtc *crtc)static void ivb_load_luts (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; -const struct drm_property_blob *degamma_lut = crtc_state->base.degamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut; +const struct drm_property_blob *degamma_lut = crtc_state->hw.degamma_lut;if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT ) {i9xx_load_luts (crtc_state);@@ -655,9 +655,9 @@ static void ivb_load_luts(const struct intel_crtc_state *crtc_state)static void bdw_load_luts (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; -const struct drm_property_blob *degamma_lut = crtc_state->base.degamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut; +const struct drm_property_blob *degamma_lut = crtc_state->hw.degamma_lut;if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT ) {i9xx_load_luts (crtc_state);@@ -678,11 +678,11 @@ static void bdw_load_luts(const struct intel_crtc_state *crtc_state)static void glk_load_degamma_lut (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;const u32 lut_size =INTEL_INFO (dev_priv)->color.degamma_lut_size; -const struct drm_color_lut *lut = crtc_state->base.degamma_lut->data; +const struct drm_color_lut *lut = crtc_state->hw.degamma_lut->data;u32 i;/* @@ -717,7 +717,7 @@ static void glk_load_degamma_lut(const struct intel_crtc_state *crtc_state)static void glk_load_degamma_lut_linear (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;const u32 lut_size =INTEL_INFO (dev_priv)->color.degamma_lut_size;@@ -744,8 +744,8 @@ static void glk_load_degamma_lut_linear(const struct intel_crtc_state *crtc_statstatic void glk_load_luts (const struct intel_crtc_state *crtc_state) { -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);/* * On GLK+ both pipe CSC and degamma LUT are controlled @@ -755,7 +755,7 @@ static void glk_load_luts(const struct intel_crtc_state *crtc_state)* the degama LUT so that we don't have to reload * it every time the pipe CSC is being enabled. */ -if (crtc_state->base.degamma_lut) +if (crtc_state->hw.degamma_lut)glk_load_degamma_lut (crtc_state);else glk_load_degamma_lut_linear (crtc_state);@@ -786,7 +786,7 @@ static void icl_load_gcmax(const struct intel_crtc_state *crtc_state, const struct drm_color_lut *color) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -799,9 +799,9 @@ icl_load_gcmax(const struct intel_crtc_state *crtc_state,static void icl_program_gamma_superfine_segment (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -const struct drm_property_blob *blob = crtc_state->base.gamma_lut; +const struct drm_property_blob *blob = crtc_state->hw.gamma_lut;const struct drm_color_lut *lut = blob->data;enum pipe pipe = crtc->pipe;u32 i;@@ -828,9 +828,9 @@ icl_program_gamma_superfine_segment(const struct intel_crtc_state *crtc_state)static void icl_program_gamma_multi_segment (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -const struct drm_property_blob *blob = crtc_state->base.gamma_lut; +const struct drm_property_blob *blob = crtc_state->hw.gamma_lut;const struct drm_color_lut *lut = blob->data;const struct drm_color_lut *entry;enum pipe pipe = crtc->pipe;@@ -880,10 +880,10 @@ icl_program_gamma_multi_segment(const struct intel_crtc_state *crtc_state)static void icl_load_luts (const struct intel_crtc_state *crtc_state) { -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); -if (crtc_state->base.degamma_lut) +if (crtc_state->hw.degamma_lut)glk_load_degamma_lut (crtc_state);switch (crtc_state->gamma_mode &GAMMA_MODE_MODE_MASK ) {@@ -958,9 +958,9 @@ static void chv_load_cgm_gamma(struct intel_crtc *crtc,static void chv_load_luts (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; -const struct drm_property_blob *degamma_lut = crtc_state->base.degamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut; +const struct drm_property_blob *degamma_lut = crtc_state->hw.degamma_lut;cherryview_load_csc_matrix (crtc_state);@@ -978,28 +978,28 @@ static void chv_load_luts(const struct intel_crtc_state *crtc_state)void intel_color_load_luts (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); dev_priv->display.load_luts (crtc_state); }void intel_color_commit (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); dev_priv->display.color_commit (crtc_state); }int intel_color_check (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);return dev_priv->display.color_check (crtc_state); }void intel_color_get_config (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);if (dev_priv->display.read_luts) dev_priv->display.read_luts (crtc_state);@@ -1023,16 +1023,16 @@ static bool need_plane_update(struct intel_plane *plane,static int intel_color_add_affected_planes (struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_atomic_state *state = -to_intel_atomic_state (new_crtc_state->base.state); +to_intel_atomic_state (new_crtc_state->uapi.state);const struct intel_crtc_state *old_crtc_state =intel_atomic_get_old_crtc_state (state, crtc);struct intel_plane *plane; -if (!new_crtc_state->base.active || -drm_atomic_crtc_needs_modeset (&new_crtc_state->base)) +if (!new_crtc_state->hw.active || +drm_atomic_crtc_needs_modeset (&new_crtc_state->uapi))return 0 ; if (new_crtc_state->gamma_enable == old_crtc_state->gamma_enable &&@@ -1074,9 +1074,9 @@ static int check_lut_size(const struct drm_property_blob *lut, int expected)static int check_luts (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; -const struct drm_property_blob *degamma_lut = crtc_state->base.degamma_lut; +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut; +const struct drm_property_blob *degamma_lut = crtc_state->hw.degamma_lut;int gamma_length, degamma_length;u32 gamma_tests, degamma_tests;@@ -1124,7 +1124,7 @@ static int i9xx_color_check(struct intel_crtc_state *crtc_state)return ret; crtc_state->gamma_enable = - crtc_state->base.gamma_lut && + crtc_state->hw.gamma_lut && !crtc_state->c8_planes; crtc_state->gamma_mode =i9xx_gamma_mode (crtc_state);@@ -1143,11 +1143,11 @@ static u32 chv_cgm_mode(const struct intel_crtc_state *crtc_state)if (crtc_state_is_legacy_gamma (crtc_state))return 0 ; -if (crtc_state->base.degamma_lut) +if (crtc_state->hw.degamma_lut) cgm_mode |=CGM_PIPE_MODE_DEGAMMA ; -if (crtc_state->base.ctm) +if (crtc_state->hw.ctm) cgm_mode |=CGM_PIPE_MODE_CSC ; -if (crtc_state->base.gamma_lut) +if (crtc_state->hw.gamma_lut) cgm_mode |=CGM_PIPE_MODE_GAMMA ;return cgm_mode;@@ -1206,7 +1206,7 @@ static int ilk_color_check(struct intel_crtc_state *crtc_state)return ret; crtc_state->gamma_enable = - crtc_state->base.gamma_lut && + crtc_state->hw.gamma_lut && !crtc_state->c8_planes;/* @@ -1232,8 +1232,8 @@ static u32 ivb_gamma_mode(const struct intel_crtc_state *crtc_state)if (!crtc_state->gamma_enable ||crtc_state_is_legacy_gamma (crtc_state))return GAMMA_MODE_MODE_8BIT ; -else if (crtc_state->base.gamma_lut && - crtc_state->base.degamma_lut) +else if (crtc_state->hw.gamma_lut && + crtc_state->hw.degamma_lut)return GAMMA_MODE_MODE_SPLIT ;else return GAMMA_MODE_MODE_10BIT ;@@ -1247,7 +1247,7 @@ static u32 ivb_csc_mode(const struct intel_crtc_state *crtc_state)* CSC comes after the LUT in degamma, RGB->YCbCr, * and RGB full->limited range mode. */ -if (crtc_state->base.degamma_lut || +if (crtc_state->hw.degamma_lut || crtc_state->output_format !=INTEL_OUTPUT_FORMAT_RGB || limited_color_range)return 0 ;@@ -1265,13 +1265,13 @@ static int ivb_color_check(struct intel_crtc_state *crtc_state)return ret; crtc_state->gamma_enable = - (crtc_state->base.gamma_lut || - crtc_state->base.degamma_lut) && + (crtc_state->hw.gamma_lut || + crtc_state->hw.degamma_lut) && !crtc_state->c8_planes; crtc_state->csc_enable = crtc_state->output_format !=INTEL_OUTPUT_FORMAT_RGB || - crtc_state->base.ctm || limited_color_range; + crtc_state->hw.ctm || limited_color_range; crtc_state->gamma_mode =ivb_gamma_mode (crtc_state);@@ -1302,14 +1302,14 @@ static int glk_color_check(struct intel_crtc_state *crtc_state)return ret; crtc_state->gamma_enable = - crtc_state->base.gamma_lut && + crtc_state->hw.gamma_lut && !crtc_state->c8_planes;/* On GLK+ degamma LUT is controlled by csc_enable */ crtc_state->csc_enable = - crtc_state->base.degamma_lut || + crtc_state->hw.degamma_lut || crtc_state->output_format !=INTEL_OUTPUT_FORMAT_RGB || - crtc_state->base.ctm || crtc_state->limited_color_range; + crtc_state->hw.ctm || crtc_state->limited_color_range; crtc_state->gamma_mode =glk_gamma_mode (crtc_state);@@ -1326,14 +1326,14 @@ static u32 icl_gamma_mode(const struct intel_crtc_state *crtc_state) {u32 gamma_mode =0 ; -if (crtc_state->base.degamma_lut) +if (crtc_state->hw.degamma_lut) gamma_mode |=PRE_CSC_GAMMA_ENABLE ; -if (crtc_state->base.gamma_lut && +if (crtc_state->hw.gamma_lut && !crtc_state->c8_planes) gamma_mode |=POST_CSC_GAMMA_ENABLE ; -if (!crtc_state->base.gamma_lut || +if (!crtc_state->hw.gamma_lut ||crtc_state_is_legacy_gamma (crtc_state)) gamma_mode |=GAMMA_MODE_MODE_8BIT ;else @@ -1346,7 +1346,7 @@ static u32 icl_csc_mode(const struct intel_crtc_state *crtc_state) {u32 csc_mode =0 ; -if (crtc_state->base.ctm) +if (crtc_state->hw.ctm) csc_mode |=ICL_CSC_ENABLE ; if (crtc_state->output_format != INTEL_OUTPUT_FORMAT_RGB ||@@ -1423,7 +1423,7 @@ static int glk_gamma_precision(const struct intel_crtc_state *crtc_state)int intel_color_get_gamma_bit_precision (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (!crtc_state->gamma_enable)@@ -1532,7 +1532,7 @@ static u32 intel_color_lut_pack(u32 val, u32 bit_precision)static struct drm_property_blob *i9xx_read_lut_8 (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;struct drm_property_blob *blob;@@ -1566,13 +1566,13 @@ i9xx_read_lut_8(const struct intel_crtc_state *crtc_state)static void i9xx_read_luts (struct intel_crtc_state *crtc_state) { - crtc_state->base.gamma_lut =i9xx_read_lut_8 (crtc_state); + crtc_state->uapi.gamma_lut =i9xx_read_lut_8 (crtc_state); }static struct drm_property_blob *i965_read_lut_10p6 (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 lut_size =INTEL_INFO (dev_priv)->color.gamma_lut_size;enum pipe pipe = crtc->pipe;@@ -1613,15 +1613,15 @@ i965_read_lut_10p6(const struct intel_crtc_state *crtc_state)static void i965_read_luts (struct intel_crtc_state *crtc_state) {if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT ) - crtc_state->base.gamma_lut =i9xx_read_lut_8 (crtc_state); + crtc_state->uapi.gamma_lut =i9xx_read_lut_8 (crtc_state);else - crtc_state->base.gamma_lut =i965_read_lut_10p6 (crtc_state); + crtc_state->uapi.gamma_lut =i965_read_lut_10p6 (crtc_state); }static struct drm_property_blob *chv_read_cgm_lut (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 lut_size =INTEL_INFO (dev_priv)->color.gamma_lut_size;enum pipe pipe = crtc->pipe;@@ -1655,15 +1655,15 @@ chv_read_cgm_lut(const struct intel_crtc_state *crtc_state)static void chv_read_luts (struct intel_crtc_state *crtc_state) {if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT ) - crtc_state->base.gamma_lut =i9xx_read_lut_8 (crtc_state); + crtc_state->uapi.gamma_lut =i9xx_read_lut_8 (crtc_state);else - crtc_state->base.gamma_lut =chv_read_cgm_lut (crtc_state); + crtc_state->uapi.gamma_lut =chv_read_cgm_lut (crtc_state); }static struct drm_property_blob *ilk_read_lut_10 (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 lut_size =INTEL_INFO (dev_priv)->color.gamma_lut_size;enum pipe pipe = crtc->pipe;@@ -1696,15 +1696,15 @@ ilk_read_lut_10(const struct intel_crtc_state *crtc_state)static void ilk_read_luts (struct intel_crtc_state *crtc_state) {if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT ) - crtc_state->base.gamma_lut =i9xx_read_lut_8 (crtc_state); + crtc_state->uapi.gamma_lut =i9xx_read_lut_8 (crtc_state);else - crtc_state->base.gamma_lut =ilk_read_lut_10 (crtc_state); + crtc_state->uapi.gamma_lut =ilk_read_lut_10 (crtc_state); }static struct drm_property_blob *glk_read_lut_10 (const struct intel_crtc_state *crtc_state,u32 prec_index) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);int hw_lut_size =ivb_lut_10_size (prec_index);enum pipe pipe = crtc->pipe;@@ -1742,9 +1742,9 @@ glk_read_lut_10(const struct intel_crtc_state *crtc_state, u32 prec_index)static void glk_read_luts (struct intel_crtc_state *crtc_state) {if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT ) - crtc_state->base.gamma_lut =i9xx_read_lut_8 (crtc_state); + crtc_state->uapi.gamma_lut =i9xx_read_lut_8 (crtc_state);else - crtc_state->base.gamma_lut =glk_read_lut_10 (crtc_state,PAL_PREC_INDEX_VALUE (0 )); + crtc_state->uapi.gamma_lut =glk_read_lut_10 (crtc_state,PAL_PREC_INDEX_VALUE (0 )); }void intel_color_init (struct intel_crtc *crtc)drivers/gpu/drm/i915/display/intel_crt.c +12
-12@@ -132,9 +132,9 @@ static void intel_crt_get_config(struct intel_encoder *encoder, { pipe_config->output_types |=BIT (INTEL_OUTPUT_ANALOG ); - pipe_config->base.adjusted_mode.flags |=intel_crt_get_flags (encoder); + pipe_config->hw.adjusted_mode.flags |=intel_crt_get_flags (encoder); - pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->hw.adjusted_mode.crtc_clock = pipe_config->port_clock; } static void hsw_crt_get_config(struct intel_encoder *encoder,@@ -144,13 +144,13 @@ static void hsw_crt_get_config(struct intel_encoder *encoder,intel_ddi_get_config (encoder, pipe_config); - pipe_config->base.adjusted_mode.flags &= ~(DRM_MODE_FLAG_PHSYNC | + pipe_config->hw.adjusted_mode.flags &= ~(DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC |DRM_MODE_FLAG_NVSYNC ); - pipe_config->base.adjusted_mode.flags |=intel_crt_get_flags (encoder); + pipe_config->hw.adjusted_mode.flags |=intel_crt_get_flags (encoder); - pipe_config->base.adjusted_mode.crtc_clock =lpt_get_iclkip (dev_priv); + pipe_config->hw.adjusted_mode.crtc_clock =lpt_get_iclkip (dev_priv); }/* Note: The caller is required to filter out dpms modes not supported by the @@ -161,8 +161,8 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crt *crt =intel_encoder_to_crt (encoder); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;u32 adpa;if (INTEL_GEN (dev_priv) >=5 )@@ -271,7 +271,7 @@ static void hsw_pre_enable_crt(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 *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;WARN_ON (!crtc_state->has_pch_encoder);@@ -288,7 +288,7 @@ static void hsw_enable_crt(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 *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;WARN_ON (!crtc_state->has_pch_encoder);@@ -358,7 +358,7 @@ static int intel_crt_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLSCAN )return -EINVAL ;@@ -373,7 +373,7 @@ static int pch_crt_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLSCAN )return -EINVAL ;@@ -390,7 +390,7 @@ static int hsw_crt_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; + &pipe_config->hw.adjusted_mode;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLSCAN )return -EINVAL ;drivers/gpu/drm/i915/display/intel_ddi.c +17
-17@@ -1483,7 +1483,7 @@ static void ddi_dotclock_get(struct intel_crtc_state *pipe_config)if (pipe_config->fec_enable) dotclock =intel_dp_fec_to_mode_clock (dotclock); - pipe_config->base.adjusted_mode.crtc_clock = dotclock; + pipe_config->hw.adjusted_mode.crtc_clock = dotclock; } static void icl_ddi_clock_get(struct intel_encoder *encoder,@@ -1698,7 +1698,7 @@ static void intel_ddi_clock_get(struct intel_encoder *encoder,void intel_ddi_set_pipe_settings (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;@@ -1752,7 +1752,7 @@ void intel_ddi_set_pipe_settings(const struct intel_crtc_state *crtc_state)void intel_ddi_set_vc_payload_alloc (const struct intel_crtc_state *crtc_state,bool state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;@@ -1774,7 +1774,7 @@ void intel_ddi_set_vc_payload_alloc(const struct intel_crtc_state *crtc_state,static u32 intel_ddi_transcoder_func_reg_val_get (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_encoder *encoder =intel_ddi_get_crtc_encoder (crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -1806,9 +1806,9 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state)BUG (); } -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) temp |=TRANS_DDI_PVSYNC ; -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) temp |=TRANS_DDI_PHSYNC ;if (cpu_transcoder ==TRANSCODER_EDP ) {@@ -1861,7 +1861,7 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state)void intel_ddi_enable_transcoder_func (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;@@ -1877,7 +1877,7 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)static void intel_ddi_config_transcoder_func (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;@@ -1889,7 +1889,7 @@ intel_ddi_config_transcoder_func(const struct intel_crtc_state *crtc_state)void intel_ddi_disable_transcoder_func (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;i915_reg_t reg =TRANS_DDI_FUNC_CTL (cpu_transcoder);@@ -2187,7 +2187,7 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder,void intel_ddi_enable_pipe_clock (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_encoder *encoder =intel_ddi_get_crtc_encoder (crtc);enum port port = encoder->port;@@ -2205,7 +2205,7 @@ void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state)void intel_ddi_disable_pipe_clock (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;if (cpu_transcoder !=TRANSCODER_EDP ) {@@ -3421,7 +3421,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -3846,7 +3846,7 @@ intel_ddi_update_prepare(struct intel_atomic_state *state,WARN_ON (crtc && crtc->active);intel_tc_port_get_link (enc_to_dig_port (&encoder->base), required_lanes); -if (crtc_state && crtc_state->base.active) +if (crtc_state && crtc_state->hw.active)intel_update_active_dpll (state, crtc, encoder); }@@ -3976,7 +3976,7 @@ void intel_ddi_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_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;u32 temp, flags =0 ;@@ -3994,7 +3994,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,else flags |=DRM_MODE_FLAG_NVSYNC ; - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags;switch (temp &TRANS_DDI_BPC_MASK ) {case TRANS_DDI_BPC_6 :@@ -4136,7 +4136,7 @@ static int intel_ddi_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port = encoder->port;int ret;@@ -4267,7 +4267,7 @@ static int intel_hdmi_reset_link(struct intel_encoder *encoder,WARN_ON (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )); -if (!crtc_state->base.active) +if (!crtc_state->hw.active)return 0 ; if (!crtc_state->hdmi_high_tmds_clock_ratio &&drivers/gpu/drm/i915/display/intel_display.c +274
-266@@ -518,7 +518,7 @@ icl_wa_scalerclkgating(struct drm_i915_private *dev_priv, enum pipe pipe,static bool needs_modeset (const struct intel_crtc_state *state) { -return drm_atomic_crtc_needs_modeset (&state->base); +return drm_atomic_crtc_needs_modeset (&state->uapi); }/* @@ -632,7 +632,7 @@ i9xx_select_p2_div(const struct intel_limit *limit, const struct intel_crtc_state *crtc_state, int target) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) {/* @@ -668,7 +668,7 @@ i9xx_find_best_dpll(const struct intel_limit *limit, int target, int refclk, struct dpll *match_clock, struct dpll *best_clock) { - struct drm_device *dev = crtc_state->base.crtc->dev; + struct drm_device *dev = crtc_state->uapi.crtc->dev;struct dpll clock;int err = target;@@ -726,7 +726,7 @@ pnv_find_best_dpll(const struct intel_limit *limit, int target, int refclk, struct dpll *match_clock, struct dpll *best_clock) { - struct drm_device *dev = crtc_state->base.crtc->dev; + struct drm_device *dev = crtc_state->uapi.crtc->dev;struct dpll clock;int err = target;@@ -782,7 +782,7 @@ g4x_find_best_dpll(const struct intel_limit *limit, int target, int refclk, struct dpll *match_clock, struct dpll *best_clock) { - struct drm_device *dev = crtc_state->base.crtc->dev; + struct drm_device *dev = crtc_state->uapi.crtc->dev;struct dpll clock;int max_n;bool found = false;@@ -876,7 +876,7 @@ vlv_find_best_dpll(const struct intel_limit *limit, int target, int refclk, struct dpll *match_clock, struct dpll *best_clock) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;struct dpll clock;unsigned int bestppm =1000000 ;@@ -936,7 +936,7 @@ chv_find_best_dpll(const struct intel_limit *limit, int target, int refclk, struct dpll *match_clock, struct dpll *best_clock) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;unsigned int best_error_ppm;struct dpll clock;@@ -1015,7 +1015,7 @@ bool intel_crtc_active(struct intel_crtc *crtc)* for atomic. */ return crtc->active && crtc->base.primary->state->fb && - crtc->config->base.adjusted_mode.crtc_clock; + crtc->config->hw.adjusted_mode.crtc_clock; } enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,@@ -1069,7 +1069,7 @@ static void intel_wait_for_pipe_scanline_moving(struct intel_crtc *crtc)static void intel_wait_for_pipe_off (const struct intel_crtc_state *old_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (INTEL_GEN (dev_priv) >=4 ) {@@ -1528,7 +1528,7 @@ static void i9xx_enable_pll(struct intel_crtc *crtc,static void i9xx_disable_pll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -1619,7 +1619,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,static void ironlake_enable_pch_transcoder (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;i915_reg_t reg;@@ -1763,7 +1763,7 @@ enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc)static u32 intel_crtc_max_vblank_count (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);/* * On i965gm the hardware frame counter reads @@ -1783,7 +1783,7 @@ static u32 intel_crtc_max_vblank_count(const struct intel_crtc_state *crtc_statestatic void intel_crtc_vblank_on (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);drm_crtc_set_max_vblank_count (&crtc->base,intel_crtc_max_vblank_count (crtc_state));@@ -1792,7 +1792,7 @@ static void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state)static void intel_enable_pipe (const struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = new_crtc_state->cpu_transcoder;enum pipe pipe = crtc->pipe;@@ -1850,7 +1850,7 @@ static void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state)static void intel_disable_pipe (const struct intel_crtc_state *old_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;enum pipe pipe = crtc->pipe;@@ -3116,14 +3116,14 @@ intel_set_plane_visible(struct intel_crtc_state *crtc_state, plane_state->base.visible = visible;if (visible) - crtc_state->base.plane_mask |=drm_plane_mask (&plane->base); + crtc_state->uapi.plane_mask |=drm_plane_mask (&plane->base);else - crtc_state->base.plane_mask &= ~drm_plane_mask (&plane->base); + crtc_state->uapi.plane_mask &= ~drm_plane_mask (&plane->base); }static void fixup_active_planes (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);struct drm_plane *plane;/* @@ -3134,7 +3134,7 @@ static void fixup_active_planes(struct intel_crtc_state *crtc_state) crtc_state->active_planes =0 ;drm_for_each_plane_mask (plane, &dev_priv->drm, - crtc_state->base.plane_mask) + crtc_state->uapi.plane_mask) crtc_state->active_planes |=BIT (to_intel_plane (plane)->id); }@@ -3608,7 +3608,7 @@ i9xx_plane_max_stride(struct intel_plane *plane,static u32 i9xx_plane_ctl_crtc (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 dspcntr =0 ;@@ -3762,7 +3762,7 @@ i9xx_plane_check(struct intel_crtc_state *crtc_state,return ret; ret = drm_atomic_helper_check_plane_state(&plane_state->base, - &crtc_state->base, + &crtc_state->uapi, DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_HELPER_NO_SCALING, i9xx_plane_has_windowing(plane),@@ -3938,7 +3938,7 @@ static void skl_detach_scaler(struct intel_crtc *intel_crtc, int id)*/ static void skl_detach_scalers (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);const struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state;int i;@@ -4133,7 +4133,7 @@ static u32 cnl_plane_ctl_flip(unsigned int reflect)u32 skl_plane_ctl_crtc (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);u32 plane_ctl =0 ;if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv))@@ -4189,7 +4189,7 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,u32 glk_plane_color_ctl_crtc (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);u32 plane_color_ctl =0 ;if (INTEL_GEN (dev_priv) >=11 )@@ -4411,11 +4411,11 @@ static void icl_set_pipe_chicken(struct intel_crtc *crtc)static void intel_update_pipe_config (const struct intel_crtc_state *old_crtc_state,const struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);/* drm_atomic_helper_update_legacy_modeset_state might not be called. */ - crtc->base.mode = new_crtc_state->base.mode; + crtc->base.mode = new_crtc_state->uapi.mode;/* * Update pipe size and adjust fitter if needed: the reason for this is @@ -4844,7 +4844,7 @@ static void ivb_manual_fdi_link_train(struct intel_crtc *crtc,static void ironlake_fdi_pll_enable (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (intel_crtc->base.dev);enum pipe pipe = intel_crtc->pipe;i915_reg_t reg;@@ -5005,9 +5005,9 @@ void lpt_disable_iclkip(struct drm_i915_private *dev_priv)/* Program iCLKIP clock to the desired frequency */ static void lpt_program_iclkip (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -int clock = crtc_state->base.adjusted_mode.crtc_clock; +int clock = crtc_state->hw.adjusted_mode.crtc_clock;u32 divsel, phaseinc, auxdiv, phasedir =0 ;u32 temp;@@ -5121,7 +5121,7 @@ int lpt_get_iclkip(struct drm_i915_private *dev_priv)static void ironlake_pch_transcoder_set_timings (const struct intel_crtc_state *crtc_state,enum pipe pch_transcoder) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;@@ -5164,7 +5164,7 @@ static void cpt_set_fdi_bc_bifurcation(struct drm_i915_private *dev_priv, bool estatic void ivybridge_update_fdi_bc_bifurcation (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);switch (crtc->pipe) {@@ -5194,7 +5194,7 @@ static struct intel_encoder * intel_get_crtc_new_encoder(const struct intel_atomic_state *state, const struct intel_crtc_state *crtc_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);const struct drm_connector_state *connector_state;const struct drm_connector *connector;struct intel_encoder *encoder =NULL ;@@ -5226,7 +5226,7 @@ intel_get_crtc_new_encoder(const struct intel_atomic_state *state,static void ironlake_pch_enable (const struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);enum pipe pipe = crtc->pipe;@@ -5280,7 +5280,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,if (HAS_PCH_CPT (dev_priv) &&intel_crtc_has_dp_encoder (crtc_state)) {const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;u32 bpc = (I915_READ (PIPECONF (pipe)) &PIPECONF_BPC_MASK ) >>5 ;i915_reg_t reg =TRANS_DP_CTL (pipe);enum port port;@@ -5310,7 +5310,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,static void lpt_pch_enable (const struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;@@ -5427,10 +5427,10 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state;struct intel_crtc *intel_crtc = -to_intel_crtc (crtc_state->base.crtc); +to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (intel_crtc->base.dev);const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;/* * Src coordinates are already rotated by 270 degrees for @@ -5446,7 +5446,7 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,* Once NV12 is enabled, handle it here while allocating scaler * for NV12. */ -if (INTEL_GEN (dev_priv) >=9 && crtc_state->base.enable && +if (INTEL_GEN (dev_priv) >=9 && crtc_state->hw.enable && need_scaler && adjusted_mode->flags &DRM_MODE_FLAG_INTERLACE ) {DRM_DEBUG_KMS ("Pipe/Plane scaling not supported with IF-ID mode\n" );return -EINVAL ;@@ -5518,13 +5518,13 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,*/ int skl_update_scaler_crtc (struct intel_crtc_state *state) { -const struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &state->hw.adjusted_mode;bool need_scaler = false;if (state->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 ) need_scaler = true; - return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX, + return skl_update_scaler(state, !state->hw.active, SKL_CRTC_INDEX, &state->scaler_state.scaler_id, state->pipe_src_w, state->pipe_src_h, adjusted_mode->crtc_hdisplay,@@ -5624,7 +5624,7 @@ static void skylake_scaler_disable(struct intel_crtc *crtc)static void skylake_pfit_enable (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; const struct intel_crtc_scaler_state *scaler_state =@@ -5661,7 +5661,7 @@ static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state)static void ironlake_pfit_enable (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -5682,7 +5682,7 @@ static void ironlake_pfit_enable(const struct intel_crtc_state *crtc_state)void hsw_enable_ips (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);@@ -5718,7 +5718,7 @@ void hsw_enable_ips(const struct intel_crtc_state *crtc_state)void hsw_disable_ips (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);@@ -5828,7 +5828,7 @@ intel_pre_disable_primary_noatomic(struct drm_crtc *crtc)static bool hsw_pre_update_disable_ips (const struct intel_crtc_state *old_crtc_state,const struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (!old_crtc_state->ips_enabled)@@ -5844,7 +5844,7 @@ static bool hsw_pre_update_disable_ips(const struct intel_crtc_state *old_crtc_s* Disable IPS before we program the LUT. */ if (IS_HASWELL (dev_priv) && - (new_crtc_state->base.color_mgmt_changed || + (new_crtc_state->uapi.color_mgmt_changed || new_crtc_state->update_pipe) && new_crtc_state->gamma_mode ==GAMMA_MODE_MODE_SPLIT )return true;@@ -5855,7 +5855,7 @@ static bool hsw_pre_update_disable_ips(const struct intel_crtc_state *old_crtc_sstatic bool hsw_post_update_enable_ips (const struct intel_crtc_state *old_crtc_state,const struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (!new_crtc_state->ips_enabled)@@ -5871,7 +5871,7 @@ static bool hsw_post_update_enable_ips(const struct intel_crtc_state *old_crtc_s* Re-enable IPS after the LUT has been programmed. */ if (IS_HASWELL (dev_priv) && - (new_crtc_state->base.color_mgmt_changed || + (new_crtc_state->uapi.color_mgmt_changed || new_crtc_state->update_pipe) && new_crtc_state->gamma_mode ==GAMMA_MODE_MODE_SPLIT )return true;@@ -5881,7 +5881,7 @@ static bool hsw_post_update_enable_ips(const struct intel_crtc_state *old_crtc_s* forcibly enable IPS on the first fastset. */ if (new_crtc_state->update_pipe && - old_crtc_state->base.adjusted_mode.private_flags &I915_MODE_FLAG_INHERITED ) + old_crtc_state->hw.adjusted_mode.private_flags &I915_MODE_FLAG_INHERITED )return true;return !old_crtc_state->ips_enabled;@@ -5912,10 +5912,10 @@ static bool needs_scalerclk_wa(struct drm_i915_private *dev_priv,static void intel_post_plane_update (struct intel_crtc_state *old_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct drm_atomic_state *state = old_crtc_state->base.state; +struct drm_atomic_state *state = old_crtc_state->uapi.state;struct intel_crtc_state *pipe_config =intel_atomic_get_new_crtc_state (to_intel_atomic_state (state), crtc);@@ -5925,7 +5925,7 @@ static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)intel_frontbuffer_flip (to_i915 (crtc->base.dev), pipe_config->fb_bits); -if (pipe_config->update_wm_post && pipe_config->base.active) +if (pipe_config->update_wm_post && pipe_config->hw.active)intel_update_watermarks (crtc);if (hsw_post_update_enable_ips (old_crtc_state, pipe_config))@@ -5955,10 +5955,10 @@ static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)static void intel_pre_plane_update (struct intel_crtc_state *old_crtc_state,struct intel_crtc_state *pipe_config) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct drm_atomic_state *state = old_crtc_state->base.state; +struct drm_atomic_state *state = old_crtc_state->uapi.state;struct drm_plane *primary = crtc->base.primary;struct drm_plane_state *old_primary_state =drm_atomic_get_old_plane_state (state, primary);@@ -6003,7 +6003,7 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,* event which is after the vblank start event, so we need to have a * wait-for-vblank between disabling the plane and the pipe. */ -if (HAS_GMCH (dev_priv) && old_crtc_state->base.active && +if (HAS_GMCH (dev_priv) && old_crtc_state->hw.active && pipe_config->disable_cxsr &&intel_set_memory_cxsr (dev_priv, false))intel_wait_for_vblank (dev_priv, crtc->pipe);@@ -6015,7 +6015,7 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,* WaCxSRDisabledForSpriteScaling:ivb */ if (pipe_config->disable_lp_wm &&ilk_disable_lp_wm (dev) && - old_crtc_state->base.active) + old_crtc_state->hw.active)intel_wait_for_vblank (dev_priv, crtc->pipe);/* @@ -6310,7 +6310,7 @@ static void intel_encoders_update_pipe(struct intel_crtc *crtc,static void intel_disable_primary_plane (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_plane *plane =to_intel_plane (crtc->base.primary); plane->disable_plane (plane, crtc_state);@@ -6319,7 +6319,7 @@ static void intel_disable_primary_plane(const struct intel_crtc_state *crtc_statstatic void ironlake_crtc_enable (struct intel_crtc_state *pipe_config,struct intel_atomic_state *state) { -struct drm_crtc *crtc = pipe_config->base.crtc; +struct drm_crtc *crtc = pipe_config->uapi.crtc;struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);@@ -6453,7 +6453,7 @@ static void icl_pipe_mbus_enable(struct intel_crtc *crtc)static void haswell_crtc_enable (struct intel_crtc_state *pipe_config,struct intel_atomic_state *state) { -struct drm_crtc *crtc = pipe_config->base.crtc; +struct drm_crtc *crtc = pipe_config->uapi.crtc;struct drm_i915_private *dev_priv =to_i915 (crtc->dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);enum pipe pipe = intel_crtc->pipe, hsw_workaround_pipe;@@ -6562,7 +6562,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,static void ironlake_pfit_disable (const struct intel_crtc_state *old_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -6578,7 +6578,7 @@ static void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state)static void ironlake_crtc_disable (struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *state) { -struct drm_crtc *crtc = old_crtc_state->base.crtc; +struct drm_crtc *crtc = old_crtc_state->uapi.crtc;struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);@@ -6637,7 +6637,7 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,static void haswell_crtc_disable (struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *state) { -struct drm_crtc *crtc = old_crtc_state->base.crtc; +struct drm_crtc *crtc = old_crtc_state->uapi.crtc;struct drm_i915_private *dev_priv =to_i915 (crtc->dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;@@ -6671,7 +6671,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,static void i9xx_pfit_enable (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (!crtc_state->gmch_pfit.control)@@ -6801,14 +6801,14 @@ intel_aux_power_domain(struct intel_digital_port *dig_port)static u64 get_crtc_power_domains (struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct drm_encoder *encoder;enum pipe pipe = crtc->pipe;u64 mask;enum transcoder transcoder = crtc_state->cpu_transcoder; -if (!crtc_state->base.active) +if (!crtc_state->hw.active)return 0 ; mask =BIT_ULL (POWER_DOMAIN_PIPE (pipe));@@ -6818,7 +6818,7 @@ static u64 get_crtc_power_domains(struct intel_crtc_state *crtc_state) mask |=BIT_ULL (POWER_DOMAIN_PIPE_PANEL_FITTER (pipe));drm_for_each_encoder_mask (encoder, &dev_priv->drm, - crtc_state->base.encoder_mask) { + crtc_state->uapi.encoder_mask) {struct intel_encoder *intel_encoder =to_intel_encoder (encoder); mask |=BIT_ULL (intel_encoder->power_domain);@@ -6836,7 +6836,7 @@ static u64 get_crtc_power_domains(struct intel_crtc_state *crtc_state)static u64 modeset_get_crtc_power_domains (struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum intel_display_power_domain domain;u64 domains, new_domains, old_domains;@@ -6865,7 +6865,7 @@ static void modeset_put_power_domains(struct drm_i915_private *dev_priv,static void valleyview_crtc_enable (struct intel_crtc_state *pipe_config,struct intel_atomic_state *state) { -struct drm_crtc *crtc = pipe_config->base.crtc; +struct drm_crtc *crtc = pipe_config->uapi.crtc;struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);@@ -6921,7 +6921,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,static void i9xx_set_pll_dividers (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);I915_WRITE (FP0 (crtc->pipe), crtc_state->dpll_hw_state.fp0);@@ -6931,7 +6931,7 @@ static void i9xx_set_pll_dividers(const struct intel_crtc_state *crtc_state)static void i9xx_crtc_enable (struct intel_crtc_state *pipe_config,struct intel_atomic_state *state) { -struct drm_crtc *crtc = pipe_config->base.crtc; +struct drm_crtc *crtc = pipe_config->uapi.crtc;struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);@@ -6981,7 +6981,7 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config,static void i9xx_pfit_disable (const struct intel_crtc_state *old_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (!old_crtc_state->gmch_pfit.control)@@ -6997,7 +6997,7 @@ static void i9xx_pfit_disable(const struct intel_crtc_state *old_crtc_state)static void i9xx_crtc_disable (struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *state) { -struct drm_crtc *crtc = old_crtc_state->base.crtc; +struct drm_crtc *crtc = old_crtc_state->uapi.crtc;struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);@@ -7165,8 +7165,8 @@ static void intel_connector_verify_state(struct intel_crtc_state *crtc_state,if (!crtc_state)return ; -I915_STATE_WARN (!crtc_state->base.active, -"connector is active, but attached crtc isn't\n" ); +I915_STATE_WARN (!crtc_state->hw.active, +"connector is active, but attached crtc isn't\n" );if (!encoder || encoder->type ==INTEL_OUTPUT_DP_MST )return ;@@ -7177,8 +7177,8 @@ static void intel_connector_verify_state(struct intel_crtc_state *crtc_state,I915_STATE_WARN (conn_state->crtc != encoder->base.crtc,"attached encoder crtc differs from connector crtc\n" ); }else { -I915_STATE_WARN (crtc_state && crtc_state->base.active, -"attached crtc is active, but connector isn't\n" ); +I915_STATE_WARN (crtc_state && crtc_state->hw.active, +"attached crtc is active, but connector isn't\n" );I915_STATE_WARN (!crtc_state && conn_state->best_encoder,"best encoder set without crtc!\n" ); }@@ -7186,7 +7186,7 @@ static void intel_connector_verify_state(struct intel_crtc_state *crtc_state,static int pipe_required_fdi_lanes (struct intel_crtc_state *crtc_state) { -if (crtc_state->base.enable && crtc_state->has_pch_encoder) +if (crtc_state->hw.enable && crtc_state->has_pch_encoder)return crtc_state->fdi_lanes;return 0 ;@@ -7196,7 +7196,7 @@ static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe, struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct drm_atomic_state *state = pipe_config->base.state; +struct drm_atomic_state *state = pipe_config->uapi.state;struct intel_crtc *other_crtc;struct intel_crtc_state *other_crtc_state;@@ -7269,7 +7269,7 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc, struct intel_crtc_state *pipe_config) {struct drm_device *dev = intel_crtc->base.dev; -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;int lane, link_bw, fdi_dotclock, ret;bool needs_recompute = false;@@ -7315,7 +7315,7 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc,bool hsw_crtc_state_ips_capable (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);/* IPS only exists on ULT machines and is tied to pipe A. */ @@ -7345,9 +7345,9 @@ bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state)static bool hsw_compute_ips_config (struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv = -to_i915 (crtc_state->base.crtc->dev); +to_i915 (crtc_state->uapi.crtc->dev);struct intel_atomic_state *intel_state = -to_intel_atomic_state (crtc_state->base.state); +to_intel_atomic_state (crtc_state->uapi.state);if (!hsw_crtc_state_ips_capable (crtc_state))return false;@@ -7386,7 +7386,7 @@ static u32 ilk_pipe_pixel_rate(const struct intel_crtc_state *pipe_config) {u32 pixel_rate; - pixel_rate = pipe_config->base.adjusted_mode.crtc_clock; + pixel_rate = pipe_config->hw.adjusted_mode.crtc_clock;/* * We only use IF-ID interlacing. If we ever use @@ -7419,12 +7419,12 @@ static u32 ilk_pipe_pixel_rate(const struct intel_crtc_state *pipe_config)static void intel_crtc_compute_pixel_rate (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);if (HAS_GMCH (dev_priv))/* FIXME calculate proper pipe pixel rate for GMCH pfit */ crtc_state->pixel_rate = - crtc_state->base.adjusted_mode.crtc_clock; + crtc_state->hw.adjusted_mode.crtc_clock;else crtc_state->pixel_rate =ilk_pipe_pixel_rate (crtc_state);@@ -7434,7 +7434,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;int clock_limit = dev_priv->max_dotclk_freq;if (INTEL_GEN (dev_priv) <4 ) {@@ -7460,7 +7460,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,if ((pipe_config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 || pipe_config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR444 ) && - pipe_config->base.ctm) { + pipe_config->hw.ctm) {/* * There is only one pipe CSC unit per pipe, and we need that * for output conversion from RGB->YCBCR. So if CTM is already @@ -7629,7 +7629,7 @@ static void vlv_pllb_recal_opamp(struct drm_i915_private *dev_priv, enum pipestatic void intel_pch_transcoder_set_m_n (const struct intel_crtc_state *crtc_state,const struct intel_link_m_n *m_n) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -7656,7 +7656,7 @@ static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_staconst struct intel_link_m_n *m_n, const struct intel_link_m_n *m2_n2) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;enum transcoder transcoder = crtc_state->cpu_transcoder;@@ -7969,7 +7969,7 @@ int vlv_force_pll_on(struct drm_i915_private *dev_priv, enum pipe pipe,if (!pipe_config)return -ENOMEM ; - pipe_config->base.crtc = &crtc->base; + pipe_config->uapi.crtc = &crtc->base; pipe_config->pixel_multiplier =1 ; pipe_config->dpll = *dpll;@@ -8129,11 +8129,11 @@ static void i8xx_compute_dpll(struct intel_crtc *crtc,static void intel_set_pipe_timings (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; -const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;u32 crtc_vtotal, crtc_vblank_end;int vsyncshift =0 ;@@ -8191,7 +8191,7 @@ static void intel_set_pipe_timings(const struct intel_crtc_state *crtc_state)static void intel_set_pipe_src_size (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -8212,39 +8212,39 @@ static void intel_get_pipe_timings(struct intel_crtc *crtc,u32 tmp; tmp =I915_READ (HTOTAL (cpu_transcoder)); - pipe_config->base.adjusted_mode.crtc_hdisplay = (tmp &0xffff ) +1 ; - pipe_config->base.adjusted_mode.crtc_htotal = ((tmp >>16 ) &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_hdisplay = (tmp &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_htotal = ((tmp >>16 ) &0xffff ) +1 ;if (!transcoder_is_dsi (cpu_transcoder)) { tmp =I915_READ (HBLANK (cpu_transcoder)); - pipe_config->base.adjusted_mode.crtc_hblank_start = + pipe_config->hw.adjusted_mode.crtc_hblank_start = (tmp &0xffff ) +1 ; - pipe_config->base.adjusted_mode.crtc_hblank_end = + pipe_config->hw.adjusted_mode.crtc_hblank_end = ((tmp >>16 ) &0xffff ) +1 ; } tmp =I915_READ (HSYNC (cpu_transcoder)); - pipe_config->base.adjusted_mode.crtc_hsync_start = (tmp &0xffff ) +1 ; - pipe_config->base.adjusted_mode.crtc_hsync_end = ((tmp >>16 ) &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_hsync_start = (tmp &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_hsync_end = ((tmp >>16 ) &0xffff ) +1 ; tmp =I915_READ (VTOTAL (cpu_transcoder)); - pipe_config->base.adjusted_mode.crtc_vdisplay = (tmp &0xffff ) +1 ; - pipe_config->base.adjusted_mode.crtc_vtotal = ((tmp >>16 ) &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_vdisplay = (tmp &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_vtotal = ((tmp >>16 ) &0xffff ) +1 ;if (!transcoder_is_dsi (cpu_transcoder)) { tmp =I915_READ (VBLANK (cpu_transcoder)); - pipe_config->base.adjusted_mode.crtc_vblank_start = + pipe_config->hw.adjusted_mode.crtc_vblank_start = (tmp &0xffff ) +1 ; - pipe_config->base.adjusted_mode.crtc_vblank_end = + pipe_config->hw.adjusted_mode.crtc_vblank_end = ((tmp >>16 ) &0xffff ) +1 ; } tmp =I915_READ (VSYNC (cpu_transcoder)); - pipe_config->base.adjusted_mode.crtc_vsync_start = (tmp &0xffff ) +1 ; - pipe_config->base.adjusted_mode.crtc_vsync_end = ((tmp >>16 ) &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_vsync_start = (tmp &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_vsync_end = ((tmp >>16 ) &0xffff ) +1 ;if (I915_READ (PIPECONF (cpu_transcoder)) &PIPECONF_INTERLACE_MASK ) { - pipe_config->base.adjusted_mode.flags |=DRM_MODE_FLAG_INTERLACE ; - pipe_config->base.adjusted_mode.crtc_vtotal +=1 ; - pipe_config->base.adjusted_mode.crtc_vblank_end +=1 ; + pipe_config->hw.adjusted_mode.flags |=DRM_MODE_FLAG_INTERLACE ; + pipe_config->hw.adjusted_mode.crtc_vtotal +=1 ; + pipe_config->hw.adjusted_mode.crtc_vblank_end +=1 ; } }@@ -8259,27 +8259,27 @@ static void intel_get_pipe_src_size(struct intel_crtc *crtc, pipe_config->pipe_src_h = (tmp &0xffff ) +1 ; pipe_config->pipe_src_w = ((tmp >>16 ) &0xffff ) +1 ; - pipe_config->base.mode.vdisplay = pipe_config->pipe_src_h; - pipe_config->base.mode.hdisplay = pipe_config->pipe_src_w; + pipe_config->hw.mode.vdisplay = pipe_config->pipe_src_h; + pipe_config->hw.mode.hdisplay = pipe_config->pipe_src_w; }void intel_mode_from_pipe_config (struct drm_display_mode *mode,struct intel_crtc_state *pipe_config) { - mode->hdisplay = pipe_config->base.adjusted_mode.crtc_hdisplay; - mode->htotal = pipe_config->base.adjusted_mode.crtc_htotal; - mode->hsync_start = pipe_config->base.adjusted_mode.crtc_hsync_start; - mode->hsync_end = pipe_config->base.adjusted_mode.crtc_hsync_end; + mode->hdisplay = pipe_config->hw.adjusted_mode.crtc_hdisplay; + mode->htotal = pipe_config->hw.adjusted_mode.crtc_htotal; + mode->hsync_start = pipe_config->hw.adjusted_mode.crtc_hsync_start; + mode->hsync_end = pipe_config->hw.adjusted_mode.crtc_hsync_end; - mode->vdisplay = pipe_config->base.adjusted_mode.crtc_vdisplay; - mode->vtotal = pipe_config->base.adjusted_mode.crtc_vtotal; - mode->vsync_start = pipe_config->base.adjusted_mode.crtc_vsync_start; - mode->vsync_end = pipe_config->base.adjusted_mode.crtc_vsync_end; + mode->vdisplay = pipe_config->hw.adjusted_mode.crtc_vdisplay; + mode->vtotal = pipe_config->hw.adjusted_mode.crtc_vtotal; + mode->vsync_start = pipe_config->hw.adjusted_mode.crtc_vsync_start; + mode->vsync_end = pipe_config->hw.adjusted_mode.crtc_vsync_end; - mode->flags = pipe_config->base.adjusted_mode.flags; + mode->flags = pipe_config->hw.adjusted_mode.flags; mode->type =DRM_MODE_TYPE_DRIVER ; - mode->clock = pipe_config->base.adjusted_mode.crtc_clock; + mode->clock = pipe_config->hw.adjusted_mode.crtc_clock; mode->hsync =drm_mode_hsync (mode); mode->vrefresh =drm_mode_vrefresh (mode);@@ -8288,7 +8288,7 @@ void intel_mode_from_pipe_config(struct drm_display_mode *mode,static void i9xx_set_pipeconf (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 pipeconf;@@ -8325,7 +8325,7 @@ static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state) } } -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) { +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) {if (INTEL_GEN (dev_priv) <4 ||intel_crtc_has_type (crtc_state,INTEL_OUTPUT_SDVO )) pipeconf |=PIPECONF_INTERLACE_W_FIELD_INDICATION ;@@ -8757,7 +8757,7 @@ static void intel_get_crtc_ycbcr_config(struct intel_crtc *crtc,static void i9xx_get_pipe_color_config (struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_plane *plane =to_intel_plane (crtc->base.primary);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum i9xx_plane_id i9xx_plane = plane->i9xx_plane;@@ -8880,7 +8880,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,* but in case the pipe is enabled w/o any ports we need a sane * default. */ - pipe_config->base.adjusted_mode.crtc_clock = + pipe_config->hw.adjusted_mode.crtc_clock = pipe_config->port_clock / pipe_config->pixel_multiplier; ret = true;@@ -9395,7 +9395,7 @@ void intel_init_pch_refclk(struct drm_i915_private *dev_priv)static void ironlake_set_pipeconf (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;u32 val;@@ -9423,7 +9423,7 @@ static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state)if (crtc_state->dither) val |= (PIPECONF_DITHER_EN |PIPECONF_DITHER_TYPE_SP ); -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) val |=PIPECONF_INTERLACED_ILK ;else val |=PIPECONF_PROGRESSIVE ;@@ -9439,7 +9439,7 @@ static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state)static void haswell_set_pipeconf (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 val =0 ;@@ -9447,7 +9447,7 @@ static void haswell_set_pipeconf(const struct intel_crtc_state *crtc_state)if (IS_HASWELL (dev_priv) && crtc_state->dither) val |= (PIPECONF_DITHER_EN |PIPECONF_DITHER_TYPE_SP ); -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) val |=PIPECONF_INTERLACED_ILK ;else val |=PIPECONF_PROGRESSIVE ;@@ -9458,7 +9458,7 @@ static void haswell_set_pipeconf(const struct intel_crtc_state *crtc_state)static void bdw_set_pipemisc (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 val =0 ;@@ -9644,7 +9644,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc, {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_atomic_state *state = -to_intel_atomic_state (crtc_state->base.state); +to_intel_atomic_state (crtc_state->uapi.state);const struct intel_limit *limit;int refclk =120000 ;@@ -10060,7 +10060,7 @@ static int haswell_crtc_compute_clock(struct intel_crtc *crtc, {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_atomic_state *state = -to_intel_atomic_state (crtc_state->base.state); +to_intel_atomic_state (crtc_state->uapi.state);if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DSI ) ||INTEL_GEN (dev_priv) >=11 ) {@@ -10608,7 +10608,7 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state, } ret =drm_atomic_helper_check_plane_state (&plane_state->base, - &crtc_state->base, + &crtc_state->uapi,DRM_PLANE_HELPER_NO_SCALING ,DRM_PLANE_HELPER_NO_SCALING , true, true);@@ -10791,7 +10791,7 @@ i9xx_cursor_max_stride(struct intel_plane *plane,static u32 i9xx_cursor_ctl_crtc (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 cntl =0 ;@@ -11198,12 +11198,12 @@ int intel_get_load_detect_pipe(struct drm_connector *connector, goto fail; } - crtc_state->base.active = crtc_state->base.enable = true; + crtc_state->uapi.active = crtc_state->uapi.enable = true;if (!mode) mode = &load_detect_mode; - ret =drm_atomic_set_mode_for_crtc (&crtc_state->base, mode); + ret =drm_atomic_set_mode_for_crtc (&crtc_state->uapi, mode);if (ret) goto fail;@@ -11411,7 +11411,7 @@ static void ironlake_pch_clock_get(struct intel_crtc *crtc,* we may need some idea for the dotclock anyway. * Calculate one based on the FDI configuration. */ - pipe_config->base.adjusted_mode.crtc_clock = + pipe_config->hw.adjusted_mode.crtc_clock =intel_dotclock_calculate (intel_fdi_link_freq (dev_priv, pipe_config), &pipe_config->fdi_m_n); }@@ -11441,7 +11441,7 @@ intel_encoder_current_mode(struct intel_encoder *encoder)return NULL ; } - crtc_state->base.crtc = &crtc->base; + crtc_state->uapi.crtc = &crtc->base;if (!dev_priv->display.get_pipe_config (crtc, crtc_state)) {kfree (crtc_state);@@ -11512,12 +11512,12 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_statconst struct intel_plane_state *old_plane_state, struct intel_plane_state *plane_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct intel_plane *plane =to_intel_plane (plane_state->base.plane);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);bool mode_changed =needs_modeset (crtc_state); -bool was_crtc_enabled = old_crtc_state->base.active; -bool is_crtc_enabled = crtc_state->base.active; +bool was_crtc_enabled = old_crtc_state->hw.active; +bool is_crtc_enabled = crtc_state->hw.active;bool turn_off, turn_on, visible, was_visible;struct drm_framebuffer *fb = plane_state->base.fb;int ret;@@ -11692,9 +11692,9 @@ static int icl_add_linked_planes(struct intel_atomic_state *state)static int icl_check_nv12_planes (struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -struct intel_atomic_state *state =to_intel_atomic_state (crtc_state->base.state); +struct intel_atomic_state *state =to_intel_atomic_state (crtc_state->uapi.state);struct intel_plane *plane, *linked;struct intel_plane_state *plane_state;int i;@@ -11764,9 +11764,9 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)static bool c8_planes_changed (const struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct intel_atomic_state *state = -to_intel_atomic_state (new_crtc_state->base.state); +to_intel_atomic_state (new_crtc_state->uapi.state);const struct intel_crtc_state *old_crtc_state =intel_atomic_get_old_crtc_state (state, crtc);@@ -11784,10 +11784,10 @@ static int intel_crtc_atomic_check(struct drm_crtc *_crtc,bool mode_changed =needs_modeset (crtc_state);if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv) && - mode_changed && !crtc_state->base.active) + mode_changed && !crtc_state->hw.active) crtc_state->update_wm_post = true; -if (mode_changed && crtc_state->base.enable && +if (mode_changed && crtc_state->hw.enable && dev_priv->display.crtc_compute_clock && !WARN_ON (crtc_state->shared_dpll)) { ret = dev_priv->display.crtc_compute_clock (crtc, crtc_state);@@ -11800,10 +11800,10 @@ static int intel_crtc_atomic_check(struct drm_crtc *_crtc,* when C8 planes are getting enabled/disabled. */ if (c8_planes_changed (crtc_state)) - crtc_state->base.color_mgmt_changed = true; + crtc_state->uapi.color_mgmt_changed = true;if (mode_changed || crtc_state->update_pipe || - crtc_state->base.color_mgmt_changed) { + crtc_state->uapi.color_mgmt_changed) { ret =intel_color_check (crtc_state);if (ret)return ret;@@ -11925,7 +11925,7 @@ compute_baseline_pipe_bpp(struct intel_crtc *crtc, struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -struct drm_atomic_state *state = pipe_config->base.state; +struct drm_atomic_state *state = pipe_config->uapi.state;struct drm_connector *connector;struct drm_connector_state *connector_state;int bpp, i;@@ -12078,7 +12078,7 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config,struct intel_atomic_state *state, const char *context) { - struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);const struct intel_plane_state *plane_state;struct intel_plane *plane;@@ -12087,14 +12087,14 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config,DRM_DEBUG_KMS ("[CRTC:%d:%s] enable: %s %s\n" , crtc->base.base.id, crtc->base.name, -yesno (pipe_config->base.enable), context); +yesno (pipe_config->hw.enable), context); -if (!pipe_config->base.enable) +if (!pipe_config->hw.enable) goto dump_planes;snprintf_output_types (buf,sizeof (buf), pipe_config->output_types);DRM_DEBUG_KMS ("active: %s, output_types: %s (0x%x), output format: %s\n" , -yesno (pipe_config->base.active), +yesno (pipe_config->hw.active), buf, pipe_config->output_types,output_formats (pipe_config->output_format));@@ -12134,10 +12134,10 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config,intel_dump_infoframe (dev_priv, &pipe_config->infoframes.hdmi);DRM_DEBUG_KMS ("requested mode:\n" ); -drm_mode_debug_printmodeline (&pipe_config->base.mode); +drm_mode_debug_printmodeline (&pipe_config->hw.mode);DRM_DEBUG_KMS ("adjusted mode:\n" ); -drm_mode_debug_printmodeline (&pipe_config->base.adjusted_mode); -intel_dump_crtc_timings (&pipe_config->base.adjusted_mode); +drm_mode_debug_printmodeline (&pipe_config->hw.adjusted_mode); +intel_dump_crtc_timings (&pipe_config->hw.adjusted_mode); DRM_DEBUG_KMS("port clock: %d, pipe src size: %dx%d, pixel rate %d\n", pipe_config->port_clock, pipe_config->pipe_src_w, pipe_config->pipe_src_h,@@ -12255,7 +12255,7 @@ static int clear_intel_crtc_state(struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv = -to_i915 (crtc_state->base.crtc->dev); +to_i915 (crtc_state->uapi.crtc->dev);struct intel_crtc_state *saved_state; saved_state =kzalloc (sizeof (*saved_state),GFP_KERNEL );@@ -12278,9 +12278,10 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) saved_state->wm = crtc_state->wm;/* Keep base drm_crtc_state intact, only clear our extended struct */ -BUILD_BUG_ON (offsetof(struct intel_crtc_state , base)); -memcpy (&crtc_state->base +1 , &saved_state->base +1 , -sizeof (*crtc_state) -sizeof (crtc_state->base)); +BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); +BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw)); +memcpy (&crtc_state->uapi +1 , &saved_state->uapi +1 , +sizeof (*crtc_state) -sizeof (crtc_state->uapi));kfree (saved_state);return 0 ;@@ -12289,8 +12290,8 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)static int intel_modeset_pipe_config (struct intel_crtc_state *pipe_config) { -struct drm_crtc *crtc = pipe_config->base.crtc; -struct drm_atomic_state *state = pipe_config->base.state; +struct drm_crtc *crtc = pipe_config->uapi.crtc; +struct drm_atomic_state *state = pipe_config->uapi.state;struct intel_encoder *encoder;struct drm_connector *connector;struct drm_connector_state *connector_state;@@ -12310,13 +12311,13 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)* positive or negative polarity is requested, treat this as meaning * negative polarity. */ -if (!(pipe_config->base.adjusted_mode.flags & +if (!(pipe_config->hw.adjusted_mode.flags & (DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NHSYNC ))) - pipe_config->base.adjusted_mode.flags |=DRM_MODE_FLAG_NHSYNC ; + pipe_config->hw.adjusted_mode.flags |=DRM_MODE_FLAG_NHSYNC ; -if (!(pipe_config->base.adjusted_mode.flags & +if (!(pipe_config->hw.adjusted_mode.flags & (DRM_MODE_FLAG_PVSYNC |DRM_MODE_FLAG_NVSYNC ))) - pipe_config->base.adjusted_mode.flags |=DRM_MODE_FLAG_NVSYNC ; + pipe_config->hw.adjusted_mode.flags |=DRM_MODE_FLAG_NVSYNC ; ret =compute_baseline_pipe_bpp (to_intel_crtc (crtc), pipe_config);@@ -12333,7 +12334,7 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)* computation to clearly distinguish it from the adjusted mode, which * can be changed by the connectors in the below retry loop. */ -drm_mode_get_hv_timing (&pipe_config->base.mode, +drm_mode_get_hv_timing (&pipe_config->hw.mode, &pipe_config->pipe_src_w, &pipe_config->pipe_src_h);@@ -12366,7 +12367,7 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config) pipe_config->pixel_multiplier =1 ;/* Fill in default crtc timings, allow encoders to overwrite them. */ -drm_mode_set_crtcinfo (&pipe_config->base.adjusted_mode, +drm_mode_set_crtcinfo (&pipe_config->hw.adjusted_mode,CRTC_STEREO_DOUBLE );/* Pass our mode to the connectors and the CRTC to give them a chance to @@ -12391,7 +12392,7 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)/* Set default port clock if not overwritten by the encoder. Needs to be * done afterwards in case the encoder adjusts the mode. */ if (!pipe_config->port_clock) - pipe_config->port_clock = pipe_config->base.adjusted_mode.crtc_clock + pipe_config->port_clock = pipe_config->hw.adjusted_mode.crtc_clock * pipe_config->pixel_multiplier; ret =intel_crtc_compute_config (to_intel_crtc (crtc), pipe_config);@@ -12555,12 +12556,12 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, const struct intel_crtc_state *pipe_config, bool fastset) { -struct drm_i915_private *dev_priv =to_i915 (current_config->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (current_config->uapi.crtc->dev);bool ret = true;u32 bp_gamma =0 ;bool fixup_inherited = fastset && - (current_config->base.mode.private_flags &I915_MODE_FLAG_INHERITED ) && - !(pipe_config->base.mode.private_flags &I915_MODE_FLAG_INHERITED ); + (current_config->hw.mode.private_flags &I915_MODE_FLAG_INHERITED ) && + !(pipe_config->hw.mode.private_flags &I915_MODE_FLAG_INHERITED );if (fixup_inherited && !fastboot_enabled (dev_priv)) {DRM_DEBUG_KMS ("initial modeset and fastboot not set\n" );@@ -12749,19 +12750,19 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_X (output_types); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hdisplay); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_htotal); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hblank_start); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hblank_end); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hsync_start); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hsync_end); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hdisplay); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_htotal); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hblank_start); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hblank_end); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hsync_start); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hsync_end); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vdisplay); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vtotal); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vblank_start); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vblank_end); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vsync_start); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vsync_end); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vdisplay); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vtotal); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vblank_start); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vblank_end); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vsync_start); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vsync_end);PIPE_CONF_CHECK_I (pixel_multiplier);PIPE_CONF_CHECK_I (output_format);@@ -12777,17 +12778,17 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_BOOL_INCOMPLETE (has_audio); -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_INTERLACE );if (!PIPE_CONF_QUIRK (PIPE_CONFIG_QUIRK_MODE_SYNC_FLAGS )) { -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_PHSYNC ); -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_NHSYNC ); -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_PVSYNC ); -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_NVSYNC ); }@@ -12826,7 +12827,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, bp_gamma =intel_color_get_gamma_bit_precision (pipe_config);if (bp_gamma) -PIPE_CONF_CHECK_COLOR_LUT (gamma_mode, base.gamma_lut, bp_gamma); +PIPE_CONF_CHECK_COLOR_LUT (gamma_mode, uapi.gamma_lut, bp_gamma); }@@ -12871,7 +12872,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,if (IS_G4X (dev_priv) ||INTEL_GEN (dev_priv) >=5 )PIPE_CONF_CHECK_I (pipe_bpp); -PIPE_CONF_CHECK_CLOCK_FUZZY (base.adjusted_mode.crtc_clock); +PIPE_CONF_CHECK_CLOCK_FUZZY (hw.adjusted_mode.crtc_clock);PIPE_CONF_CHECK_CLOCK_FUZZY (port_clock);PIPE_CONF_CHECK_I (min_voltage_level);@@ -12902,7 +12903,7 @@ static void intel_pipe_config_sanity_check(struct drm_i915_private *dev_priv,if (pipe_config->has_pch_encoder) {int fdi_dotclock =intel_dotclock_calculate (intel_fdi_link_freq (dev_priv, pipe_config), &pipe_config->fdi_m_n); -int dotclock = pipe_config->base.adjusted_mode.crtc_clock; +int dotclock = pipe_config->hw.adjusted_mode.crtc_clock;/* * FDI already provided one idea for the dotclock. @@ -12930,7 +12931,7 @@ static void verify_wm_state(struct intel_crtc *crtc,const enum pipe pipe = crtc->pipe;int plane, level, max_level =ilk_wm_max_level (dev_priv); -if (INTEL_GEN (dev_priv) <9 || !new_crtc_state->base.active) +if (INTEL_GEN (dev_priv) <9 || !new_crtc_state->hw.active)return ; hw =kzalloc (sizeof (*hw),GFP_KERNEL );@@ -13139,12 +13140,12 @@ verify_crtc_state(struct intel_crtc *crtc,struct drm_atomic_state *state;bool active; - state = old_crtc_state->base.state; -__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->base); + state = old_crtc_state->uapi.state; +__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->uapi); pipe_config = old_crtc_state;memset (pipe_config,0 ,sizeof (*pipe_config)); - pipe_config->base.crtc = &crtc->base; - pipe_config->base.state = state; + pipe_config->uapi.crtc = &crtc->base; + pipe_config->uapi.state = state;DRM_DEBUG_KMS ("[CRTC:%d:%s]\n" , crtc->base.base.id, crtc->base.name);@@ -13152,23 +13153,26 @@ verify_crtc_state(struct intel_crtc *crtc,/* we keep both pipes enabled on 830 */ if (IS_I830 (dev_priv)) - active = new_crtc_state->base.active; + active = new_crtc_state->hw.active; -I915_STATE_WARN (new_crtc_state->base.active != active, -"crtc active state doesn't match with hw state " -"(expected %i, found %i)\n" , new_crtc_state->base.active, active); +I915_STATE_WARN (new_crtc_state->hw.active != active, +"crtc active state doesn't match with hw state " +"(expected %i, found %i)\n" , + new_crtc_state->hw.active, active); -I915_STATE_WARN (crtc->active != new_crtc_state->base.active, -"transitional active state does not match atomic hw state " -"(expected %i, found %i)\n" , new_crtc_state->base.active, crtc->active); +I915_STATE_WARN (crtc->active != new_crtc_state->hw.active, +"transitional active state does not match atomic hw state " +"(expected %i, found %i)\n" , + new_crtc_state->hw.active, crtc->active);for_each_encoder_on_crtc (dev, &crtc->base, encoder) {enum pipe pipe; active = encoder->get_hw_state (encoder, &pipe); -I915_STATE_WARN (active != new_crtc_state->base.active, -"[ENCODER:%i] active %i with crtc active %i\n" , - encoder->base.base.id, active, new_crtc_state->base.active); +I915_STATE_WARN (active != new_crtc_state->hw.active, +"[ENCODER:%i] active %i with crtc active %i\n" , + encoder->base.base.id, active, + new_crtc_state->hw.active); I915_STATE_WARN(active && crtc->pipe != pipe, "Encoder connected to wrong pipe %c\n",@@ -13180,7 +13184,7 @@ verify_crtc_state(struct intel_crtc *crtc,intel_crtc_compute_pixel_rate (pipe_config); -if (!new_crtc_state->base.active) +if (!new_crtc_state->hw.active)return ;intel_pipe_config_sanity_check (dev_priv, pipe_config);@@ -13242,7 +13246,7 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv, crtc_mask =drm_crtc_mask (&crtc->base); -if (new_crtc_state->base.active) +if (new_crtc_state->hw.active)I915_STATE_WARN (!(pll->active_mask & crtc_mask),"pll active mismatch (expected pipe %c in active mask 0x%02x)\n" ,pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask);@@ -13320,7 +13324,7 @@ intel_modeset_verify_disabled(struct drm_i915_private *dev_priv,static void update_scanline_offset (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);/* @@ -13351,7 +13355,7 @@ static void update_scanline_offset(const struct intel_crtc_state *crtc_state)* answer that's slightly in the future. */ if (IS_GEN (dev_priv,2 )) { -const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;int vtotal; vtotal = adjusted_mode->crtc_vtotal;@@ -13401,7 +13405,7 @@ static int haswell_mode_set_planes_workaround(struct intel_atomic_state *state)/* look at all crtc's that are going to be enabled in during modeset */ for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) { -if (!crtc_state->base.active || +if (!crtc_state->hw.active || !needs_modeset (crtc_state))continue ;@@ -13426,7 +13430,7 @@ static int haswell_mode_set_planes_workaround(struct intel_atomic_state *state) crtc_state->hsw_workaround_pipe =INVALID_PIPE ; -if (!crtc_state->base.active || +if (!crtc_state->hw.active ||needs_modeset (crtc_state))continue ;@@ -13469,12 +13473,12 @@ static int intel_modeset_checks(struct intel_atomic_state *state)for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (new_crtc_state->base.active) +if (new_crtc_state->hw.active) state->active_pipes |=BIT (crtc->pipe);else state->active_pipes &= ~BIT (crtc->pipe); -if (old_crtc_state->base.active != new_crtc_state->base.active) +if (old_crtc_state->hw.active != new_crtc_state->hw.active) state->active_pipe_changes |=BIT (crtc->pipe); }@@ -13513,7 +13517,7 @@ static void intel_crtc_check_fastset(const struct intel_crtc_state *old_crtc_staif (!intel_pipe_config_compare (old_crtc_state, new_crtc_state, true))return ; - new_crtc_state->base.mode_changed = false; + new_crtc_state->uapi.mode_changed = false; new_crtc_state->update_pipe = true;/* @@ -13548,9 +13552,9 @@ static int intel_atomic_check(struct drm_device *dev,/* Catch I915_MODE_FLAG_INHERITED */ for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (new_crtc_state->base.mode.private_flags != - old_crtc_state->base.mode.private_flags) - new_crtc_state->base.mode_changed = true; +if (new_crtc_state->hw.mode.private_flags != + old_crtc_state->hw.mode.private_flags) + new_crtc_state->uapi.mode_changed = true; } ret =drm_atomic_helper_check_modeset (dev, &state->base);@@ -13562,7 +13566,7 @@ static int intel_atomic_check(struct drm_device *dev,if (!needs_modeset (new_crtc_state))continue ; -if (!new_crtc_state->base.enable) { +if (!new_crtc_state->uapi.enable) { any_ms = true;continue ; }@@ -13719,11 +13723,10 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state,intel_check_pch_fifo_underruns (dev_priv);/* FIXME unify this for all platforms */ -if (!new_crtc_state->base.active && +if (!new_crtc_state->hw.active && !HAS_GMCH (dev_priv) && dev_priv->display.initial_watermarks) - dev_priv->display.initial_watermarks (state, - new_crtc_state); + dev_priv->display.initial_watermarks (state, new_crtc_state); }static void intel_commit_modeset_disables (struct intel_atomic_state *state)@@ -13746,7 +13749,7 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)intel_pre_plane_update (old_crtc_state, new_crtc_state); -if (old_crtc_state->base.active) +if (old_crtc_state->hw.active) intel_old_crtc_state_disables(state, old_crtc_state, new_crtc_state,@@ -13761,7 +13764,7 @@ static void intel_commit_modeset_enables(struct intel_atomic_state *state)int i;for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (!new_crtc_state->base.active) +if (!new_crtc_state->hw.active)continue ; intel_update_crtc(crtc, state, old_crtc_state,@@ -13784,7 +13787,7 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i)/* ignore allocations for crtc's that have been turned off. */ -if (new_crtc_state->base.active) +if (new_crtc_state->hw.active) entries[i] = old_crtc_state->wm.skl.ddb;/* If 2nd DBuf slice required, enable it here */ @@ -13806,7 +13809,7 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state) pipe = crtc->pipe; -if (updated & cmask || !new_crtc_state->base.active) +if (updated & cmask || !new_crtc_state->hw.active)continue ; if (skl_ddb_allocation_overlaps(&new_crtc_state->wm.skl.ddb,@@ -13825,7 +13828,7 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)*/ if (!skl_ddb_entry_equal (&new_crtc_state->wm.skl.ddb, &old_crtc_state->wm.skl.ddb) && - !new_crtc_state->base.active_changed && + !new_crtc_state->uapi.active_changed && state->wm_results.dirty_pipes != updated) vbl_wait = true;@@ -13958,12 +13961,13 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)bool modeset =needs_modeset (new_crtc_state);/* Complete events for now disable pipes here. */ -if (modeset && !new_crtc_state->base.active && new_crtc_state->base.event) { +if (modeset && !new_crtc_state->hw.active && new_crtc_state->uapi.event) {spin_lock_irq (&dev->event_lock); -drm_crtc_send_vblank_event (&crtc->base, new_crtc_state->base.event); +drm_crtc_send_vblank_event (&crtc->base, + new_crtc_state->uapi.event);spin_unlock_irq (&dev->event_lock); - new_crtc_state->base.event =NULL ; + new_crtc_state->uapi.event =NULL ; } }@@ -13994,9 +13998,9 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)drm_atomic_helper_wait_for_flip_done (dev, &state->base);for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) { -if (new_crtc_state->base.active && +if (new_crtc_state->hw.active && !needs_modeset (new_crtc_state) && - (new_crtc_state->base.color_mgmt_changed || + (new_crtc_state->uapi.color_mgmt_changed || new_crtc_state->update_pipe))intel_color_load_luts (new_crtc_state); }@@ -14451,16 +14455,16 @@ int skl_max_scale(const struct intel_crtc_state *crtc_state, const struct drm_format_info *format) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);int max_scale;int crtc_clock, max_dotclk, tmpclk1, tmpclk2; -if (!crtc_state->base.enable) +if (!crtc_state->hw.enable)return DRM_PLANE_HELPER_NO_SCALING ; - crtc_clock = crtc_state->base.adjusted_mode.crtc_clock; - max_dotclk =to_intel_atomic_state (crtc_state->base.state)->cdclk.logical.cdclk; + crtc_clock = crtc_state->hw.adjusted_mode.crtc_clock; + max_dotclk =to_intel_atomic_state (crtc_state->uapi.state)->cdclk.logical.cdclk;if (IS_GEMINILAKE (dev_priv) ||INTEL_GEN (dev_priv) >=10 ) max_dotclk *=2 ;@@ -14501,7 +14505,7 @@ static void intel_begin_crtc_commit(struct intel_atomic_state *state,if (modeset) goto out; -if (new_crtc_state->base.color_mgmt_changed || +if (new_crtc_state->uapi.color_mgmt_changed || new_crtc_state->update_pipe)intel_color_commit (new_crtc_state);@@ -14547,7 +14551,7 @@ static void intel_finish_crtc_commit(struct intel_atomic_state *state,if (new_crtc_state->update_pipe && !needs_modeset (new_crtc_state) && - old_crtc_state->base.mode.private_flags &I915_MODE_FLAG_INHERITED ) + old_crtc_state->hw.mode.private_flags &I915_MODE_FLAG_INHERITED )intel_crtc_arm_fifo_underrun (crtc, new_crtc_state); }@@ -14659,7 +14663,7 @@ intel_legacy_cursor_update(struct drm_plane *plane,* When crtc is inactive or there is a modeset pending, * wait for it to complete in the slowpath */ -if (!crtc_state->base.active ||needs_modeset (crtc_state) || +if (!crtc_state->hw.active ||needs_modeset (crtc_state) || crtc_state->update_pipe) goto slow;@@ -14753,7 +14757,7 @@ intel_legacy_cursor_update(struct drm_plane *plane,mutex_unlock (&dev_priv->drm.struct_mutex); out_free:if (new_crtc_state) -intel_crtc_destroy_state (crtc, &new_crtc_state->base); +intel_crtc_destroy_state (crtc, &new_crtc_state->uapi);if (ret)intel_plane_destroy_state (plane, new_plane_state);else @@ -15079,7 +15083,7 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) ret = -ENOMEM ; goto fail; } -__drm_atomic_helper_crtc_reset (&intel_crtc->base, &crtc_state->base); +__drm_atomic_helper_crtc_reset (&intel_crtc->base, &crtc_state->uapi); intel_crtc->config = crtc_state; primary =intel_primary_plane_create (dev_priv, pipe);@@ -16455,7 +16459,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK); } -if (crtc_state->base.active) { +if (crtc_state->hw.active) {struct intel_plane *plane;/* Disable everything but the primary plane */ @@ -16480,10 +16484,10 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc,/* Adjust the state of the output pipe according to whether we * have active connectors/encoders. */ -if (crtc_state->base.active && !intel_crtc_has_encoders (crtc)) +if (crtc_state->hw.active && !intel_crtc_has_encoders (crtc))intel_crtc_disable_noatomic (&crtc->base, ctx); -if (crtc_state->base.active ||HAS_GMCH (dev_priv)) { +if (crtc_state->hw.active ||HAS_GMCH (dev_priv)) {/* * We start out with underrun reporting disabled to avoid races. * For correct bookkeeping mark this on active crtcs. @@ -16514,7 +16518,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc,static bool has_bogus_dpll_config (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);/* * Some SNB BIOSen (eg. ASUS K53SV) are known to misprogram @@ -16527,7 +16531,7 @@ static bool has_bogus_dpll_config(const struct intel_crtc_state *crtc_state)* road. */ return IS_GEN (dev_priv,6 ) && - crtc_state->base.active && + crtc_state->hw.active && crtc_state->shared_dpll && crtc_state->port_clock ==0 ; }@@ -16544,7 +16548,7 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)* encoder is active and trying to read from a pipe) and the * pipe itself being active. */ bool has_active_crtc = crtc_state && - crtc_state->base.active; + crtc_state->hw.active;if (crtc_state &&has_bogus_dpll_config (crtc_state)) { DRM_DEBUG_KMS("BIOS has misprogrammed the hardware. Disabling pipe %c\n",@@ -16681,22 +16685,22 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)struct intel_crtc_state *crtc_state =to_intel_crtc_state (crtc->base.state); -__drm_atomic_helper_crtc_destroy_state (&crtc_state->base); +__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi);memset (crtc_state,0 ,sizeof (*crtc_state)); -__drm_atomic_helper_crtc_reset (&crtc->base, &crtc_state->base); +__drm_atomic_helper_crtc_reset (&crtc->base, &crtc_state->uapi); - crtc_state->base.active = crtc_state->base.enable = + crtc_state->hw.active = crtc_state->hw.enable = dev_priv->display.get_pipe_config (crtc, crtc_state); - crtc->base.enabled = crtc_state->base.enable; - crtc->active = crtc_state->base.active; + crtc->base.enabled = crtc_state->hw.enable; + crtc->active = crtc_state->hw.active; -if (crtc_state->base.active) +if (crtc_state->hw.active) dev_priv->active_pipes |=BIT (crtc->pipe);DRM_DEBUG_KMS ("[CRTC:%d:%s] hw state readout: %s\n" , crtc->base.base.id, crtc->base.name, -enableddisabled (crtc_state->base.active)); +enableddisabled (crtc_state->hw.active)); }readout_plane_state (dev_priv);@@ -16718,7 +16722,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)struct intel_crtc_state *crtc_state =to_intel_crtc_state (crtc->base.state); -if (crtc_state->base.active && +if (crtc_state->hw.active && crtc_state->shared_dpll == pll) pll->state.crtc_mask |=1 << crtc->pipe; }@@ -16752,21 +16756,24 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)drm_connector_list_iter_begin (dev, &conn_iter);for_each_intel_connector_iter (connector, &conn_iter) {if (connector->get_hw_state (connector)) { - connector->base.dpms =DRM_MODE_DPMS_ON ; +struct intel_crtc_state *crtc_state =NULL ; + connector->base.dpms =DRM_MODE_DPMS_ON ; encoder = connector->encoder; connector->base.encoder = &encoder->base; -if (encoder->base.crtc && - encoder->base.crtc->state->active) { +if (encoder->base.crtc) + crtc_state =to_intel_crtc_state (encoder->base.crtc->state); + +if (crtc_state && crtc_state->hw.active) {/* * This has to be done during hardware readout * because anything calling .crtc_disable may * rely on the connector_mask being accurate. */ - encoder->base.crtc->state->connector_mask |= + crtc_state->uapi.connector_mask |=drm_connector_mask (&connector->base); - encoder->base.crtc->state->encoder_mask |= + crtc_state->uapi.encoder_mask |=drm_encoder_mask (&encoder->base); }@@ -16789,11 +16796,12 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)int min_cdclk =0 ;memset (&crtc->base.mode,0 ,sizeof (crtc->base.mode)); -if (crtc_state->base.active) { +if (crtc_state->hw.active) {intel_mode_from_pipe_config (&crtc->base.mode, crtc_state); crtc->base.mode.hdisplay = crtc_state->pipe_src_w; crtc->base.mode.vdisplay = crtc_state->pipe_src_h; -intel_mode_from_pipe_config (&crtc_state->base.adjusted_mode, crtc_state); +intel_mode_from_pipe_config (&crtc_state->hw.adjusted_mode, + crtc_state);WARN_ON (drm_atomic_set_mode_for_crtc (crtc->base.state, &crtc->base.mode));/* @@ -16805,7 +16813,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)* set a flag to indicate that a full recalculation is * needed on the next commit. */ - crtc_state->base.mode.private_flags =I915_MODE_FLAG_INHERITED ; + crtc_state->hw.mode.private_flags =I915_MODE_FLAG_INHERITED ;intel_crtc_compute_pixel_rate (crtc_state);@@ -16816,7 +16824,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) }drm_calc_timestamping_constants (&crtc->base, - &crtc_state->base.adjusted_mode); + &crtc_state->hw.adjusted_mode);update_scanline_offset (crtc_state); }@@ -16987,7 +16995,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev,drm_crtc_vblank_reset (&crtc->base); -if (crtc_state->base.active) +if (crtc_state->hw.active)intel_crtc_vblank_on (crtc_state); }drivers/gpu/drm/i915/display/intel_display_types.h +26
-2@@ -749,7 +749,31 @@ enum intel_output_format { };struct intel_crtc_state { -struct drm_crtc_state base; +union { +/* +* uapi (drm) state. This is the software state shown to userspace. +* In particular, the following members are used for bookkeeping: +* - crtc +* - state +* - *_changed +* - event +* - commit +* - mode_blob +*/ +struct drm_crtc_state uapi; + +/* +* actual hardware state, the state we program to the hardware. +* The following members are used to verify the hardware state: +* - enable +* - active +* - mode / adjusted_mode +* - color property blobs. +* +* During initial hw readout, they need to be copied to uapi. +*/ +struct drm_crtc_state hw; + };/** * quirks - bitfield with hw state readout quirks @@ -1091,7 +1115,7 @@ struct cxsr_latency {#define to_intel_atomic_state (x) container_of(x, struct intel_atomic_state, base)#define to_intel_crtc (x) container_of(x, struct intel_crtc, base) -#define to_intel_crtc_state (x) container_of(x, struct intel_crtc_state, base) +#define to_intel_crtc_state (x) container_of(x, struct intel_crtc_state, uapi)#define to_intel_connector (x) container_of(x, struct intel_connector, base)#define to_intel_encoder (x) container_of(x, struct intel_encoder, base)#define to_intel_framebuffer (x) container_of(x, struct intel_framebuffer, base)drivers/gpu/drm/i915/display/intel_dp.c +21
-21@@ -1966,7 +1966,7 @@ intel_dp_compute_link_config_wide(struct intel_dp *intel_dp,struct intel_crtc_state *pipe_config, const struct link_config_limits *limits) { - struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; + struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;int bpp, clock, lane_count;int mode_rate, link_clock, link_avail;@@ -2020,7 +2020,7 @@ static int intel_dp_dsc_compute_config(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); -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;u8 dsc_max_bpc;int pipe_bpp;int ret;@@ -2131,7 +2131,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; + struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct link_config_limits limits;int common_len;@@ -2219,8 +2219,8 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp, {const struct drm_display_info *info = &connector->display_info;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); + &crtc_state->hw.adjusted_mode; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);int ret; if (!drm_mode_is_420_only(info, adjusted_mode) ||@@ -2248,7 +2248,7 @@ bool intel_dp_limited_color_range(const struct intel_crtc_state *crtc_state,const struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (conn_state);const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;if (intel_conn_state->broadcast_rgb ==INTEL_BROADCAST_RGB_AUTO ) {/* @@ -2271,11 +2271,11 @@ intel_dp_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct intel_lspcon *lspcon =enc_to_intel_lspcon (&encoder->base);enum port port = encoder->port; -struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);struct intel_connector *intel_connector = intel_dp->attached_connector;struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (conn_state);@@ -2395,8 +2395,8 @@ static void intel_dp_prepare(struct intel_encoder *encoder,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); -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc); +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode; intel_dp_set_link_params(intel_dp, pipe_config->port_clock, pipe_config->lane_count,@@ -2993,7 +2993,7 @@ static void assert_edp_pll(struct drm_i915_private *dev_priv, bool state)static void ironlake_edp_pll_on (struct intel_dp *intel_dp,const struct intel_crtc_state *pipe_config) { -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);assert_pipe_disabled (dev_priv, crtc->pipe);@@ -3033,7 +3033,7 @@ static void ironlake_edp_pll_on(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_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);assert_pipe_disabled (dev_priv, crtc->pipe);@@ -3193,7 +3193,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);u32 tmp, flags =0 ;enum port port = encoder->port; -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);if (encoder->type ==INTEL_OUTPUT_EDP ) pipe_config->output_types |=BIT (INTEL_OUTPUT_EDP );@@ -3228,7 +3228,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder, flags |=DRM_MODE_FLAG_NVSYNC ; } - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags;if (IS_G4X (dev_priv) && tmp &DP_COLOR_RANGE_16_235 ) pipe_config->limited_color_range = true;@@ -3245,7 +3245,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder, pipe_config->port_clock =270000 ; } - pipe_config->base.adjusted_mode.crtc_clock = + pipe_config->hw.adjusted_mode.crtc_clock =intel_dotclock_calculate (pipe_config->port_clock, &pipe_config->dp_m_n);@@ -3460,7 +3460,7 @@ static void intel_enable_dp(struct intel_encoder *encoder, {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 (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);u32 dp_reg =I915_READ (intel_dp->output_reg);enum pipe pipe = crtc->pipe;intel_wakeref_t wakeref;@@ -3593,7 +3593,7 @@ static void vlv_init_panel_power_sequencer(struct intel_encoder *encoder, {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 (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);lockdep_assert_held (&dev_priv->pps_mutex);@@ -4115,7 +4115,7 @@ intel_dp_link_down(struct intel_encoder *encoder, {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); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum port port = encoder->port;u32 DP = intel_dp->DP;@@ -4876,7 +4876,7 @@ int intel_dp_retrain_link(struct intel_encoder *encoder,WARN_ON (!intel_crtc_has_dp_encoder (crtc_state)); -if (!crtc_state->base.active) +if (!crtc_state->hw.active)return 0 ; if (conn_state->commit &&@@ -6695,7 +6695,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, int refresh_rate) {struct intel_dp *intel_dp = dev_priv->drrs.dp; -struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);enum drrs_refresh_rate_type index =DRRS_HIGH_RR ;if (refresh_rate <=0 ) {@@ -6728,7 +6728,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,return ; } -if (!crtc_state->base.active) { +if (!crtc_state->hw.active) {DRM_DEBUG_KMS ("eDP encoder disabled. CRTC not Active\n" );return ; }drivers/gpu/drm/i915/display/intel_dp_mst.c +3
-3@@ -42,13 +42,13 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,struct drm_connector_state *conn_state, struct link_config_limits *limits) { - struct drm_atomic_state *state = crtc_state->base.state; + struct drm_atomic_state *state = crtc_state->uapi.state;struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_dp *intel_dp = &intel_mst->primary->dp;struct intel_connector *connector =to_intel_connector (conn_state->connector);const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;void *port = connector->port;bool constant_n =drm_dp_has_quirk (&intel_dp->desc,DP_DPCD_QUIRK_CONSTANT_N );@@ -99,7 +99,7 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (conn_state);const struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;void *port = connector->port;struct link_config_limits limits;int ret;drivers/gpu/drm/i915/display/intel_dpio_phy.c +7
-7@@ -739,7 +739,7 @@ void chv_data_lane_soft_reset(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum dpio_channel ch =vlv_dport_to_channel (enc_to_dig_port (&encoder->base)); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;u32 val;@@ -783,7 +783,7 @@ void chv_phy_pre_pll_enable(struct intel_encoder *encoder, {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel ch =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe; unsigned int lane_mask =@@ -864,7 +864,7 @@ void chv_phy_pre_encoder_enable(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel ch =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;int data, i, stagger;@@ -953,7 +953,7 @@ void chv_phy_post_pll_disable(struct intel_encoder *encoder, const struct intel_crtc_state *old_crtc_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum pipe pipe =to_intel_crtc (old_crtc_state->base.crtc)->pipe; +enum pipe pipe =to_intel_crtc (old_crtc_state->uapi.crtc)->pipe;u32 val;vlv_dpio_get (dev_priv);@@ -1016,7 +1016,7 @@ void vlv_phy_pre_pll_enable(struct intel_encoder *encoder, {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel port =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;@@ -1046,7 +1046,7 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel port =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;u32 val;@@ -1075,7 +1075,7 @@ void vlv_phy_reset_lanes(struct intel_encoder *encoder, {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum dpio_channel port =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;drivers/gpu/drm/i915/display/intel_dpll_mgr.c +10
-10@@ -136,7 +136,7 @@ void assert_shared_dpll(struct drm_i915_private *dev_priv,*/ void intel_prepare_shared_dpll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc_state->shared_dpll;@@ -163,7 +163,7 @@ void intel_prepare_shared_dpll(const struct intel_crtc_state *crtc_state)*/ void intel_enable_shared_dpll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc_state->shared_dpll;unsigned int crtc_mask =drm_crtc_mask (&crtc->base);@@ -208,7 +208,7 @@ void intel_enable_shared_dpll(const struct intel_crtc_state *crtc_state)*/ void intel_disable_shared_dpll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc_state->shared_dpll;unsigned int crtc_mask =drm_crtc_mask (&crtc->base);@@ -825,7 +825,7 @@ hsw_ddi_hdmi_get_dpll(struct intel_atomic_state *state,static struct intel_shared_dpll *hsw_ddi_dp_get_dpll (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);struct intel_shared_dpll *pll;enum intel_dpll_id pll_id;int clock = crtc_state->port_clock;@@ -1734,7 +1734,7 @@ static bool bxt_ddi_hdmi_pll_dividers(struct intel_crtc_state *crtc_state, struct bxt_clk_div *clk_div) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct dpll best_clock;/* Calculate HDMI div */ @@ -2257,7 +2257,7 @@ static bool cnl_ddi_calculate_wrpll(struct intel_crtc_state *crtc_state, struct skl_wrpll_params *wrpll_params) { - struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev); + struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);u32 afe_clock = crtc_state->port_clock *5 ;u32 ref_clock;u32 dco_min =7998000 ;@@ -2523,7 +2523,7 @@ static const struct skl_wrpll_params icl_tbt_pll_19_2MHz_values = {static bool icl_calc_dp_combo_pll (struct intel_crtc_state *crtc_state,struct skl_wrpll_params *pll_params) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);const struct icl_combo_pll_params *params = dev_priv->cdclk.hw.ref ==24000 ? icl_dp_combo_pll_24MHz_values :@@ -2545,7 +2545,7 @@ static bool icl_calc_dp_combo_pll(struct intel_crtc_state *crtc_state,static bool icl_calc_tbt_pll (struct intel_crtc_state *crtc_state,struct skl_wrpll_params *pll_params) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); *pll_params = dev_priv->cdclk.hw.ref ==24000 ? icl_tbt_pll_24MHz_values : icl_tbt_pll_19_2MHz_values;@@ -2556,7 +2556,7 @@ static bool icl_calc_dpll_state(struct intel_crtc_state *crtc_state,struct intel_encoder *encoder, struct intel_dpll_hw_state *pll_state) { - struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev); + struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);u32 cfgcr0, cfgcr1;struct skl_wrpll_params pll_params = {0 };bool ret;@@ -2682,7 +2682,7 @@ static bool icl_mg_pll_find_divisors(int clock_khz, bool is_dp, bool use_ssc,static bool icl_calc_mg_pll_state (struct intel_crtc_state *crtc_state,struct intel_dpll_hw_state *pll_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);int refclk_khz = dev_priv->cdclk.hw.ref;int clock = crtc_state->port_clock;u32 dco_khz, m1div, m2div_int, m2div_rem, m2div_frac;drivers/gpu/drm/i915/display/intel_dvo.c +7
-7@@ -178,9 +178,9 @@ static void intel_dvo_get_config(struct intel_encoder *encoder,else flags |=DRM_MODE_FLAG_NVSYNC ; - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags; - pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->hw.adjusted_mode.crtc_clock = pipe_config->port_clock; } static void intel_disable_dvo(struct intel_encoder *encoder,@@ -207,8 +207,8 @@ static void intel_enable_dvo(struct intel_encoder *encoder,u32 temp =I915_READ (dvo_reg); intel_dvo->dev.dev_ops->mode_set (&intel_dvo->dev, - &pipe_config->base.mode, - &pipe_config->base.adjusted_mode); + &pipe_config->hw.mode, + &pipe_config->hw.adjusted_mode);I915_WRITE (dvo_reg, temp |DVO_ENABLE );I915_READ (dvo_reg);@@ -253,7 +253,7 @@ static int intel_dvo_compute_config(struct intel_encoder *encoder,struct intel_dvo *intel_dvo =enc_to_dvo (encoder);const struct drm_display_mode *fixed_mode = intel_dvo->attached_connector->panel.fixed_mode; -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;/* * If we have timings from the BIOS for the panel, put them in @@ -277,8 +277,8 @@ static void intel_dvo_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 *crtc =to_intel_crtc (pipe_config->base.crtc); -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc); +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dvo *intel_dvo =enc_to_dvo (encoder);enum pipe pipe = crtc->pipe;u32 dvo_val;drivers/gpu/drm/i915/display/intel_fbc.c +1
-1@@ -667,7 +667,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->vma =NULL ; cache->flags =0 ; - cache->crtc.mode_flags = crtc_state->base.adjusted_mode.flags; + cache->crtc.mode_flags = crtc_state->hw.adjusted_mode.flags;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) cache->crtc.hsw_bdw_pixel_rate = crtc_state->pixel_rate;drivers/gpu/drm/i915/display/intel_hdmi.c +31
-31@@ -279,7 +279,7 @@ static void ibx_write_infoframe(struct intel_encoder *encoder, {const u32 *data = frame;Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_lspcon.c +2
-2Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_lvds.c +6
-6Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_panel.c +7
-7Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_pipe_crc.c +3
-3Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_psr.c +5
-5Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_sdvo.c +11
-11Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_sprite.c +13
-12Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_tv.c +4
-4Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_vdsc.c +6
-6Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/vlv_dsi.c +10
-10Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Part of the diff is not shown here. View the raw message.
Maarten Lankhorst
maintainerRe: [PATCH 03/23] drm/i915: Prepare to split crtc state in uapi and hw state
Op 25-09-2019 om 01:40 schreef Matt Roper:
Quoted 5 lines · Maarten Lankhorst
Quoted 4 lines
We want to split
drm_crtc_stateinto the user visible state and actual hardware state. To prepare for this, we need some ground rules what should be in each state:
Quoted 8 lines
Quoted 5 lines
In uapi we use:
- crtc,*_changedflags, event, commit, state,mode_blob, (plane/connector/encoder)_mask.In hw state we use what's displayed in hardware:
- enable, active, (adjusted) mode, color property blobs.I'd suggest elaborating a bit that the union we add in this patch is just an intermediate step and that the end goal is that we'll eventually be maintaining two separate copies of some of the data.
Yeah ok, will clear up commit message.
Quoted 4 lines
Quoted 4 lines
clear_intel_crtc_stateand hw readout need to be updated for these rules, which will allow us to enable 2 joined pipes.Signed-off-by Maarten Lankhorst <[email protected]>
Quoted 8 lines
It might be worth providing some Coccinelle rules to apply these changes in a semi-automated manner; otherwise it's going to be a hassle to constantly resolve conflicts with pretty much any other display patches that land upstream.
Otherwise,
Reviewed-by Matt Roper <[email protected]>
I tried, but it has to be resolved manually, spatch won't help.
For example when enabling a crtc, you have to set crtc_state->uapi.active, which in atomic check gets copied to hw.active. If you set hw.active directly, it will be ignored or cleared.
So before atomic_check() -> use uapi.
During atomic_check() and commit() -> use hw.
~Maarten
Quoted 4,944 lines
Quoted 4,944 lines
--- drivers/gpu/drm/i915/display/icl_dsi.c | 18 +- drivers/gpu/drm/i915/display/intel_atomic.c | 14 +- .../gpu/drm/i915/display/intel_atomic_plane.c | 6 +- drivers/gpu/drm/i915/display/intel_audio.c | 12 +- drivers/gpu/drm/i915/display/intel_bw.c | 4 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 16 +- drivers/gpu/drm/i915/display/intel_color.c | 180 +++--- drivers/gpu/drm/i915/display/intel_crt.c | 24 +- drivers/gpu/drm/i915/display/intel_ddi.c | 34 +- drivers/gpu/drm/i915/display/intel_display.c | 540 +++++++++--------- .../drm/i915/display/intel_display_types.h | 28 +- drivers/gpu/drm/i915/display/intel_dp.c | 42 +- drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 14 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 20 +- drivers/gpu/drm/i915/display/intel_dvo.c | 14 +- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 62 +- drivers/gpu/drm/i915/display/intel_lspcon.c | 4 +- drivers/gpu/drm/i915/display/intel_lvds.c | 12 +- drivers/gpu/drm/i915/display/intel_panel.c | 14 +- drivers/gpu/drm/i915/display/intel_pipe_crc.c | 6 +- drivers/gpu/drm/i915/display/intel_psr.c | 10 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 22 +- drivers/gpu/drm/i915/display/intel_sprite.c | 25 +- drivers/gpu/drm/i915/display/intel_tv.c | 8 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 12 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 20 +- drivers/gpu/drm/i915/i915_debugfs.c | 14 +- drivers/gpu/drm/i915/intel_pm.c | 180 +++--- 30 files changed, 699 insertions(+), 664 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +9
-9@@ -276,7 +276,7 @@ static void configure_dual_link_mode(struct intel_encoder *encoder,if (intel_dsi->dual_link ==DSI_DUAL_LINK_FRONT_BACK ) {const struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;u32 dss_ctl2;u16 hactive = adjusted_mode->crtc_hdisplay;u16 dl_buffer_depth;@@ -625,7 +625,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base); -struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);enum pipe pipe = intel_crtc->pipe;u32 tmp;enum port port;@@ -768,7 +768,7 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);const struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;enum port port;enum transcoder dsi_trans;/* horizontal timings */ @@ -1216,7 +1216,7 @@ static void gen11_dsi_get_timings(struct intel_encoder *encoder, {struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (intel_dsi->dual_link) { adjusted_mode->crtc_hdisplay *=2 ;@@ -1242,16 +1242,16 @@ static void gen11_dsi_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_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);struct intel_dsi *intel_dsi =enc_to_intel_dsi (&encoder->base);/* FIXME: adapt icl_ddi_clock_get() for DSI and use that? */ pipe_config->port_clock =cnl_calc_wrpll_link (dev_priv, &pipe_config->dpll_hw_state); - pipe_config->base.adjusted_mode.crtc_clock = intel_dsi->pclk; + pipe_config->hw.adjusted_mode.crtc_clock = intel_dsi->pclk;if (intel_dsi->dual_link) - pipe_config->base.adjusted_mode.crtc_clock *=2 ; + pipe_config->hw.adjusted_mode.crtc_clock *=2 ;gen11_dsi_get_timings (encoder, pipe_config); pipe_config->output_types |=BIT (INTEL_OUTPUT_DSI );@@ -1265,11 +1265,11 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, base);struct intel_connector *intel_connector = intel_dsi->attached_connector; -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);const struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode; pipe_config->output_format =INTEL_OUTPUT_FORMAT_RGB ;intel_fixed_panel_mode (fixed_mode, adjusted_mode);drivers/gpu/drm/i915/display/intel_atomic.c +9
-5@@ -186,13 +186,14 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector)struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc) { +const struct intel_crtc_state *old_crtc_state =to_intel_crtc_state (crtc->state);struct intel_crtc_state *crtc_state; - crtc_state =kmemdup (crtc->state,sizeof (*crtc_state),GFP_KERNEL ); + crtc_state =kmemdup (old_crtc_state,sizeof (*crtc_state),GFP_KERNEL );if (!crtc_state)return NULL ; -__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->base); +__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false;@@ -205,7 +206,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) crtc_state->fb_bits =0 ; crtc_state->update_planes =0 ; -return &crtc_state->base; +return &crtc_state->uapi; }/** @@ -220,7 +221,10 @@ void intel_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state) { -drm_atomic_helper_crtc_destroy_state (crtc, state); + struct intel_crtc_state *crtc_state = to_intel_crtc_state(state); + +__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +kfree (crtc_state); } static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_state,@@ -316,7 +320,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,struct intel_plane_state *plane_state =NULL ;struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state; -struct drm_atomic_state *drm_state = crtc_state->base.state; +struct drm_atomic_state *drm_state = crtc_state->uapi.state;struct intel_atomic_state *intel_state =to_intel_atomic_state (drm_state);int num_scalers_need;int i;drivers/gpu/drm/i915/display/intel_atomic_plane.c +3
-3@@ -271,7 +271,7 @@ void intel_update_plane(struct intel_plane *plane,const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);trace_intel_update_plane (&plane->base, crtc); plane->update_plane (plane, crtc_state, plane_state);@@ -281,7 +281,7 @@ void intel_update_slave(struct intel_plane *plane,const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);trace_intel_update_plane (&plane->base, crtc); plane->update_slave (plane, crtc_state, plane_state);@@ -290,7 +290,7 @@ void intel_update_slave(struct intel_plane *plane,void intel_disable_plane (struct intel_plane *plane,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);trace_intel_disable_plane (&plane->base, crtc); plane->disable_plane (plane, crtc_state);drivers/gpu/drm/i915/display/intel_audio.c +6
-6@@ -233,7 +233,7 @@ static const struct hdmi_aud_ncts hdmi_aud_ncts_36bpp[] = {static u32 audio_config_hdmi_pixel_clock (const struct intel_crtc_state *crtc_state) {const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;int i;for (i =0 ; i <ARRAY_SIZE (hdmi_audio_clock); i++) {@@ -554,7 +554,7 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder, const struct drm_connector_state *old_conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;enum port port = encoder->port;u32 tmp, eldv;@@ -601,7 +601,7 @@ static void ilk_audio_codec_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 *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_connector *connector = conn_state->connector;enum pipe pipe = crtc->pipe;enum port port = encoder->port;@@ -691,10 +691,10 @@ void intel_audio_codec_enable(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_connector *connector = conn_state->connector;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;enum port port = encoder->port;enum pipe pipe = crtc->pipe;@@ -752,7 +752,7 @@ void intel_audio_codec_disable(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct i915_audio_component *acomp = dev_priv->audio_component; -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum port port = encoder->port;enum pipe pipe = crtc->pipe;drivers/gpu/drm/i915/display/intel_bw.c +2
-2@@ -264,7 +264,7 @@ static unsigned int intel_bw_crtc_num_active_planes(const struct intel_crtc_statstatic unsigned int intel_bw_crtc_data_rate (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);unsigned int data_rate =0 ;enum plane_id plane_id;@@ -285,7 +285,7 @@ static unsigned int intel_bw_crtc_data_rate(const struct intel_crtc_state *crtc_void intel_bw_crtc_update (struct intel_bw_state *bw_state,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); bw_state->data_rate[crtc->pipe] =intel_bw_crtc_data_rate (crtc_state);drivers/gpu/drm/i915/display/intel_cdclk.c +8
-8@@ -1917,10 +1917,10 @@ static int intel_pixel_rate_to_cdclk(struct drm_i915_private *dev_priv,int intel_crtc_compute_min_cdclk (const struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv = -to_i915 (crtc_state->base.crtc->dev); +to_i915 (crtc_state->uapi.crtc->dev);int min_cdclk; -if (!crtc_state->base.enable) +if (!crtc_state->hw.enable)return 0 ; min_cdclk =intel_pixel_rate_to_cdclk (dev_priv, crtc_state->pixel_rate);@@ -2043,7 +2043,7 @@ static u8 bxt_compute_min_voltage_level(struct intel_atomic_state *state) sizeof(state->min_voltage_level));for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) { -if (crtc_state->base.enable) +if (crtc_state->hw.enable) state->min_voltage_level[i] = crtc_state->min_voltage_level;else @@ -2129,7 +2129,7 @@ static int skl_dpll0_vco(struct intel_atomic_state *state) vco = dev_priv->skl_preferred_vco_freq;for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) { -if (!crtc_state->base.enable) +if (!crtc_state->hw.enable)continue ;if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_EDP ))@@ -2255,11 +2255,11 @@ static int intel_modeset_all_pipes(struct intel_atomic_state *state)if (IS_ERR (crtc_state))return PTR_ERR (crtc_state); -if (!crtc_state->base.active || -drm_atomic_crtc_needs_modeset (&crtc_state->base)) +if (!crtc_state->hw.active || +drm_atomic_crtc_needs_modeset (&crtc_state->uapi))continue ; - crtc_state->base.mode_changed = true; + crtc_state->uapi.mode_changed = true; ret =drm_atomic_add_affected_connectors (&state->base, &crtc->base);@@ -2310,7 +2310,7 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state) crtc =intel_get_crtc_for_pipe (dev_priv, pipe); crtc_state =intel_atomic_get_new_crtc_state (state, crtc);if (crtc_state && -drm_atomic_crtc_needs_modeset (&crtc_state->base)) +drm_atomic_crtc_needs_modeset (&crtc_state->uapi)) pipe =INVALID_PIPE ; }else { pipe =INVALID_PIPE ;drivers/gpu/drm/i915/display/intel_color.c +90
-90@@ -101,10 +101,10 @@ static bool lut_is_legacy(const struct drm_property_blob *lut)static bool crtc_state_is_legacy_gamma (const struct intel_crtc_state *crtc_state) { -return !crtc_state->base.degamma_lut && - !crtc_state->base.ctm && - crtc_state->base.gamma_lut && -lut_is_legacy (crtc_state->base.gamma_lut); +return !crtc_state->hw.degamma_lut && + !crtc_state->hw.ctm && + crtc_state->hw.gamma_lut && +lut_is_legacy (crtc_state->hw.gamma_lut); }/* @@ -189,7 +189,7 @@ static void icl_update_output_csc(struct intel_crtc *crtc,static bool ilk_csc_limited_range (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);/* * FIXME if there's a gamma LUT after the CSC, we should @@ -203,7 +203,7 @@ static bool ilk_csc_limited_range(const struct intel_crtc_state *crtc_state)static void ilk_csc_convert_ctm (const struct intel_crtc_state *crtc_state,u16 coeffs[9 ]) { -const struct drm_color_ctm *ctm = crtc_state->base.ctm->data; +const struct drm_color_ctm *ctm = crtc_state->hw.ctm->data;const u64 *input;u64 temp[9 ];int i;@@ -254,11 +254,11 @@ static void ilk_csc_convert_ctm(const struct intel_crtc_state *crtc_state,static void ilk_load_csc_matrix (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);bool limited_color_range =ilk_csc_limited_range (crtc_state); -if (crtc_state->base.ctm) { +if (crtc_state->hw.ctm) {u16 coeff[9 ];ilk_csc_convert_ctm (crtc_state, coeff);@@ -293,10 +293,10 @@ static void ilk_load_csc_matrix(const struct intel_crtc_state *crtc_state)static void icl_load_csc_matrix (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -if (crtc_state->base.ctm) { +if (crtc_state->hw.ctm) {u16 coeff[9 ];ilk_csc_convert_ctm (crtc_state, coeff);@@ -322,12 +322,12 @@ static void icl_load_csc_matrix(const struct intel_crtc_state *crtc_state)*/ static void cherryview_load_csc_matrix (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -if (crtc_state->base.ctm) { -const struct drm_color_ctm *ctm = crtc_state->base.ctm->data; +if (crtc_state->hw.ctm) { +const struct drm_color_ctm *ctm = crtc_state->hw.ctm->data;u16 coeffs[9 ] = {};int i;@@ -388,7 +388,7 @@ static u32 ilk_lut_10(const struct drm_color_lut *color)static void i9xx_load_luts_internal (const struct intel_crtc_state *crtc_state,const struct drm_property_blob *blob) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;int i;@@ -419,12 +419,12 @@ static void i9xx_load_luts_internal(const struct intel_crtc_state *crtc_state,static void i9xx_load_luts (const struct intel_crtc_state *crtc_state) { -i9xx_load_luts_internal (crtc_state, crtc_state->base.gamma_lut); +i9xx_load_luts_internal (crtc_state, crtc_state->hw.gamma_lut); }static void i9xx_color_commit (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;u32 val;@@ -437,7 +437,7 @@ static void i9xx_color_commit(const struct intel_crtc_state *crtc_state)static void ilk_color_commit (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;u32 val;@@ -452,7 +452,7 @@ static void ilk_color_commit(const struct intel_crtc_state *crtc_state)static void hsw_color_commit (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);I915_WRITE (GAMMA_MODE (crtc->pipe), crtc_state->gamma_mode);@@ -462,7 +462,7 @@ static void hsw_color_commit(const struct intel_crtc_state *crtc_state)static void skl_color_commit (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;u32 val =0 ;@@ -508,8 +508,8 @@ static void i965_load_lut_10p6(struct intel_crtc *crtc,static void i965_load_luts (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut;if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT )i9xx_load_luts (crtc_state);@@ -531,8 +531,8 @@ static void ilk_load_lut_10(struct intel_crtc *crtc,static void ilk_load_luts (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut;if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT )i9xx_load_luts (crtc_state);@@ -632,9 +632,9 @@ static void ivb_load_lut_ext_max(struct intel_crtc *crtc)static void ivb_load_luts (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; -const struct drm_property_blob *degamma_lut = crtc_state->base.degamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut; +const struct drm_property_blob *degamma_lut = crtc_state->hw.degamma_lut;if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT ) {i9xx_load_luts (crtc_state);@@ -655,9 +655,9 @@ static void ivb_load_luts(const struct intel_crtc_state *crtc_state)static void bdw_load_luts (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; -const struct drm_property_blob *degamma_lut = crtc_state->base.degamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut; +const struct drm_property_blob *degamma_lut = crtc_state->hw.degamma_lut;if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT ) {i9xx_load_luts (crtc_state);@@ -678,11 +678,11 @@ static void bdw_load_luts(const struct intel_crtc_state *crtc_state)static void glk_load_degamma_lut (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;const u32 lut_size =INTEL_INFO (dev_priv)->color.degamma_lut_size; -const struct drm_color_lut *lut = crtc_state->base.degamma_lut->data; +const struct drm_color_lut *lut = crtc_state->hw.degamma_lut->data;u32 i;/* @@ -717,7 +717,7 @@ static void glk_load_degamma_lut(const struct intel_crtc_state *crtc_state)static void glk_load_degamma_lut_linear (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;const u32 lut_size =INTEL_INFO (dev_priv)->color.degamma_lut_size;@@ -744,8 +744,8 @@ static void glk_load_degamma_lut_linear(const struct intel_crtc_state *crtc_statstatic void glk_load_luts (const struct intel_crtc_state *crtc_state) { -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);/* * On GLK+ both pipe CSC and degamma LUT are controlled @@ -755,7 +755,7 @@ static void glk_load_luts(const struct intel_crtc_state *crtc_state)* the degama LUT so that we don't have to reload * it every time the pipe CSC is being enabled. */ -if (crtc_state->base.degamma_lut) +if (crtc_state->hw.degamma_lut)glk_load_degamma_lut (crtc_state);else glk_load_degamma_lut_linear (crtc_state);@@ -786,7 +786,7 @@ static void icl_load_gcmax(const struct intel_crtc_state *crtc_state, const struct drm_color_lut *color) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -799,9 +799,9 @@ icl_load_gcmax(const struct intel_crtc_state *crtc_state,static void icl_program_gamma_superfine_segment (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -const struct drm_property_blob *blob = crtc_state->base.gamma_lut; +const struct drm_property_blob *blob = crtc_state->hw.gamma_lut;const struct drm_color_lut *lut = blob->data;enum pipe pipe = crtc->pipe;u32 i;@@ -828,9 +828,9 @@ icl_program_gamma_superfine_segment(const struct intel_crtc_state *crtc_state)static void icl_program_gamma_multi_segment (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -const struct drm_property_blob *blob = crtc_state->base.gamma_lut; +const struct drm_property_blob *blob = crtc_state->hw.gamma_lut;const struct drm_color_lut *lut = blob->data;const struct drm_color_lut *entry;enum pipe pipe = crtc->pipe;@@ -880,10 +880,10 @@ icl_program_gamma_multi_segment(const struct intel_crtc_state *crtc_state)static void icl_load_luts (const struct intel_crtc_state *crtc_state) { -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); -if (crtc_state->base.degamma_lut) +if (crtc_state->hw.degamma_lut)glk_load_degamma_lut (crtc_state);switch (crtc_state->gamma_mode &GAMMA_MODE_MODE_MASK ) {@@ -958,9 +958,9 @@ static void chv_load_cgm_gamma(struct intel_crtc *crtc,static void chv_load_luts (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; -const struct drm_property_blob *degamma_lut = crtc_state->base.degamma_lut; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut; +const struct drm_property_blob *degamma_lut = crtc_state->hw.degamma_lut;cherryview_load_csc_matrix (crtc_state);@@ -978,28 +978,28 @@ static void chv_load_luts(const struct intel_crtc_state *crtc_state)void intel_color_load_luts (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); dev_priv->display.load_luts (crtc_state); }void intel_color_commit (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); dev_priv->display.color_commit (crtc_state); }int intel_color_check (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);return dev_priv->display.color_check (crtc_state); }void intel_color_get_config (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);if (dev_priv->display.read_luts) dev_priv->display.read_luts (crtc_state);@@ -1023,16 +1023,16 @@ static bool need_plane_update(struct intel_plane *plane,static int intel_color_add_affected_planes (struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_atomic_state *state = -to_intel_atomic_state (new_crtc_state->base.state); +to_intel_atomic_state (new_crtc_state->uapi.state);const struct intel_crtc_state *old_crtc_state =intel_atomic_get_old_crtc_state (state, crtc);struct intel_plane *plane; -if (!new_crtc_state->base.active || -drm_atomic_crtc_needs_modeset (&new_crtc_state->base)) +if (!new_crtc_state->hw.active || +drm_atomic_crtc_needs_modeset (&new_crtc_state->uapi))return 0 ; if (new_crtc_state->gamma_enable == old_crtc_state->gamma_enable &&@@ -1074,9 +1074,9 @@ static int check_lut_size(const struct drm_property_blob *lut, int expected)static int check_luts (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); -const struct drm_property_blob *gamma_lut = crtc_state->base.gamma_lut; -const struct drm_property_blob *degamma_lut = crtc_state->base.degamma_lut; +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); +const struct drm_property_blob *gamma_lut = crtc_state->hw.gamma_lut; +const struct drm_property_blob *degamma_lut = crtc_state->hw.degamma_lut;int gamma_length, degamma_length;u32 gamma_tests, degamma_tests;@@ -1124,7 +1124,7 @@ static int i9xx_color_check(struct intel_crtc_state *crtc_state)return ret; crtc_state->gamma_enable = - crtc_state->base.gamma_lut && + crtc_state->hw.gamma_lut && !crtc_state->c8_planes; crtc_state->gamma_mode =i9xx_gamma_mode (crtc_state);@@ -1143,11 +1143,11 @@ static u32 chv_cgm_mode(const struct intel_crtc_state *crtc_state)if (crtc_state_is_legacy_gamma (crtc_state))return 0 ; -if (crtc_state->base.degamma_lut) +if (crtc_state->hw.degamma_lut) cgm_mode |=CGM_PIPE_MODE_DEGAMMA ; -if (crtc_state->base.ctm) +if (crtc_state->hw.ctm) cgm_mode |=CGM_PIPE_MODE_CSC ; -if (crtc_state->base.gamma_lut) +if (crtc_state->hw.gamma_lut) cgm_mode |=CGM_PIPE_MODE_GAMMA ;return cgm_mode;@@ -1206,7 +1206,7 @@ static int ilk_color_check(struct intel_crtc_state *crtc_state)return ret; crtc_state->gamma_enable = - crtc_state->base.gamma_lut && + crtc_state->hw.gamma_lut && !crtc_state->c8_planes;/* @@ -1232,8 +1232,8 @@ static u32 ivb_gamma_mode(const struct intel_crtc_state *crtc_state)if (!crtc_state->gamma_enable ||crtc_state_is_legacy_gamma (crtc_state))return GAMMA_MODE_MODE_8BIT ; -else if (crtc_state->base.gamma_lut && - crtc_state->base.degamma_lut) +else if (crtc_state->hw.gamma_lut && + crtc_state->hw.degamma_lut)return GAMMA_MODE_MODE_SPLIT ;else return GAMMA_MODE_MODE_10BIT ;@@ -1247,7 +1247,7 @@ static u32 ivb_csc_mode(const struct intel_crtc_state *crtc_state)* CSC comes after the LUT in degamma, RGB->YCbCr, * and RGB full->limited range mode. */ -if (crtc_state->base.degamma_lut || +if (crtc_state->hw.degamma_lut || crtc_state->output_format !=INTEL_OUTPUT_FORMAT_RGB || limited_color_range)return 0 ;@@ -1265,13 +1265,13 @@ static int ivb_color_check(struct intel_crtc_state *crtc_state)return ret; crtc_state->gamma_enable = - (crtc_state->base.gamma_lut || - crtc_state->base.degamma_lut) && + (crtc_state->hw.gamma_lut || + crtc_state->hw.degamma_lut) && !crtc_state->c8_planes; crtc_state->csc_enable = crtc_state->output_format !=INTEL_OUTPUT_FORMAT_RGB || - crtc_state->base.ctm || limited_color_range; + crtc_state->hw.ctm || limited_color_range; crtc_state->gamma_mode =ivb_gamma_mode (crtc_state);@@ -1302,14 +1302,14 @@ static int glk_color_check(struct intel_crtc_state *crtc_state)return ret; crtc_state->gamma_enable = - crtc_state->base.gamma_lut && + crtc_state->hw.gamma_lut && !crtc_state->c8_planes;/* On GLK+ degamma LUT is controlled by csc_enable */ crtc_state->csc_enable = - crtc_state->base.degamma_lut || + crtc_state->hw.degamma_lut || crtc_state->output_format !=INTEL_OUTPUT_FORMAT_RGB || - crtc_state->base.ctm || crtc_state->limited_color_range; + crtc_state->hw.ctm || crtc_state->limited_color_range; crtc_state->gamma_mode =glk_gamma_mode (crtc_state);@@ -1326,14 +1326,14 @@ static u32 icl_gamma_mode(const struct intel_crtc_state *crtc_state) {u32 gamma_mode =0 ; -if (crtc_state->base.degamma_lut) +if (crtc_state->hw.degamma_lut) gamma_mode |=PRE_CSC_GAMMA_ENABLE ; -if (crtc_state->base.gamma_lut && +if (crtc_state->hw.gamma_lut && !crtc_state->c8_planes) gamma_mode |=POST_CSC_GAMMA_ENABLE ; -if (!crtc_state->base.gamma_lut || +if (!crtc_state->hw.gamma_lut ||crtc_state_is_legacy_gamma (crtc_state)) gamma_mode |=GAMMA_MODE_MODE_8BIT ;else @@ -1346,7 +1346,7 @@ static u32 icl_csc_mode(const struct intel_crtc_state *crtc_state) {u32 csc_mode =0 ; -if (crtc_state->base.ctm) +if (crtc_state->hw.ctm) csc_mode |=ICL_CSC_ENABLE ; if (crtc_state->output_format != INTEL_OUTPUT_FORMAT_RGB ||@@ -1423,7 +1423,7 @@ static int glk_gamma_precision(const struct intel_crtc_state *crtc_state)int intel_color_get_gamma_bit_precision (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (!crtc_state->gamma_enable)@@ -1532,7 +1532,7 @@ static u32 intel_color_lut_pack(u32 val, u32 bit_precision)static struct drm_property_blob *i9xx_read_lut_8 (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;struct drm_property_blob *blob;@@ -1566,13 +1566,13 @@ i9xx_read_lut_8(const struct intel_crtc_state *crtc_state)static void i9xx_read_luts (struct intel_crtc_state *crtc_state) { - crtc_state->base.gamma_lut =i9xx_read_lut_8 (crtc_state); + crtc_state->uapi.gamma_lut =i9xx_read_lut_8 (crtc_state); }static struct drm_property_blob *i965_read_lut_10p6 (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 lut_size =INTEL_INFO (dev_priv)->color.gamma_lut_size;enum pipe pipe = crtc->pipe;@@ -1613,15 +1613,15 @@ i965_read_lut_10p6(const struct intel_crtc_state *crtc_state)static void i965_read_luts (struct intel_crtc_state *crtc_state) {if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT ) - crtc_state->base.gamma_lut =i9xx_read_lut_8 (crtc_state); + crtc_state->uapi.gamma_lut =i9xx_read_lut_8 (crtc_state);else - crtc_state->base.gamma_lut =i965_read_lut_10p6 (crtc_state); + crtc_state->uapi.gamma_lut =i965_read_lut_10p6 (crtc_state); }static struct drm_property_blob *chv_read_cgm_lut (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 lut_size =INTEL_INFO (dev_priv)->color.gamma_lut_size;enum pipe pipe = crtc->pipe;@@ -1655,15 +1655,15 @@ chv_read_cgm_lut(const struct intel_crtc_state *crtc_state)static void chv_read_luts (struct intel_crtc_state *crtc_state) {if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT ) - crtc_state->base.gamma_lut =i9xx_read_lut_8 (crtc_state); + crtc_state->uapi.gamma_lut =i9xx_read_lut_8 (crtc_state);else - crtc_state->base.gamma_lut =chv_read_cgm_lut (crtc_state); + crtc_state->uapi.gamma_lut =chv_read_cgm_lut (crtc_state); }static struct drm_property_blob *ilk_read_lut_10 (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 lut_size =INTEL_INFO (dev_priv)->color.gamma_lut_size;enum pipe pipe = crtc->pipe;@@ -1696,15 +1696,15 @@ ilk_read_lut_10(const struct intel_crtc_state *crtc_state)static void ilk_read_luts (struct intel_crtc_state *crtc_state) {if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT ) - crtc_state->base.gamma_lut =i9xx_read_lut_8 (crtc_state); + crtc_state->uapi.gamma_lut =i9xx_read_lut_8 (crtc_state);else - crtc_state->base.gamma_lut =ilk_read_lut_10 (crtc_state); + crtc_state->uapi.gamma_lut =ilk_read_lut_10 (crtc_state); }static struct drm_property_blob *glk_read_lut_10 (const struct intel_crtc_state *crtc_state,u32 prec_index) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);int hw_lut_size =ivb_lut_10_size (prec_index);enum pipe pipe = crtc->pipe;@@ -1742,9 +1742,9 @@ glk_read_lut_10(const struct intel_crtc_state *crtc_state, u32 prec_index)static void glk_read_luts (struct intel_crtc_state *crtc_state) {if (crtc_state->gamma_mode ==GAMMA_MODE_MODE_8BIT ) - crtc_state->base.gamma_lut =i9xx_read_lut_8 (crtc_state); + crtc_state->uapi.gamma_lut =i9xx_read_lut_8 (crtc_state);else - crtc_state->base.gamma_lut =glk_read_lut_10 (crtc_state,PAL_PREC_INDEX_VALUE (0 )); + crtc_state->uapi.gamma_lut =glk_read_lut_10 (crtc_state,PAL_PREC_INDEX_VALUE (0 )); }void intel_color_init (struct intel_crtc *crtc)drivers/gpu/drm/i915/display/intel_crt.c +12
-12@@ -132,9 +132,9 @@ static void intel_crt_get_config(struct intel_encoder *encoder, { pipe_config->output_types |=BIT (INTEL_OUTPUT_ANALOG ); - pipe_config->base.adjusted_mode.flags |=intel_crt_get_flags (encoder); + pipe_config->hw.adjusted_mode.flags |=intel_crt_get_flags (encoder); - pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->hw.adjusted_mode.crtc_clock = pipe_config->port_clock; } static void hsw_crt_get_config(struct intel_encoder *encoder,@@ -144,13 +144,13 @@ static void hsw_crt_get_config(struct intel_encoder *encoder,intel_ddi_get_config (encoder, pipe_config); - pipe_config->base.adjusted_mode.flags &= ~(DRM_MODE_FLAG_PHSYNC | + pipe_config->hw.adjusted_mode.flags &= ~(DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NHSYNC |DRM_MODE_FLAG_PVSYNC |DRM_MODE_FLAG_NVSYNC ); - pipe_config->base.adjusted_mode.flags |=intel_crt_get_flags (encoder); + pipe_config->hw.adjusted_mode.flags |=intel_crt_get_flags (encoder); - pipe_config->base.adjusted_mode.crtc_clock =lpt_get_iclkip (dev_priv); + pipe_config->hw.adjusted_mode.crtc_clock =lpt_get_iclkip (dev_priv); }/* Note: The caller is required to filter out dpms modes not supported by the @@ -161,8 +161,8 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crt *crt =intel_encoder_to_crt (encoder); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); -const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); +const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;u32 adpa;if (INTEL_GEN (dev_priv) >=5 )@@ -271,7 +271,7 @@ static void hsw_pre_enable_crt(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 *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;WARN_ON (!crtc_state->has_pch_encoder);@@ -288,7 +288,7 @@ static void hsw_enable_crt(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 *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;WARN_ON (!crtc_state->has_pch_encoder);@@ -358,7 +358,7 @@ static int intel_crt_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLSCAN )return -EINVAL ;@@ -373,7 +373,7 @@ static int pch_crt_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLSCAN )return -EINVAL ;@@ -390,7 +390,7 @@ static int hsw_crt_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; + &pipe_config->hw.adjusted_mode;if (adjusted_mode->flags &DRM_MODE_FLAG_DBLSCAN )return -EINVAL ;drivers/gpu/drm/i915/display/intel_ddi.c +17
-17@@ -1483,7 +1483,7 @@ static void ddi_dotclock_get(struct intel_crtc_state *pipe_config)if (pipe_config->fec_enable) dotclock =intel_dp_fec_to_mode_clock (dotclock); - pipe_config->base.adjusted_mode.crtc_clock = dotclock; + pipe_config->hw.adjusted_mode.crtc_clock = dotclock; } static void icl_ddi_clock_get(struct intel_encoder *encoder,@@ -1698,7 +1698,7 @@ static void intel_ddi_clock_get(struct intel_encoder *encoder,void intel_ddi_set_pipe_settings (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;@@ -1752,7 +1752,7 @@ void intel_ddi_set_pipe_settings(const struct intel_crtc_state *crtc_state)void intel_ddi_set_vc_payload_alloc (const struct intel_crtc_state *crtc_state,bool state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;@@ -1774,7 +1774,7 @@ void intel_ddi_set_vc_payload_alloc(const struct intel_crtc_state *crtc_state,static u32 intel_ddi_transcoder_func_reg_val_get (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_encoder *encoder =intel_ddi_get_crtc_encoder (crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -1806,9 +1806,9 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state)BUG (); } -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_PVSYNC ) temp |=TRANS_DDI_PVSYNC ; -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_PHSYNC ) temp |=TRANS_DDI_PHSYNC ;if (cpu_transcoder ==TRANSCODER_EDP ) {@@ -1861,7 +1861,7 @@ intel_ddi_transcoder_func_reg_val_get(const struct intel_crtc_state *crtc_state)void intel_ddi_enable_transcoder_func (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;@@ -1877,7 +1877,7 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)static void intel_ddi_config_transcoder_func (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 temp;@@ -1889,7 +1889,7 @@ intel_ddi_config_transcoder_func(const struct intel_crtc_state *crtc_state)void intel_ddi_disable_transcoder_func (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;i915_reg_t reg =TRANS_DDI_FUNC_CTL (cpu_transcoder);@@ -2187,7 +2187,7 @@ static void intel_ddi_get_power_domains(struct intel_encoder *encoder,void intel_ddi_enable_pipe_clock (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_encoder *encoder =intel_ddi_get_crtc_encoder (crtc);enum port port = encoder->port;@@ -2205,7 +2205,7 @@ void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state)void intel_ddi_disable_pipe_clock (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;if (cpu_transcoder !=TRANSCODER_EDP ) {@@ -3421,7 +3421,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -3846,7 +3846,7 @@ intel_ddi_update_prepare(struct intel_atomic_state *state,WARN_ON (crtc && crtc->active);intel_tc_port_get_link (enc_to_dig_port (&encoder->base), required_lanes); -if (crtc_state && crtc_state->base.active) +if (crtc_state && crtc_state->hw.active)intel_update_active_dpll (state, crtc, encoder); }@@ -3976,7 +3976,7 @@ void intel_ddi_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_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;u32 temp, flags =0 ;@@ -3994,7 +3994,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,else flags |=DRM_MODE_FLAG_NVSYNC ; - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags;switch (temp &TRANS_DDI_BPC_MASK ) {case TRANS_DDI_BPC_6 :@@ -4136,7 +4136,7 @@ static int intel_ddi_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port = encoder->port;int ret;@@ -4267,7 +4267,7 @@ static int intel_hdmi_reset_link(struct intel_encoder *encoder,WARN_ON (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )); -if (!crtc_state->base.active) +if (!crtc_state->hw.active)return 0 ; if (!crtc_state->hdmi_high_tmds_clock_ratio &&drivers/gpu/drm/i915/display/intel_display.c +274
-266@@ -518,7 +518,7 @@ icl_wa_scalerclkgating(struct drm_i915_private *dev_priv, enum pipe pipe,static bool needs_modeset (const struct intel_crtc_state *state) { -return drm_atomic_crtc_needs_modeset (&state->base); +return drm_atomic_crtc_needs_modeset (&state->uapi); }/* @@ -632,7 +632,7 @@ i9xx_select_p2_div(const struct intel_limit *limit, const struct intel_crtc_state *crtc_state, int target) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_LVDS )) {/* @@ -668,7 +668,7 @@ i9xx_find_best_dpll(const struct intel_limit *limit, int target, int refclk, struct dpll *match_clock, struct dpll *best_clock) { - struct drm_device *dev = crtc_state->base.crtc->dev; + struct drm_device *dev = crtc_state->uapi.crtc->dev;struct dpll clock;int err = target;@@ -726,7 +726,7 @@ pnv_find_best_dpll(const struct intel_limit *limit, int target, int refclk, struct dpll *match_clock, struct dpll *best_clock) { - struct drm_device *dev = crtc_state->base.crtc->dev; + struct drm_device *dev = crtc_state->uapi.crtc->dev;struct dpll clock;int err = target;@@ -782,7 +782,7 @@ g4x_find_best_dpll(const struct intel_limit *limit, int target, int refclk, struct dpll *match_clock, struct dpll *best_clock) { - struct drm_device *dev = crtc_state->base.crtc->dev; + struct drm_device *dev = crtc_state->uapi.crtc->dev;struct dpll clock;int max_n;bool found = false;@@ -876,7 +876,7 @@ vlv_find_best_dpll(const struct intel_limit *limit, int target, int refclk, struct dpll *match_clock, struct dpll *best_clock) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;struct dpll clock;unsigned int bestppm =1000000 ;@@ -936,7 +936,7 @@ chv_find_best_dpll(const struct intel_limit *limit, int target, int refclk, struct dpll *match_clock, struct dpll *best_clock) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;unsigned int best_error_ppm;struct dpll clock;@@ -1015,7 +1015,7 @@ bool intel_crtc_active(struct intel_crtc *crtc)* for atomic. */ return crtc->active && crtc->base.primary->state->fb && - crtc->config->base.adjusted_mode.crtc_clock; + crtc->config->hw.adjusted_mode.crtc_clock; } enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,@@ -1069,7 +1069,7 @@ static void intel_wait_for_pipe_scanline_moving(struct intel_crtc *crtc)static void intel_wait_for_pipe_off (const struct intel_crtc_state *old_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (INTEL_GEN (dev_priv) >=4 ) {@@ -1528,7 +1528,7 @@ static void i9xx_enable_pll(struct intel_crtc *crtc,static void i9xx_disable_pll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -1619,7 +1619,7 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,static void ironlake_enable_pch_transcoder (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;i915_reg_t reg;@@ -1763,7 +1763,7 @@ enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc)static u32 intel_crtc_max_vblank_count (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);/* * On i965gm the hardware frame counter reads @@ -1783,7 +1783,7 @@ static u32 intel_crtc_max_vblank_count(const struct intel_crtc_state *crtc_statestatic void intel_crtc_vblank_on (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);drm_crtc_set_max_vblank_count (&crtc->base,intel_crtc_max_vblank_count (crtc_state));@@ -1792,7 +1792,7 @@ static void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state)static void intel_enable_pipe (const struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = new_crtc_state->cpu_transcoder;enum pipe pipe = crtc->pipe;@@ -1850,7 +1850,7 @@ static void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state)static void intel_disable_pipe (const struct intel_crtc_state *old_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;enum pipe pipe = crtc->pipe;@@ -3116,14 +3116,14 @@ intel_set_plane_visible(struct intel_crtc_state *crtc_state, plane_state->base.visible = visible;if (visible) - crtc_state->base.plane_mask |=drm_plane_mask (&plane->base); + crtc_state->uapi.plane_mask |=drm_plane_mask (&plane->base);else - crtc_state->base.plane_mask &= ~drm_plane_mask (&plane->base); + crtc_state->uapi.plane_mask &= ~drm_plane_mask (&plane->base); }static void fixup_active_planes (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);struct drm_plane *plane;/* @@ -3134,7 +3134,7 @@ static void fixup_active_planes(struct intel_crtc_state *crtc_state) crtc_state->active_planes =0 ;drm_for_each_plane_mask (plane, &dev_priv->drm, - crtc_state->base.plane_mask) + crtc_state->uapi.plane_mask) crtc_state->active_planes |=BIT (to_intel_plane (plane)->id); }@@ -3608,7 +3608,7 @@ i9xx_plane_max_stride(struct intel_plane *plane,static u32 i9xx_plane_ctl_crtc (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 dspcntr =0 ;@@ -3762,7 +3762,7 @@ i9xx_plane_check(struct intel_crtc_state *crtc_state,return ret; ret = drm_atomic_helper_check_plane_state(&plane_state->base, - &crtc_state->base, + &crtc_state->uapi, DRM_PLANE_HELPER_NO_SCALING, DRM_PLANE_HELPER_NO_SCALING, i9xx_plane_has_windowing(plane),@@ -3938,7 +3938,7 @@ static void skl_detach_scaler(struct intel_crtc *intel_crtc, int id)*/ static void skl_detach_scalers (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);const struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state;int i;@@ -4133,7 +4133,7 @@ static u32 cnl_plane_ctl_flip(unsigned int reflect)u32 skl_plane_ctl_crtc (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);u32 plane_ctl =0 ;if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv))@@ -4189,7 +4189,7 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,u32 glk_plane_color_ctl_crtc (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);u32 plane_color_ctl =0 ;if (INTEL_GEN (dev_priv) >=11 )@@ -4411,11 +4411,11 @@ static void icl_set_pipe_chicken(struct intel_crtc *crtc)static void intel_update_pipe_config (const struct intel_crtc_state *old_crtc_state,const struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);/* drm_atomic_helper_update_legacy_modeset_state might not be called. */ - crtc->base.mode = new_crtc_state->base.mode; + crtc->base.mode = new_crtc_state->uapi.mode;/* * Update pipe size and adjust fitter if needed: the reason for this is @@ -4844,7 +4844,7 @@ static void ivb_manual_fdi_link_train(struct intel_crtc *crtc,static void ironlake_fdi_pll_enable (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (intel_crtc->base.dev);enum pipe pipe = intel_crtc->pipe;i915_reg_t reg;@@ -5005,9 +5005,9 @@ void lpt_disable_iclkip(struct drm_i915_private *dev_priv)/* Program iCLKIP clock to the desired frequency */ static void lpt_program_iclkip (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -int clock = crtc_state->base.adjusted_mode.crtc_clock; +int clock = crtc_state->hw.adjusted_mode.crtc_clock;u32 divsel, phaseinc, auxdiv, phasedir =0 ;u32 temp;@@ -5121,7 +5121,7 @@ int lpt_get_iclkip(struct drm_i915_private *dev_priv)static void ironlake_pch_transcoder_set_timings (const struct intel_crtc_state *crtc_state,enum pipe pch_transcoder) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;@@ -5164,7 +5164,7 @@ static void cpt_set_fdi_bc_bifurcation(struct drm_i915_private *dev_priv, bool estatic void ivybridge_update_fdi_bc_bifurcation (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);switch (crtc->pipe) {@@ -5194,7 +5194,7 @@ static struct intel_encoder * intel_get_crtc_new_encoder(const struct intel_atomic_state *state, const struct intel_crtc_state *crtc_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);const struct drm_connector_state *connector_state;const struct drm_connector *connector;struct intel_encoder *encoder =NULL ;@@ -5226,7 +5226,7 @@ intel_get_crtc_new_encoder(const struct intel_atomic_state *state,static void ironlake_pch_enable (const struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);enum pipe pipe = crtc->pipe;@@ -5280,7 +5280,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,if (HAS_PCH_CPT (dev_priv) &&intel_crtc_has_dp_encoder (crtc_state)) {const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;u32 bpc = (I915_READ (PIPECONF (pipe)) &PIPECONF_BPC_MASK ) >>5 ;i915_reg_t reg =TRANS_DP_CTL (pipe);enum port port;@@ -5310,7 +5310,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,static void lpt_pch_enable (const struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;@@ -5427,10 +5427,10 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state;struct intel_crtc *intel_crtc = -to_intel_crtc (crtc_state->base.crtc); +to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (intel_crtc->base.dev);const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;/* * Src coordinates are already rotated by 270 degrees for @@ -5446,7 +5446,7 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,* Once NV12 is enabled, handle it here while allocating scaler * for NV12. */ -if (INTEL_GEN (dev_priv) >=9 && crtc_state->base.enable && +if (INTEL_GEN (dev_priv) >=9 && crtc_state->hw.enable && need_scaler && adjusted_mode->flags &DRM_MODE_FLAG_INTERLACE ) {DRM_DEBUG_KMS ("Pipe/Plane scaling not supported with IF-ID mode\n" );return -EINVAL ;@@ -5518,13 +5518,13 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,*/ int skl_update_scaler_crtc (struct intel_crtc_state *state) { -const struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &state->hw.adjusted_mode;bool need_scaler = false;if (state->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 ) need_scaler = true; - return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX, + return skl_update_scaler(state, !state->hw.active, SKL_CRTC_INDEX, &state->scaler_state.scaler_id, state->pipe_src_w, state->pipe_src_h, adjusted_mode->crtc_hdisplay,@@ -5624,7 +5624,7 @@ static void skylake_scaler_disable(struct intel_crtc *crtc)static void skylake_pfit_enable (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; const struct intel_crtc_scaler_state *scaler_state =@@ -5661,7 +5661,7 @@ static void skylake_pfit_enable(const struct intel_crtc_state *crtc_state)static void ironlake_pfit_enable (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -5682,7 +5682,7 @@ static void ironlake_pfit_enable(const struct intel_crtc_state *crtc_state)void hsw_enable_ips (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);@@ -5718,7 +5718,7 @@ void hsw_enable_ips(const struct intel_crtc_state *crtc_state)void hsw_disable_ips (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);@@ -5828,7 +5828,7 @@ intel_pre_disable_primary_noatomic(struct drm_crtc *crtc)static bool hsw_pre_update_disable_ips (const struct intel_crtc_state *old_crtc_state,const struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (!old_crtc_state->ips_enabled)@@ -5844,7 +5844,7 @@ static bool hsw_pre_update_disable_ips(const struct intel_crtc_state *old_crtc_s* Disable IPS before we program the LUT. */ if (IS_HASWELL (dev_priv) && - (new_crtc_state->base.color_mgmt_changed || + (new_crtc_state->uapi.color_mgmt_changed || new_crtc_state->update_pipe) && new_crtc_state->gamma_mode ==GAMMA_MODE_MODE_SPLIT )return true;@@ -5855,7 +5855,7 @@ static bool hsw_pre_update_disable_ips(const struct intel_crtc_state *old_crtc_sstatic bool hsw_post_update_enable_ips (const struct intel_crtc_state *old_crtc_state,const struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (!new_crtc_state->ips_enabled)@@ -5871,7 +5871,7 @@ static bool hsw_post_update_enable_ips(const struct intel_crtc_state *old_crtc_s* Re-enable IPS after the LUT has been programmed. */ if (IS_HASWELL (dev_priv) && - (new_crtc_state->base.color_mgmt_changed || + (new_crtc_state->uapi.color_mgmt_changed || new_crtc_state->update_pipe) && new_crtc_state->gamma_mode ==GAMMA_MODE_MODE_SPLIT )return true;@@ -5881,7 +5881,7 @@ static bool hsw_post_update_enable_ips(const struct intel_crtc_state *old_crtc_s* forcibly enable IPS on the first fastset. */ if (new_crtc_state->update_pipe && - old_crtc_state->base.adjusted_mode.private_flags &I915_MODE_FLAG_INHERITED ) + old_crtc_state->hw.adjusted_mode.private_flags &I915_MODE_FLAG_INHERITED )return true;return !old_crtc_state->ips_enabled;@@ -5912,10 +5912,10 @@ static bool needs_scalerclk_wa(struct drm_i915_private *dev_priv,static void intel_post_plane_update (struct intel_crtc_state *old_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct drm_atomic_state *state = old_crtc_state->base.state; +struct drm_atomic_state *state = old_crtc_state->uapi.state;struct intel_crtc_state *pipe_config =intel_atomic_get_new_crtc_state (to_intel_atomic_state (state), crtc);@@ -5925,7 +5925,7 @@ static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)intel_frontbuffer_flip (to_i915 (crtc->base.dev), pipe_config->fb_bits); -if (pipe_config->update_wm_post && pipe_config->base.active) +if (pipe_config->update_wm_post && pipe_config->hw.active)intel_update_watermarks (crtc);if (hsw_post_update_enable_ips (old_crtc_state, pipe_config))@@ -5955,10 +5955,10 @@ static void intel_post_plane_update(struct intel_crtc_state *old_crtc_state)static void intel_pre_plane_update (struct intel_crtc_state *old_crtc_state,struct intel_crtc_state *pipe_config) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -struct drm_atomic_state *state = old_crtc_state->base.state; +struct drm_atomic_state *state = old_crtc_state->uapi.state;struct drm_plane *primary = crtc->base.primary;struct drm_plane_state *old_primary_state =drm_atomic_get_old_plane_state (state, primary);@@ -6003,7 +6003,7 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,* event which is after the vblank start event, so we need to have a * wait-for-vblank between disabling the plane and the pipe. */ -if (HAS_GMCH (dev_priv) && old_crtc_state->base.active && +if (HAS_GMCH (dev_priv) && old_crtc_state->hw.active && pipe_config->disable_cxsr &&intel_set_memory_cxsr (dev_priv, false))intel_wait_for_vblank (dev_priv, crtc->pipe);@@ -6015,7 +6015,7 @@ static void intel_pre_plane_update(struct intel_crtc_state *old_crtc_state,* WaCxSRDisabledForSpriteScaling:ivb */ if (pipe_config->disable_lp_wm &&ilk_disable_lp_wm (dev) && - old_crtc_state->base.active) + old_crtc_state->hw.active)intel_wait_for_vblank (dev_priv, crtc->pipe);/* @@ -6310,7 +6310,7 @@ static void intel_encoders_update_pipe(struct intel_crtc *crtc,static void intel_disable_primary_plane (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_plane *plane =to_intel_plane (crtc->base.primary); plane->disable_plane (plane, crtc_state);@@ -6319,7 +6319,7 @@ static void intel_disable_primary_plane(const struct intel_crtc_state *crtc_statstatic void ironlake_crtc_enable (struct intel_crtc_state *pipe_config,struct intel_atomic_state *state) { -struct drm_crtc *crtc = pipe_config->base.crtc; +struct drm_crtc *crtc = pipe_config->uapi.crtc;struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);@@ -6453,7 +6453,7 @@ static void icl_pipe_mbus_enable(struct intel_crtc *crtc)static void haswell_crtc_enable (struct intel_crtc_state *pipe_config,struct intel_atomic_state *state) { -struct drm_crtc *crtc = pipe_config->base.crtc; +struct drm_crtc *crtc = pipe_config->uapi.crtc;struct drm_i915_private *dev_priv =to_i915 (crtc->dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);enum pipe pipe = intel_crtc->pipe, hsw_workaround_pipe;@@ -6562,7 +6562,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config,static void ironlake_pfit_disable (const struct intel_crtc_state *old_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -6578,7 +6578,7 @@ static void ironlake_pfit_disable(const struct intel_crtc_state *old_crtc_state)static void ironlake_crtc_disable (struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *state) { -struct drm_crtc *crtc = old_crtc_state->base.crtc; +struct drm_crtc *crtc = old_crtc_state->uapi.crtc;struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);@@ -6637,7 +6637,7 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,static void haswell_crtc_disable (struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *state) { -struct drm_crtc *crtc = old_crtc_state->base.crtc; +struct drm_crtc *crtc = old_crtc_state->uapi.crtc;struct drm_i915_private *dev_priv =to_i915 (crtc->dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;@@ -6671,7 +6671,7 @@ static void haswell_crtc_disable(struct intel_crtc_state *old_crtc_state,static void i9xx_pfit_enable (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (!crtc_state->gmch_pfit.control)@@ -6801,14 +6801,14 @@ intel_aux_power_domain(struct intel_digital_port *dig_port)static u64 get_crtc_power_domains (struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct drm_encoder *encoder;enum pipe pipe = crtc->pipe;u64 mask;enum transcoder transcoder = crtc_state->cpu_transcoder; -if (!crtc_state->base.active) +if (!crtc_state->hw.active)return 0 ; mask =BIT_ULL (POWER_DOMAIN_PIPE (pipe));@@ -6818,7 +6818,7 @@ static u64 get_crtc_power_domains(struct intel_crtc_state *crtc_state) mask |=BIT_ULL (POWER_DOMAIN_PIPE_PANEL_FITTER (pipe));drm_for_each_encoder_mask (encoder, &dev_priv->drm, - crtc_state->base.encoder_mask) { + crtc_state->uapi.encoder_mask) {struct intel_encoder *intel_encoder =to_intel_encoder (encoder); mask |=BIT_ULL (intel_encoder->power_domain);@@ -6836,7 +6836,7 @@ static u64 get_crtc_power_domains(struct intel_crtc_state *crtc_state)static u64 modeset_get_crtc_power_domains (struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum intel_display_power_domain domain;u64 domains, new_domains, old_domains;@@ -6865,7 +6865,7 @@ static void modeset_put_power_domains(struct drm_i915_private *dev_priv,static void valleyview_crtc_enable (struct intel_crtc_state *pipe_config,struct intel_atomic_state *state) { -struct drm_crtc *crtc = pipe_config->base.crtc; +struct drm_crtc *crtc = pipe_config->uapi.crtc;struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);@@ -6921,7 +6921,7 @@ static void valleyview_crtc_enable(struct intel_crtc_state *pipe_config,static void i9xx_set_pll_dividers (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);I915_WRITE (FP0 (crtc->pipe), crtc_state->dpll_hw_state.fp0);@@ -6931,7 +6931,7 @@ static void i9xx_set_pll_dividers(const struct intel_crtc_state *crtc_state)static void i9xx_crtc_enable (struct intel_crtc_state *pipe_config,struct intel_atomic_state *state) { -struct drm_crtc *crtc = pipe_config->base.crtc; +struct drm_crtc *crtc = pipe_config->uapi.crtc;struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);@@ -6981,7 +6981,7 @@ static void i9xx_crtc_enable(struct intel_crtc_state *pipe_config,static void i9xx_pfit_disable (const struct intel_crtc_state *old_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);if (!old_crtc_state->gmch_pfit.control)@@ -6997,7 +6997,7 @@ static void i9xx_pfit_disable(const struct intel_crtc_state *old_crtc_state)static void i9xx_crtc_disable (struct intel_crtc_state *old_crtc_state,struct intel_atomic_state *state) { -struct drm_crtc *crtc = old_crtc_state->base.crtc; +struct drm_crtc *crtc = old_crtc_state->uapi.crtc;struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc);@@ -7165,8 +7165,8 @@ static void intel_connector_verify_state(struct intel_crtc_state *crtc_state,if (!crtc_state)return ; -I915_STATE_WARN (!crtc_state->base.active, -"connector is active, but attached crtc isn't\n" ); +I915_STATE_WARN (!crtc_state->hw.active, +"connector is active, but attached crtc isn't\n" );if (!encoder || encoder->type ==INTEL_OUTPUT_DP_MST )return ;@@ -7177,8 +7177,8 @@ static void intel_connector_verify_state(struct intel_crtc_state *crtc_state,I915_STATE_WARN (conn_state->crtc != encoder->base.crtc,"attached encoder crtc differs from connector crtc\n" ); }else { -I915_STATE_WARN (crtc_state && crtc_state->base.active, -"attached crtc is active, but connector isn't\n" ); +I915_STATE_WARN (crtc_state && crtc_state->hw.active, +"attached crtc is active, but connector isn't\n" );I915_STATE_WARN (!crtc_state && conn_state->best_encoder,"best encoder set without crtc!\n" ); }@@ -7186,7 +7186,7 @@ static void intel_connector_verify_state(struct intel_crtc_state *crtc_state,static int pipe_required_fdi_lanes (struct intel_crtc_state *crtc_state) { -if (crtc_state->base.enable && crtc_state->has_pch_encoder) +if (crtc_state->hw.enable && crtc_state->has_pch_encoder)return crtc_state->fdi_lanes;return 0 ;@@ -7196,7 +7196,7 @@ static int ironlake_check_fdi_lanes(struct drm_device *dev, enum pipe pipe, struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct drm_atomic_state *state = pipe_config->base.state; +struct drm_atomic_state *state = pipe_config->uapi.state;struct intel_crtc *other_crtc;struct intel_crtc_state *other_crtc_state;@@ -7269,7 +7269,7 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc, struct intel_crtc_state *pipe_config) {struct drm_device *dev = intel_crtc->base.dev; -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;int lane, link_bw, fdi_dotclock, ret;bool needs_recompute = false;@@ -7315,7 +7315,7 @@ static int ironlake_fdi_compute_config(struct intel_crtc *intel_crtc,bool hsw_crtc_state_ips_capable (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);/* IPS only exists on ULT machines and is tied to pipe A. */ @@ -7345,9 +7345,9 @@ bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state)static bool hsw_compute_ips_config (struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv = -to_i915 (crtc_state->base.crtc->dev); +to_i915 (crtc_state->uapi.crtc->dev);struct intel_atomic_state *intel_state = -to_intel_atomic_state (crtc_state->base.state); +to_intel_atomic_state (crtc_state->uapi.state);if (!hsw_crtc_state_ips_capable (crtc_state))return false;@@ -7386,7 +7386,7 @@ static u32 ilk_pipe_pixel_rate(const struct intel_crtc_state *pipe_config) {u32 pixel_rate; - pixel_rate = pipe_config->base.adjusted_mode.crtc_clock; + pixel_rate = pipe_config->hw.adjusted_mode.crtc_clock;/* * We only use IF-ID interlacing. If we ever use @@ -7419,12 +7419,12 @@ static u32 ilk_pipe_pixel_rate(const struct intel_crtc_state *pipe_config)static void intel_crtc_compute_pixel_rate (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);if (HAS_GMCH (dev_priv))/* FIXME calculate proper pipe pixel rate for GMCH pfit */ crtc_state->pixel_rate = - crtc_state->base.adjusted_mode.crtc_clock; + crtc_state->hw.adjusted_mode.crtc_clock;else crtc_state->pixel_rate =ilk_pipe_pixel_rate (crtc_state);@@ -7434,7 +7434,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;int clock_limit = dev_priv->max_dotclk_freq;if (INTEL_GEN (dev_priv) <4 ) {@@ -7460,7 +7460,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,if ((pipe_config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR420 || pipe_config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR444 ) && - pipe_config->base.ctm) { + pipe_config->hw.ctm) {/* * There is only one pipe CSC unit per pipe, and we need that * for output conversion from RGB->YCBCR. So if CTM is already @@ -7629,7 +7629,7 @@ static void vlv_pllb_recal_opamp(struct drm_i915_private *dev_priv, enum pipestatic void intel_pch_transcoder_set_m_n (const struct intel_crtc_state *crtc_state,const struct intel_link_m_n *m_n) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -7656,7 +7656,7 @@ static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_staconst struct intel_link_m_n *m_n, const struct intel_link_m_n *m2_n2) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;enum transcoder transcoder = crtc_state->cpu_transcoder;@@ -7969,7 +7969,7 @@ int vlv_force_pll_on(struct drm_i915_private *dev_priv, enum pipe pipe,if (!pipe_config)return -ENOMEM ; - pipe_config->base.crtc = &crtc->base; + pipe_config->uapi.crtc = &crtc->base; pipe_config->pixel_multiplier =1 ; pipe_config->dpll = *dpll;@@ -8129,11 +8129,11 @@ static void i8xx_compute_dpll(struct intel_crtc *crtc,static void intel_set_pipe_timings (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; -const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;u32 crtc_vtotal, crtc_vblank_end;int vsyncshift =0 ;@@ -8191,7 +8191,7 @@ static void intel_set_pipe_timings(const struct intel_crtc_state *crtc_state)static void intel_set_pipe_src_size (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;@@ -8212,39 +8212,39 @@ static void intel_get_pipe_timings(struct intel_crtc *crtc,u32 tmp; tmp =I915_READ (HTOTAL (cpu_transcoder)); - pipe_config->base.adjusted_mode.crtc_hdisplay = (tmp &0xffff ) +1 ; - pipe_config->base.adjusted_mode.crtc_htotal = ((tmp >>16 ) &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_hdisplay = (tmp &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_htotal = ((tmp >>16 ) &0xffff ) +1 ;if (!transcoder_is_dsi (cpu_transcoder)) { tmp =I915_READ (HBLANK (cpu_transcoder)); - pipe_config->base.adjusted_mode.crtc_hblank_start = + pipe_config->hw.adjusted_mode.crtc_hblank_start = (tmp &0xffff ) +1 ; - pipe_config->base.adjusted_mode.crtc_hblank_end = + pipe_config->hw.adjusted_mode.crtc_hblank_end = ((tmp >>16 ) &0xffff ) +1 ; } tmp =I915_READ (HSYNC (cpu_transcoder)); - pipe_config->base.adjusted_mode.crtc_hsync_start = (tmp &0xffff ) +1 ; - pipe_config->base.adjusted_mode.crtc_hsync_end = ((tmp >>16 ) &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_hsync_start = (tmp &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_hsync_end = ((tmp >>16 ) &0xffff ) +1 ; tmp =I915_READ (VTOTAL (cpu_transcoder)); - pipe_config->base.adjusted_mode.crtc_vdisplay = (tmp &0xffff ) +1 ; - pipe_config->base.adjusted_mode.crtc_vtotal = ((tmp >>16 ) &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_vdisplay = (tmp &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_vtotal = ((tmp >>16 ) &0xffff ) +1 ;if (!transcoder_is_dsi (cpu_transcoder)) { tmp =I915_READ (VBLANK (cpu_transcoder)); - pipe_config->base.adjusted_mode.crtc_vblank_start = + pipe_config->hw.adjusted_mode.crtc_vblank_start = (tmp &0xffff ) +1 ; - pipe_config->base.adjusted_mode.crtc_vblank_end = + pipe_config->hw.adjusted_mode.crtc_vblank_end = ((tmp >>16 ) &0xffff ) +1 ; } tmp =I915_READ (VSYNC (cpu_transcoder)); - pipe_config->base.adjusted_mode.crtc_vsync_start = (tmp &0xffff ) +1 ; - pipe_config->base.adjusted_mode.crtc_vsync_end = ((tmp >>16 ) &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_vsync_start = (tmp &0xffff ) +1 ; + pipe_config->hw.adjusted_mode.crtc_vsync_end = ((tmp >>16 ) &0xffff ) +1 ;if (I915_READ (PIPECONF (cpu_transcoder)) &PIPECONF_INTERLACE_MASK ) { - pipe_config->base.adjusted_mode.flags |=DRM_MODE_FLAG_INTERLACE ; - pipe_config->base.adjusted_mode.crtc_vtotal +=1 ; - pipe_config->base.adjusted_mode.crtc_vblank_end +=1 ; + pipe_config->hw.adjusted_mode.flags |=DRM_MODE_FLAG_INTERLACE ; + pipe_config->hw.adjusted_mode.crtc_vtotal +=1 ; + pipe_config->hw.adjusted_mode.crtc_vblank_end +=1 ; } }@@ -8259,27 +8259,27 @@ static void intel_get_pipe_src_size(struct intel_crtc *crtc, pipe_config->pipe_src_h = (tmp &0xffff ) +1 ; pipe_config->pipe_src_w = ((tmp >>16 ) &0xffff ) +1 ; - pipe_config->base.mode.vdisplay = pipe_config->pipe_src_h; - pipe_config->base.mode.hdisplay = pipe_config->pipe_src_w; + pipe_config->hw.mode.vdisplay = pipe_config->pipe_src_h; + pipe_config->hw.mode.hdisplay = pipe_config->pipe_src_w; }void intel_mode_from_pipe_config (struct drm_display_mode *mode,struct intel_crtc_state *pipe_config) { - mode->hdisplay = pipe_config->base.adjusted_mode.crtc_hdisplay; - mode->htotal = pipe_config->base.adjusted_mode.crtc_htotal; - mode->hsync_start = pipe_config->base.adjusted_mode.crtc_hsync_start; - mode->hsync_end = pipe_config->base.adjusted_mode.crtc_hsync_end; + mode->hdisplay = pipe_config->hw.adjusted_mode.crtc_hdisplay; + mode->htotal = pipe_config->hw.adjusted_mode.crtc_htotal; + mode->hsync_start = pipe_config->hw.adjusted_mode.crtc_hsync_start; + mode->hsync_end = pipe_config->hw.adjusted_mode.crtc_hsync_end; - mode->vdisplay = pipe_config->base.adjusted_mode.crtc_vdisplay; - mode->vtotal = pipe_config->base.adjusted_mode.crtc_vtotal; - mode->vsync_start = pipe_config->base.adjusted_mode.crtc_vsync_start; - mode->vsync_end = pipe_config->base.adjusted_mode.crtc_vsync_end; + mode->vdisplay = pipe_config->hw.adjusted_mode.crtc_vdisplay; + mode->vtotal = pipe_config->hw.adjusted_mode.crtc_vtotal; + mode->vsync_start = pipe_config->hw.adjusted_mode.crtc_vsync_start; + mode->vsync_end = pipe_config->hw.adjusted_mode.crtc_vsync_end; - mode->flags = pipe_config->base.adjusted_mode.flags; + mode->flags = pipe_config->hw.adjusted_mode.flags; mode->type =DRM_MODE_TYPE_DRIVER ; - mode->clock = pipe_config->base.adjusted_mode.crtc_clock; + mode->clock = pipe_config->hw.adjusted_mode.crtc_clock; mode->hsync =drm_mode_hsync (mode); mode->vrefresh =drm_mode_vrefresh (mode);@@ -8288,7 +8288,7 @@ void intel_mode_from_pipe_config(struct drm_display_mode *mode,static void i9xx_set_pipeconf (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 pipeconf;@@ -8325,7 +8325,7 @@ static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state) } } -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) { +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) {if (INTEL_GEN (dev_priv) <4 ||intel_crtc_has_type (crtc_state,INTEL_OUTPUT_SDVO )) pipeconf |=PIPECONF_INTERLACE_W_FIELD_INDICATION ;@@ -8757,7 +8757,7 @@ static void intel_get_crtc_ycbcr_config(struct intel_crtc *crtc,static void i9xx_get_pipe_color_config (struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_plane *plane =to_intel_plane (crtc->base.primary);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum i9xx_plane_id i9xx_plane = plane->i9xx_plane;@@ -8880,7 +8880,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,* but in case the pipe is enabled w/o any ports we need a sane * default. */ - pipe_config->base.adjusted_mode.crtc_clock = + pipe_config->hw.adjusted_mode.crtc_clock = pipe_config->port_clock / pipe_config->pixel_multiplier; ret = true;@@ -9395,7 +9395,7 @@ void intel_init_pch_refclk(struct drm_i915_private *dev_priv)static void ironlake_set_pipeconf (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;u32 val;@@ -9423,7 +9423,7 @@ static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state)if (crtc_state->dither) val |= (PIPECONF_DITHER_EN |PIPECONF_DITHER_TYPE_SP ); -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) val |=PIPECONF_INTERLACED_ILK ;else val |=PIPECONF_PROGRESSIVE ;@@ -9439,7 +9439,7 @@ static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state)static void haswell_set_pipeconf (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 val =0 ;@@ -9447,7 +9447,7 @@ static void haswell_set_pipeconf(const struct intel_crtc_state *crtc_state)if (IS_HASWELL (dev_priv) && crtc_state->dither) val |= (PIPECONF_DITHER_EN |PIPECONF_DITHER_TYPE_SP ); -if (crtc_state->base.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) +if (crtc_state->hw.adjusted_mode.flags &DRM_MODE_FLAG_INTERLACE ) val |=PIPECONF_INTERLACED_ILK ;else val |=PIPECONF_PROGRESSIVE ;@@ -9458,7 +9458,7 @@ static void haswell_set_pipeconf(const struct intel_crtc_state *crtc_state)static void bdw_set_pipemisc (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 val =0 ;@@ -9644,7 +9644,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc, {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_atomic_state *state = -to_intel_atomic_state (crtc_state->base.state); +to_intel_atomic_state (crtc_state->uapi.state);const struct intel_limit *limit;int refclk =120000 ;@@ -10060,7 +10060,7 @@ static int haswell_crtc_compute_clock(struct intel_crtc *crtc, {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_atomic_state *state = -to_intel_atomic_state (crtc_state->base.state); +to_intel_atomic_state (crtc_state->uapi.state);if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DSI ) ||INTEL_GEN (dev_priv) >=11 ) {@@ -10608,7 +10608,7 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state, } ret =drm_atomic_helper_check_plane_state (&plane_state->base, - &crtc_state->base, + &crtc_state->uapi,DRM_PLANE_HELPER_NO_SCALING ,DRM_PLANE_HELPER_NO_SCALING , true, true);@@ -10791,7 +10791,7 @@ i9xx_cursor_max_stride(struct intel_plane *plane,static u32 i9xx_cursor_ctl_crtc (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 cntl =0 ;@@ -11198,12 +11198,12 @@ int intel_get_load_detect_pipe(struct drm_connector *connector, goto fail; } - crtc_state->base.active = crtc_state->base.enable = true; + crtc_state->uapi.active = crtc_state->uapi.enable = true;if (!mode) mode = &load_detect_mode; - ret =drm_atomic_set_mode_for_crtc (&crtc_state->base, mode); + ret =drm_atomic_set_mode_for_crtc (&crtc_state->uapi, mode);if (ret) goto fail;@@ -11411,7 +11411,7 @@ static void ironlake_pch_clock_get(struct intel_crtc *crtc,* we may need some idea for the dotclock anyway. * Calculate one based on the FDI configuration. */ - pipe_config->base.adjusted_mode.crtc_clock = + pipe_config->hw.adjusted_mode.crtc_clock =intel_dotclock_calculate (intel_fdi_link_freq (dev_priv, pipe_config), &pipe_config->fdi_m_n); }@@ -11441,7 +11441,7 @@ intel_encoder_current_mode(struct intel_encoder *encoder)return NULL ; } - crtc_state->base.crtc = &crtc->base; + crtc_state->uapi.crtc = &crtc->base;if (!dev_priv->display.get_pipe_config (crtc, crtc_state)) {kfree (crtc_state);@@ -11512,12 +11512,12 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_statconst struct intel_plane_state *old_plane_state, struct intel_plane_state *plane_state) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct intel_plane *plane =to_intel_plane (plane_state->base.plane);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);bool mode_changed =needs_modeset (crtc_state); -bool was_crtc_enabled = old_crtc_state->base.active; -bool is_crtc_enabled = crtc_state->base.active; +bool was_crtc_enabled = old_crtc_state->hw.active; +bool is_crtc_enabled = crtc_state->hw.active;bool turn_off, turn_on, visible, was_visible;struct drm_framebuffer *fb = plane_state->base.fb;int ret;@@ -11692,9 +11692,9 @@ static int icl_add_linked_planes(struct intel_atomic_state *state)static int icl_check_nv12_planes (struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -struct intel_atomic_state *state =to_intel_atomic_state (crtc_state->base.state); +struct intel_atomic_state *state =to_intel_atomic_state (crtc_state->uapi.state);struct intel_plane *plane, *linked;struct intel_plane_state *plane_state;int i;@@ -11764,9 +11764,9 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)static bool c8_planes_changed (const struct intel_crtc_state *new_crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc);struct intel_atomic_state *state = -to_intel_atomic_state (new_crtc_state->base.state); +to_intel_atomic_state (new_crtc_state->uapi.state);const struct intel_crtc_state *old_crtc_state =intel_atomic_get_old_crtc_state (state, crtc);@@ -11784,10 +11784,10 @@ static int intel_crtc_atomic_check(struct drm_crtc *_crtc,bool mode_changed =needs_modeset (crtc_state);if (INTEL_GEN (dev_priv) <5 && !IS_G4X (dev_priv) && - mode_changed && !crtc_state->base.active) + mode_changed && !crtc_state->hw.active) crtc_state->update_wm_post = true; -if (mode_changed && crtc_state->base.enable && +if (mode_changed && crtc_state->hw.enable && dev_priv->display.crtc_compute_clock && !WARN_ON (crtc_state->shared_dpll)) { ret = dev_priv->display.crtc_compute_clock (crtc, crtc_state);@@ -11800,10 +11800,10 @@ static int intel_crtc_atomic_check(struct drm_crtc *_crtc,* when C8 planes are getting enabled/disabled. */ if (c8_planes_changed (crtc_state)) - crtc_state->base.color_mgmt_changed = true; + crtc_state->uapi.color_mgmt_changed = true;if (mode_changed || crtc_state->update_pipe || - crtc_state->base.color_mgmt_changed) { + crtc_state->uapi.color_mgmt_changed) { ret =intel_color_check (crtc_state);if (ret)return ret;@@ -11925,7 +11925,7 @@ compute_baseline_pipe_bpp(struct intel_crtc *crtc, struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -struct drm_atomic_state *state = pipe_config->base.state; +struct drm_atomic_state *state = pipe_config->uapi.state;struct drm_connector *connector;struct drm_connector_state *connector_state;int bpp, i;@@ -12078,7 +12078,7 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config,struct intel_atomic_state *state, const char *context) { - struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);const struct intel_plane_state *plane_state;struct intel_plane *plane;@@ -12087,14 +12087,14 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config,DRM_DEBUG_KMS ("[CRTC:%d:%s] enable: %s %s\n" , crtc->base.base.id, crtc->base.name, -yesno (pipe_config->base.enable), context); +yesno (pipe_config->hw.enable), context); -if (!pipe_config->base.enable) +if (!pipe_config->hw.enable) goto dump_planes;snprintf_output_types (buf,sizeof (buf), pipe_config->output_types);DRM_DEBUG_KMS ("active: %s, output_types: %s (0x%x), output format: %s\n" , -yesno (pipe_config->base.active), +yesno (pipe_config->hw.active), buf, pipe_config->output_types,output_formats (pipe_config->output_format));@@ -12134,10 +12134,10 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config,intel_dump_infoframe (dev_priv, &pipe_config->infoframes.hdmi);DRM_DEBUG_KMS ("requested mode:\n" ); -drm_mode_debug_printmodeline (&pipe_config->base.mode); +drm_mode_debug_printmodeline (&pipe_config->hw.mode);DRM_DEBUG_KMS ("adjusted mode:\n" ); -drm_mode_debug_printmodeline (&pipe_config->base.adjusted_mode); -intel_dump_crtc_timings (&pipe_config->base.adjusted_mode); +drm_mode_debug_printmodeline (&pipe_config->hw.adjusted_mode); +intel_dump_crtc_timings (&pipe_config->hw.adjusted_mode); DRM_DEBUG_KMS("port clock: %d, pipe src size: %dx%d, pixel rate %d\n", pipe_config->port_clock, pipe_config->pipe_src_w, pipe_config->pipe_src_h,@@ -12255,7 +12255,7 @@ static int clear_intel_crtc_state(struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv = -to_i915 (crtc_state->base.crtc->dev); +to_i915 (crtc_state->uapi.crtc->dev);struct intel_crtc_state *saved_state; saved_state =kzalloc (sizeof (*saved_state),GFP_KERNEL );@@ -12278,9 +12278,10 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) saved_state->wm = crtc_state->wm;/* Keep base drm_crtc_state intact, only clear our extended struct */ -BUILD_BUG_ON (offsetof(struct intel_crtc_state , base)); -memcpy (&crtc_state->base +1 , &saved_state->base +1 , -sizeof (*crtc_state) -sizeof (crtc_state->base)); +BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); +BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw)); +memcpy (&crtc_state->uapi +1 , &saved_state->uapi +1 , +sizeof (*crtc_state) -sizeof (crtc_state->uapi));kfree (saved_state);return 0 ;@@ -12289,8 +12290,8 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)static int intel_modeset_pipe_config (struct intel_crtc_state *pipe_config) { -struct drm_crtc *crtc = pipe_config->base.crtc; -struct drm_atomic_state *state = pipe_config->base.state; +struct drm_crtc *crtc = pipe_config->uapi.crtc; +struct drm_atomic_state *state = pipe_config->uapi.state;struct intel_encoder *encoder;struct drm_connector *connector;struct drm_connector_state *connector_state;@@ -12310,13 +12311,13 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)* positive or negative polarity is requested, treat this as meaning * negative polarity. */ -if (!(pipe_config->base.adjusted_mode.flags & +if (!(pipe_config->hw.adjusted_mode.flags & (DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_NHSYNC ))) - pipe_config->base.adjusted_mode.flags |=DRM_MODE_FLAG_NHSYNC ; + pipe_config->hw.adjusted_mode.flags |=DRM_MODE_FLAG_NHSYNC ; -if (!(pipe_config->base.adjusted_mode.flags & +if (!(pipe_config->hw.adjusted_mode.flags & (DRM_MODE_FLAG_PVSYNC |DRM_MODE_FLAG_NVSYNC ))) - pipe_config->base.adjusted_mode.flags |=DRM_MODE_FLAG_NVSYNC ; + pipe_config->hw.adjusted_mode.flags |=DRM_MODE_FLAG_NVSYNC ; ret =compute_baseline_pipe_bpp (to_intel_crtc (crtc), pipe_config);@@ -12333,7 +12334,7 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)* computation to clearly distinguish it from the adjusted mode, which * can be changed by the connectors in the below retry loop. */ -drm_mode_get_hv_timing (&pipe_config->base.mode, +drm_mode_get_hv_timing (&pipe_config->hw.mode, &pipe_config->pipe_src_w, &pipe_config->pipe_src_h);@@ -12366,7 +12367,7 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config) pipe_config->pixel_multiplier =1 ;/* Fill in default crtc timings, allow encoders to overwrite them. */ -drm_mode_set_crtcinfo (&pipe_config->base.adjusted_mode, +drm_mode_set_crtcinfo (&pipe_config->hw.adjusted_mode,CRTC_STEREO_DOUBLE );/* Pass our mode to the connectors and the CRTC to give them a chance to @@ -12391,7 +12392,7 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)/* Set default port clock if not overwritten by the encoder. Needs to be * done afterwards in case the encoder adjusts the mode. */ if (!pipe_config->port_clock) - pipe_config->port_clock = pipe_config->base.adjusted_mode.crtc_clock + pipe_config->port_clock = pipe_config->hw.adjusted_mode.crtc_clock * pipe_config->pixel_multiplier; ret =intel_crtc_compute_config (to_intel_crtc (crtc), pipe_config);@@ -12555,12 +12556,12 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, const struct intel_crtc_state *pipe_config, bool fastset) { -struct drm_i915_private *dev_priv =to_i915 (current_config->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (current_config->uapi.crtc->dev);bool ret = true;u32 bp_gamma =0 ;bool fixup_inherited = fastset && - (current_config->base.mode.private_flags &I915_MODE_FLAG_INHERITED ) && - !(pipe_config->base.mode.private_flags &I915_MODE_FLAG_INHERITED ); + (current_config->hw.mode.private_flags &I915_MODE_FLAG_INHERITED ) && + !(pipe_config->hw.mode.private_flags &I915_MODE_FLAG_INHERITED );if (fixup_inherited && !fastboot_enabled (dev_priv)) {DRM_DEBUG_KMS ("initial modeset and fastboot not set\n" );@@ -12749,19 +12750,19 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_X (output_types); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hdisplay); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_htotal); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hblank_start); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hblank_end); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hsync_start); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_hsync_end); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hdisplay); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_htotal); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hblank_start); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hblank_end); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hsync_start); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_hsync_end); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vdisplay); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vtotal); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vblank_start); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vblank_end); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vsync_start); -PIPE_CONF_CHECK_I (base.adjusted_mode.crtc_vsync_end); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vdisplay); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vtotal); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vblank_start); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vblank_end); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vsync_start); +PIPE_CONF_CHECK_I (hw.adjusted_mode.crtc_vsync_end);PIPE_CONF_CHECK_I (pixel_multiplier);PIPE_CONF_CHECK_I (output_format);@@ -12777,17 +12778,17 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_BOOL_INCOMPLETE (has_audio); -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_INTERLACE );if (!PIPE_CONF_QUIRK (PIPE_CONFIG_QUIRK_MODE_SYNC_FLAGS )) { -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_PHSYNC ); -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_NHSYNC ); -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_PVSYNC ); -PIPE_CONF_CHECK_FLAGS (base.adjusted_mode.flags, +PIPE_CONF_CHECK_FLAGS (hw.adjusted_mode.flags,DRM_MODE_FLAG_NVSYNC ); }@@ -12826,7 +12827,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, bp_gamma =intel_color_get_gamma_bit_precision (pipe_config);if (bp_gamma) -PIPE_CONF_CHECK_COLOR_LUT (gamma_mode, base.gamma_lut, bp_gamma); +PIPE_CONF_CHECK_COLOR_LUT (gamma_mode, uapi.gamma_lut, bp_gamma); }@@ -12871,7 +12872,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,if (IS_G4X (dev_priv) ||INTEL_GEN (dev_priv) >=5 )PIPE_CONF_CHECK_I (pipe_bpp); -PIPE_CONF_CHECK_CLOCK_FUZZY (base.adjusted_mode.crtc_clock); +PIPE_CONF_CHECK_CLOCK_FUZZY (hw.adjusted_mode.crtc_clock);PIPE_CONF_CHECK_CLOCK_FUZZY (port_clock);PIPE_CONF_CHECK_I (min_voltage_level);@@ -12902,7 +12903,7 @@ static void intel_pipe_config_sanity_check(struct drm_i915_private *dev_priv,if (pipe_config->has_pch_encoder) {int fdi_dotclock =intel_dotclock_calculate (intel_fdi_link_freq (dev_priv, pipe_config), &pipe_config->fdi_m_n); -int dotclock = pipe_config->base.adjusted_mode.crtc_clock; +int dotclock = pipe_config->hw.adjusted_mode.crtc_clock;/* * FDI already provided one idea for the dotclock. @@ -12930,7 +12931,7 @@ static void verify_wm_state(struct intel_crtc *crtc,const enum pipe pipe = crtc->pipe;int plane, level, max_level =ilk_wm_max_level (dev_priv); -if (INTEL_GEN (dev_priv) <9 || !new_crtc_state->base.active) +if (INTEL_GEN (dev_priv) <9 || !new_crtc_state->hw.active)return ; hw =kzalloc (sizeof (*hw),GFP_KERNEL );@@ -13139,12 +13140,12 @@ verify_crtc_state(struct intel_crtc *crtc,struct drm_atomic_state *state;bool active; - state = old_crtc_state->base.state; -__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->base); + state = old_crtc_state->uapi.state; +__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->uapi); pipe_config = old_crtc_state;memset (pipe_config,0 ,sizeof (*pipe_config)); - pipe_config->base.crtc = &crtc->base; - pipe_config->base.state = state; + pipe_config->uapi.crtc = &crtc->base; + pipe_config->uapi.state = state;DRM_DEBUG_KMS ("[CRTC:%d:%s]\n" , crtc->base.base.id, crtc->base.name);@@ -13152,23 +13153,26 @@ verify_crtc_state(struct intel_crtc *crtc,/* we keep both pipes enabled on 830 */ if (IS_I830 (dev_priv)) - active = new_crtc_state->base.active; + active = new_crtc_state->hw.active; -I915_STATE_WARN (new_crtc_state->base.active != active, -"crtc active state doesn't match with hw state " -"(expected %i, found %i)\n" , new_crtc_state->base.active, active); +I915_STATE_WARN (new_crtc_state->hw.active != active, +"crtc active state doesn't match with hw state " +"(expected %i, found %i)\n" , + new_crtc_state->hw.active, active); -I915_STATE_WARN (crtc->active != new_crtc_state->base.active, -"transitional active state does not match atomic hw state " -"(expected %i, found %i)\n" , new_crtc_state->base.active, crtc->active); +I915_STATE_WARN (crtc->active != new_crtc_state->hw.active, +"transitional active state does not match atomic hw state " +"(expected %i, found %i)\n" , + new_crtc_state->hw.active, crtc->active);for_each_encoder_on_crtc (dev, &crtc->base, encoder) {enum pipe pipe; active = encoder->get_hw_state (encoder, &pipe); -I915_STATE_WARN (active != new_crtc_state->base.active, -"[ENCODER:%i] active %i with crtc active %i\n" , - encoder->base.base.id, active, new_crtc_state->base.active); +I915_STATE_WARN (active != new_crtc_state->hw.active, +"[ENCODER:%i] active %i with crtc active %i\n" , + encoder->base.base.id, active, + new_crtc_state->hw.active); I915_STATE_WARN(active && crtc->pipe != pipe, "Encoder connected to wrong pipe %c\n",@@ -13180,7 +13184,7 @@ verify_crtc_state(struct intel_crtc *crtc,intel_crtc_compute_pixel_rate (pipe_config); -if (!new_crtc_state->base.active) +if (!new_crtc_state->hw.active)return ;intel_pipe_config_sanity_check (dev_priv, pipe_config);@@ -13242,7 +13246,7 @@ verify_single_dpll_state(struct drm_i915_private *dev_priv, crtc_mask =drm_crtc_mask (&crtc->base); -if (new_crtc_state->base.active) +if (new_crtc_state->hw.active)I915_STATE_WARN (!(pll->active_mask & crtc_mask),"pll active mismatch (expected pipe %c in active mask 0x%02x)\n" ,pipe_name (drm_crtc_index (&crtc->base)), pll->active_mask);@@ -13320,7 +13324,7 @@ intel_modeset_verify_disabled(struct drm_i915_private *dev_priv,static void update_scanline_offset (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);/* @@ -13351,7 +13355,7 @@ static void update_scanline_offset(const struct intel_crtc_state *crtc_state)* answer that's slightly in the future. */ if (IS_GEN (dev_priv,2 )) { -const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; +const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;int vtotal; vtotal = adjusted_mode->crtc_vtotal;@@ -13401,7 +13405,7 @@ static int haswell_mode_set_planes_workaround(struct intel_atomic_state *state)/* look at all crtc's that are going to be enabled in during modeset */ for_each_new_intel_crtc_in_state (state, crtc, crtc_state, i) { -if (!crtc_state->base.active || +if (!crtc_state->hw.active || !needs_modeset (crtc_state))continue ;@@ -13426,7 +13430,7 @@ static int haswell_mode_set_planes_workaround(struct intel_atomic_state *state) crtc_state->hsw_workaround_pipe =INVALID_PIPE ; -if (!crtc_state->base.active || +if (!crtc_state->hw.active ||needs_modeset (crtc_state))continue ;@@ -13469,12 +13473,12 @@ static int intel_modeset_checks(struct intel_atomic_state *state)for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (new_crtc_state->base.active) +if (new_crtc_state->hw.active) state->active_pipes |=BIT (crtc->pipe);else state->active_pipes &= ~BIT (crtc->pipe); -if (old_crtc_state->base.active != new_crtc_state->base.active) +if (old_crtc_state->hw.active != new_crtc_state->hw.active) state->active_pipe_changes |=BIT (crtc->pipe); }@@ -13513,7 +13517,7 @@ static void intel_crtc_check_fastset(const struct intel_crtc_state *old_crtc_staif (!intel_pipe_config_compare (old_crtc_state, new_crtc_state, true))return ; - new_crtc_state->base.mode_changed = false; + new_crtc_state->uapi.mode_changed = false; new_crtc_state->update_pipe = true;/* @@ -13548,9 +13552,9 @@ static int intel_atomic_check(struct drm_device *dev,/* Catch I915_MODE_FLAG_INHERITED */ for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (new_crtc_state->base.mode.private_flags != - old_crtc_state->base.mode.private_flags) - new_crtc_state->base.mode_changed = true; +if (new_crtc_state->hw.mode.private_flags != + old_crtc_state->hw.mode.private_flags) + new_crtc_state->uapi.mode_changed = true; } ret =drm_atomic_helper_check_modeset (dev, &state->base);@@ -13562,7 +13566,7 @@ static int intel_atomic_check(struct drm_device *dev,if (!needs_modeset (new_crtc_state))continue ; -if (!new_crtc_state->base.enable) { +if (!new_crtc_state->uapi.enable) { any_ms = true;continue ; }@@ -13719,11 +13723,10 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state,intel_check_pch_fifo_underruns (dev_priv);/* FIXME unify this for all platforms */ -if (!new_crtc_state->base.active && +if (!new_crtc_state->hw.active && !HAS_GMCH (dev_priv) && dev_priv->display.initial_watermarks) - dev_priv->display.initial_watermarks (state, - new_crtc_state); + dev_priv->display.initial_watermarks (state, new_crtc_state); }static void intel_commit_modeset_disables (struct intel_atomic_state *state)@@ -13746,7 +13749,7 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)intel_pre_plane_update (old_crtc_state, new_crtc_state); -if (old_crtc_state->base.active) +if (old_crtc_state->hw.active) intel_old_crtc_state_disables(state, old_crtc_state, new_crtc_state,@@ -13761,7 +13764,7 @@ static void intel_commit_modeset_enables(struct intel_atomic_state *state)int i;for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { -if (!new_crtc_state->base.active) +if (!new_crtc_state->hw.active)continue ; intel_update_crtc(crtc, state, old_crtc_state,@@ -13784,7 +13787,7 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)for_each_oldnew_intel_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i)/* ignore allocations for crtc's that have been turned off. */ -if (new_crtc_state->base.active) +if (new_crtc_state->hw.active) entries[i] = old_crtc_state->wm.skl.ddb;/* If 2nd DBuf slice required, enable it here */ @@ -13806,7 +13809,7 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state) pipe = crtc->pipe; -if (updated & cmask || !new_crtc_state->base.active) +if (updated & cmask || !new_crtc_state->hw.active)continue ; if (skl_ddb_allocation_overlaps(&new_crtc_state->wm.skl.ddb,@@ -13825,7 +13828,7 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)*/ if (!skl_ddb_entry_equal (&new_crtc_state->wm.skl.ddb, &old_crtc_state->wm.skl.ddb) && - !new_crtc_state->base.active_changed && + !new_crtc_state->uapi.active_changed && state->wm_results.dirty_pipes != updated) vbl_wait = true;@@ -13958,12 +13961,13 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)bool modeset =needs_modeset (new_crtc_state);/* Complete events for now disable pipes here. */ -if (modeset && !new_crtc_state->base.active && new_crtc_state->base.event) { +if (modeset && !new_crtc_state->hw.active && new_crtc_state->uapi.event) {spin_lock_irq (&dev->event_lock); -drm_crtc_send_vblank_event (&crtc->base, new_crtc_state->base.event); +drm_crtc_send_vblank_event (&crtc->base, + new_crtc_state->uapi.event);spin_unlock_irq (&dev->event_lock); - new_crtc_state->base.event =NULL ; + new_crtc_state->uapi.event =NULL ; } }@@ -13994,9 +13998,9 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)drm_atomic_helper_wait_for_flip_done (dev, &state->base);for_each_new_intel_crtc_in_state (state, crtc, new_crtc_state, i) { -if (new_crtc_state->base.active && +if (new_crtc_state->hw.active && !needs_modeset (new_crtc_state) && - (new_crtc_state->base.color_mgmt_changed || + (new_crtc_state->uapi.color_mgmt_changed || new_crtc_state->update_pipe))intel_color_load_luts (new_crtc_state); }@@ -14451,16 +14455,16 @@ int skl_max_scale(const struct intel_crtc_state *crtc_state, const struct drm_format_info *format) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);int max_scale;int crtc_clock, max_dotclk, tmpclk1, tmpclk2; -if (!crtc_state->base.enable) +if (!crtc_state->hw.enable)return DRM_PLANE_HELPER_NO_SCALING ; - crtc_clock = crtc_state->base.adjusted_mode.crtc_clock; - max_dotclk =to_intel_atomic_state (crtc_state->base.state)->cdclk.logical.cdclk; + crtc_clock = crtc_state->hw.adjusted_mode.crtc_clock; + max_dotclk =to_intel_atomic_state (crtc_state->uapi.state)->cdclk.logical.cdclk;if (IS_GEMINILAKE (dev_priv) ||INTEL_GEN (dev_priv) >=10 ) max_dotclk *=2 ;@@ -14501,7 +14505,7 @@ static void intel_begin_crtc_commit(struct intel_atomic_state *state,if (modeset) goto out; -if (new_crtc_state->base.color_mgmt_changed || +if (new_crtc_state->uapi.color_mgmt_changed || new_crtc_state->update_pipe)intel_color_commit (new_crtc_state);@@ -14547,7 +14551,7 @@ static void intel_finish_crtc_commit(struct intel_atomic_state *state,if (new_crtc_state->update_pipe && !needs_modeset (new_crtc_state) && - old_crtc_state->base.mode.private_flags &I915_MODE_FLAG_INHERITED ) + old_crtc_state->hw.mode.private_flags &I915_MODE_FLAG_INHERITED )intel_crtc_arm_fifo_underrun (crtc, new_crtc_state); }@@ -14659,7 +14663,7 @@ intel_legacy_cursor_update(struct drm_plane *plane,* When crtc is inactive or there is a modeset pending, * wait for it to complete in the slowpath */ -if (!crtc_state->base.active ||needs_modeset (crtc_state) || +if (!crtc_state->hw.active ||needs_modeset (crtc_state) || crtc_state->update_pipe) goto slow;@@ -14753,7 +14757,7 @@ intel_legacy_cursor_update(struct drm_plane *plane,mutex_unlock (&dev_priv->drm.struct_mutex); out_free:if (new_crtc_state) -intel_crtc_destroy_state (crtc, &new_crtc_state->base); +intel_crtc_destroy_state (crtc, &new_crtc_state->uapi);if (ret)intel_plane_destroy_state (plane, new_plane_state);else @@ -15079,7 +15083,7 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) ret = -ENOMEM ; goto fail; } -__drm_atomic_helper_crtc_reset (&intel_crtc->base, &crtc_state->base); +__drm_atomic_helper_crtc_reset (&intel_crtc->base, &crtc_state->uapi); intel_crtc->config = crtc_state; primary =intel_primary_plane_create (dev_priv, pipe);@@ -16455,7 +16459,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc, I915_READ(reg) & ~PIPECONF_FRAME_START_DELAY_MASK); } -if (crtc_state->base.active) { +if (crtc_state->hw.active) {struct intel_plane *plane;/* Disable everything but the primary plane */ @@ -16480,10 +16484,10 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc,/* Adjust the state of the output pipe according to whether we * have active connectors/encoders. */ -if (crtc_state->base.active && !intel_crtc_has_encoders (crtc)) +if (crtc_state->hw.active && !intel_crtc_has_encoders (crtc))intel_crtc_disable_noatomic (&crtc->base, ctx); -if (crtc_state->base.active ||HAS_GMCH (dev_priv)) { +if (crtc_state->hw.active ||HAS_GMCH (dev_priv)) {/* * We start out with underrun reporting disabled to avoid races. * For correct bookkeeping mark this on active crtcs. @@ -16514,7 +16518,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc,static bool has_bogus_dpll_config (const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);/* * Some SNB BIOSen (eg. ASUS K53SV) are known to misprogram @@ -16527,7 +16531,7 @@ static bool has_bogus_dpll_config(const struct intel_crtc_state *crtc_state)* road. */ return IS_GEN (dev_priv,6 ) && - crtc_state->base.active && + crtc_state->hw.active && crtc_state->shared_dpll && crtc_state->port_clock ==0 ; }@@ -16544,7 +16548,7 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)* encoder is active and trying to read from a pipe) and the * pipe itself being active. */ bool has_active_crtc = crtc_state && - crtc_state->base.active; + crtc_state->hw.active;if (crtc_state &&has_bogus_dpll_config (crtc_state)) { DRM_DEBUG_KMS("BIOS has misprogrammed the hardware. Disabling pipe %c\n",@@ -16681,22 +16685,22 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)struct intel_crtc_state *crtc_state =to_intel_crtc_state (crtc->base.state); -__drm_atomic_helper_crtc_destroy_state (&crtc_state->base); +__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi);memset (crtc_state,0 ,sizeof (*crtc_state)); -__drm_atomic_helper_crtc_reset (&crtc->base, &crtc_state->base); +__drm_atomic_helper_crtc_reset (&crtc->base, &crtc_state->uapi); - crtc_state->base.active = crtc_state->base.enable = + crtc_state->hw.active = crtc_state->hw.enable = dev_priv->display.get_pipe_config (crtc, crtc_state); - crtc->base.enabled = crtc_state->base.enable; - crtc->active = crtc_state->base.active; + crtc->base.enabled = crtc_state->hw.enable; + crtc->active = crtc_state->hw.active; -if (crtc_state->base.active) +if (crtc_state->hw.active) dev_priv->active_pipes |=BIT (crtc->pipe);DRM_DEBUG_KMS ("[CRTC:%d:%s] hw state readout: %s\n" , crtc->base.base.id, crtc->base.name, -enableddisabled (crtc_state->base.active)); +enableddisabled (crtc_state->hw.active)); }readout_plane_state (dev_priv);@@ -16718,7 +16722,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)struct intel_crtc_state *crtc_state =to_intel_crtc_state (crtc->base.state); -if (crtc_state->base.active && +if (crtc_state->hw.active && crtc_state->shared_dpll == pll) pll->state.crtc_mask |=1 << crtc->pipe; }@@ -16752,21 +16756,24 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)drm_connector_list_iter_begin (dev, &conn_iter);for_each_intel_connector_iter (connector, &conn_iter) {if (connector->get_hw_state (connector)) { - connector->base.dpms =DRM_MODE_DPMS_ON ; +struct intel_crtc_state *crtc_state =NULL ; + connector->base.dpms =DRM_MODE_DPMS_ON ; encoder = connector->encoder; connector->base.encoder = &encoder->base; -if (encoder->base.crtc && - encoder->base.crtc->state->active) { +if (encoder->base.crtc) + crtc_state =to_intel_crtc_state (encoder->base.crtc->state); + +if (crtc_state && crtc_state->hw.active) {/* * This has to be done during hardware readout * because anything calling .crtc_disable may * rely on the connector_mask being accurate. */ - encoder->base.crtc->state->connector_mask |= + crtc_state->uapi.connector_mask |=drm_connector_mask (&connector->base); - encoder->base.crtc->state->encoder_mask |= + crtc_state->uapi.encoder_mask |=drm_encoder_mask (&encoder->base); }@@ -16789,11 +16796,12 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)int min_cdclk =0 ;memset (&crtc->base.mode,0 ,sizeof (crtc->base.mode)); -if (crtc_state->base.active) { +if (crtc_state->hw.active) {intel_mode_from_pipe_config (&crtc->base.mode, crtc_state); crtc->base.mode.hdisplay = crtc_state->pipe_src_w; crtc->base.mode.vdisplay = crtc_state->pipe_src_h; -intel_mode_from_pipe_config (&crtc_state->base.adjusted_mode, crtc_state); +intel_mode_from_pipe_config (&crtc_state->hw.adjusted_mode, + crtc_state);WARN_ON (drm_atomic_set_mode_for_crtc (crtc->base.state, &crtc->base.mode));/* @@ -16805,7 +16813,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)* set a flag to indicate that a full recalculation is * needed on the next commit. */ - crtc_state->base.mode.private_flags =I915_MODE_FLAG_INHERITED ; + crtc_state->hw.mode.private_flags =I915_MODE_FLAG_INHERITED ;intel_crtc_compute_pixel_rate (crtc_state);@@ -16816,7 +16824,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) }drm_calc_timestamping_constants (&crtc->base, - &crtc_state->base.adjusted_mode); + &crtc_state->hw.adjusted_mode);update_scanline_offset (crtc_state); }@@ -16987,7 +16995,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev,drm_crtc_vblank_reset (&crtc->base); -if (crtc_state->base.active) +if (crtc_state->hw.active)intel_crtc_vblank_on (crtc_state); }drivers/gpu/drm/i915/display/intel_display_types.h +26
-2@@ -749,7 +749,31 @@ enum intel_output_format { };struct intel_crtc_state { -struct drm_crtc_state base; +union { +/* +* uapi (drm) state. This is the software state shown to userspace. +* In particular, the following members are used for bookkeeping: +* - crtc +* - state +* - *_changed +* - event +* - commit +* - mode_blob +*/ +struct drm_crtc_state uapi; + +/* +* actual hardware state, the state we program to the hardware. +* The following members are used to verify the hardware state: +* - enable +* - active +* - mode / adjusted_mode +* - color property blobs. +* +* During initial hw readout, they need to be copied to uapi. +*/ +struct drm_crtc_state hw; + };/** * quirks - bitfield with hw state readout quirks @@ -1091,7 +1115,7 @@ struct cxsr_latency {#define to_intel_atomic_state (x) container_of(x, struct intel_atomic_state, base)#define to_intel_crtc (x) container_of(x, struct intel_crtc, base) -#define to_intel_crtc_state (x) container_of(x, struct intel_crtc_state, base) +#define to_intel_crtc_state (x) container_of(x, struct intel_crtc_state, uapi)#define to_intel_connector (x) container_of(x, struct intel_connector, base)#define to_intel_encoder (x) container_of(x, struct intel_encoder, base)#define to_intel_framebuffer (x) container_of(x, struct intel_framebuffer, base)drivers/gpu/drm/i915/display/intel_dp.c +21
-21@@ -1966,7 +1966,7 @@ intel_dp_compute_link_config_wide(struct intel_dp *intel_dp,struct intel_crtc_state *pipe_config, const struct link_config_limits *limits) { - struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; + struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;int bpp, clock, lane_count;int mode_rate, link_clock, link_avail;@@ -2020,7 +2020,7 @@ static int intel_dp_dsc_compute_config(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); -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;u8 dsc_max_bpc;int pipe_bpp;int ret;@@ -2131,7 +2131,7 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; + struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct link_config_limits limits;int common_len;@@ -2219,8 +2219,8 @@ intel_dp_ycbcr420_config(struct intel_dp *intel_dp, {const struct drm_display_info *info = &connector->display_info;const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); + &crtc_state->hw.adjusted_mode; +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);int ret; if (!drm_mode_is_420_only(info, adjusted_mode) ||@@ -2248,7 +2248,7 @@ bool intel_dp_limited_color_range(const struct intel_crtc_state *crtc_state,const struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (conn_state);const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;if (intel_conn_state->broadcast_rgb ==INTEL_BROADCAST_RGB_AUTO ) {/* @@ -2271,11 +2271,11 @@ intel_dp_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct intel_lspcon *lspcon =enc_to_intel_lspcon (&encoder->base);enum port port = encoder->port; -struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (pipe_config->uapi.crtc);struct intel_connector *intel_connector = intel_dp->attached_connector;struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (conn_state);@@ -2395,8 +2395,8 @@ static void intel_dp_prepare(struct intel_encoder *encoder,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); -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc); +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode; intel_dp_set_link_params(intel_dp, pipe_config->port_clock, pipe_config->lane_count,@@ -2993,7 +2993,7 @@ static void assert_edp_pll(struct drm_i915_private *dev_priv, bool state)static void ironlake_edp_pll_on (struct intel_dp *intel_dp,const struct intel_crtc_state *pipe_config) { -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);assert_pipe_disabled (dev_priv, crtc->pipe);@@ -3033,7 +3033,7 @@ static void ironlake_edp_pll_on(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_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);assert_pipe_disabled (dev_priv, crtc->pipe);@@ -3193,7 +3193,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);u32 tmp, flags =0 ;enum port port = encoder->port; -struct intel_crtc *crtc =to_intel_crtc (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);if (encoder->type ==INTEL_OUTPUT_EDP ) pipe_config->output_types |=BIT (INTEL_OUTPUT_EDP );@@ -3228,7 +3228,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder, flags |=DRM_MODE_FLAG_NVSYNC ; } - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags;if (IS_G4X (dev_priv) && tmp &DP_COLOR_RANGE_16_235 ) pipe_config->limited_color_range = true;@@ -3245,7 +3245,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder, pipe_config->port_clock =270000 ; } - pipe_config->base.adjusted_mode.crtc_clock = + pipe_config->hw.adjusted_mode.crtc_clock =intel_dotclock_calculate (pipe_config->port_clock, &pipe_config->dp_m_n);@@ -3460,7 +3460,7 @@ static void intel_enable_dp(struct intel_encoder *encoder, {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 (pipe_config->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);u32 dp_reg =I915_READ (intel_dp->output_reg);enum pipe pipe = crtc->pipe;intel_wakeref_t wakeref;@@ -3593,7 +3593,7 @@ static void vlv_init_panel_power_sequencer(struct intel_encoder *encoder, {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 (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);lockdep_assert_held (&dev_priv->pps_mutex);@@ -4115,7 +4115,7 @@ intel_dp_link_down(struct intel_encoder *encoder, {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); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum port port = encoder->port;u32 DP = intel_dp->DP;@@ -4876,7 +4876,7 @@ int intel_dp_retrain_link(struct intel_encoder *encoder,WARN_ON (!intel_crtc_has_dp_encoder (crtc_state)); -if (!crtc_state->base.active) +if (!crtc_state->hw.active)return 0 ; if (conn_state->commit &&@@ -6695,7 +6695,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv, int refresh_rate) {struct intel_dp *intel_dp = dev_priv->drrs.dp; -struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);enum drrs_refresh_rate_type index =DRRS_HIGH_RR ;if (refresh_rate <=0 ) {@@ -6728,7 +6728,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,return ; } -if (!crtc_state->base.active) { +if (!crtc_state->hw.active) {DRM_DEBUG_KMS ("eDP encoder disabled. CRTC not Active\n" );return ; }drivers/gpu/drm/i915/display/intel_dp_mst.c +3
-3@@ -42,13 +42,13 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,struct drm_connector_state *conn_state, struct link_config_limits *limits) { - struct drm_atomic_state *state = crtc_state->base.state; + struct drm_atomic_state *state = crtc_state->uapi.state;struct intel_dp_mst_encoder *intel_mst =enc_to_mst (&encoder->base);struct intel_dp *intel_dp = &intel_mst->primary->dp;struct intel_connector *connector =to_intel_connector (conn_state->connector);const struct drm_display_mode *adjusted_mode = - &crtc_state->base.adjusted_mode; + &crtc_state->hw.adjusted_mode;void *port = connector->port;bool constant_n =drm_dp_has_quirk (&intel_dp->desc,DP_DPCD_QUIRK_CONSTANT_N );@@ -99,7 +99,7 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,struct intel_digital_connector_state *intel_conn_state =to_intel_digital_connector_state (conn_state);const struct drm_display_mode *adjusted_mode = - &pipe_config->base.adjusted_mode; + &pipe_config->hw.adjusted_mode;void *port = connector->port;struct link_config_limits limits;int ret;drivers/gpu/drm/i915/display/intel_dpio_phy.c +7
-7@@ -739,7 +739,7 @@ void chv_data_lane_soft_reset(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum dpio_channel ch =vlv_dport_to_channel (enc_to_dig_port (&encoder->base)); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe;u32 val;@@ -783,7 +783,7 @@ void chv_phy_pre_pll_enable(struct intel_encoder *encoder, {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel ch =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe; unsigned int lane_mask =@@ -864,7 +864,7 @@ void chv_phy_pre_encoder_enable(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel ch =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;int data, i, stagger;@@ -953,7 +953,7 @@ void chv_phy_post_pll_disable(struct intel_encoder *encoder, const struct intel_crtc_state *old_crtc_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -enum pipe pipe =to_intel_crtc (old_crtc_state->base.crtc)->pipe; +enum pipe pipe =to_intel_crtc (old_crtc_state->uapi.crtc)->pipe;u32 val;vlv_dpio_get (dev_priv);@@ -1016,7 +1016,7 @@ void vlv_phy_pre_pll_enable(struct intel_encoder *encoder, {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel port =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;@@ -1046,7 +1046,7 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder,struct intel_dp *intel_dp =enc_to_intel_dp (&encoder->base);struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum dpio_channel port =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;u32 val;@@ -1075,7 +1075,7 @@ void vlv_phy_reset_lanes(struct intel_encoder *encoder, {struct intel_digital_port *dport =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);enum dpio_channel port =vlv_dport_to_channel (dport);enum pipe pipe = crtc->pipe;drivers/gpu/drm/i915/display/intel_dpll_mgr.c +10
-10@@ -136,7 +136,7 @@ void assert_shared_dpll(struct drm_i915_private *dev_priv,*/ void intel_prepare_shared_dpll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc_state->shared_dpll;@@ -163,7 +163,7 @@ void intel_prepare_shared_dpll(const struct intel_crtc_state *crtc_state)*/ void intel_enable_shared_dpll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc_state->shared_dpll;unsigned int crtc_mask =drm_crtc_mask (&crtc->base);@@ -208,7 +208,7 @@ void intel_enable_shared_dpll(const struct intel_crtc_state *crtc_state)*/ void intel_disable_shared_dpll (const struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll = crtc_state->shared_dpll;unsigned int crtc_mask =drm_crtc_mask (&crtc->base);@@ -825,7 +825,7 @@ hsw_ddi_hdmi_get_dpll(struct intel_atomic_state *state,static struct intel_shared_dpll *hsw_ddi_dp_get_dpll (struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);struct intel_shared_dpll *pll;enum intel_dpll_id pll_id;int clock = crtc_state->port_clock;@@ -1734,7 +1734,7 @@ static bool bxt_ddi_hdmi_pll_dividers(struct intel_crtc_state *crtc_state, struct bxt_clk_div *clk_div) { - struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc); + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);struct dpll best_clock;/* Calculate HDMI div */ @@ -2257,7 +2257,7 @@ static bool cnl_ddi_calculate_wrpll(struct intel_crtc_state *crtc_state, struct skl_wrpll_params *wrpll_params) { - struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev); + struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);u32 afe_clock = crtc_state->port_clock *5 ;u32 ref_clock;u32 dco_min =7998000 ;@@ -2523,7 +2523,7 @@ static const struct skl_wrpll_params icl_tbt_pll_19_2MHz_values = {static bool icl_calc_dp_combo_pll (struct intel_crtc_state *crtc_state,struct skl_wrpll_params *pll_params) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);const struct icl_combo_pll_params *params = dev_priv->cdclk.hw.ref ==24000 ? icl_dp_combo_pll_24MHz_values :@@ -2545,7 +2545,7 @@ static bool icl_calc_dp_combo_pll(struct intel_crtc_state *crtc_state,static bool icl_calc_tbt_pll (struct intel_crtc_state *crtc_state,struct skl_wrpll_params *pll_params) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev); *pll_params = dev_priv->cdclk.hw.ref ==24000 ? icl_tbt_pll_24MHz_values : icl_tbt_pll_19_2MHz_values;@@ -2556,7 +2556,7 @@ static bool icl_calc_dpll_state(struct intel_crtc_state *crtc_state,struct intel_encoder *encoder, struct intel_dpll_hw_state *pll_state) { - struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev); + struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);u32 cfgcr0, cfgcr1;struct skl_wrpll_params pll_params = {0 };bool ret;@@ -2682,7 +2682,7 @@ static bool icl_mg_pll_find_divisors(int clock_khz, bool is_dp, bool use_ssc,static bool icl_calc_mg_pll_state (struct intel_crtc_state *crtc_state,struct intel_dpll_hw_state *pll_state) { -struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev); +struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);int refclk_khz = dev_priv->cdclk.hw.ref;int clock = crtc_state->port_clock;u32 dco_khz, m1div, m2div_int, m2div_rem, m2div_frac;drivers/gpu/drm/i915/display/intel_dvo.c +7
-7@@ -178,9 +178,9 @@ static void intel_dvo_get_config(struct intel_encoder *encoder,else flags |=DRM_MODE_FLAG_NVSYNC ; - pipe_config->base.adjusted_mode.flags |= flags; + pipe_config->hw.adjusted_mode.flags |= flags; - pipe_config->base.adjusted_mode.crtc_clock = pipe_config->port_clock; + pipe_config->hw.adjusted_mode.crtc_clock = pipe_config->port_clock; } static void intel_disable_dvo(struct intel_encoder *encoder,@@ -207,8 +207,8 @@ static void intel_enable_dvo(struct intel_encoder *encoder,u32 temp =I915_READ (dvo_reg); intel_dvo->dev.dev_ops->mode_set (&intel_dvo->dev, - &pipe_config->base.mode, - &pipe_config->base.adjusted_mode); + &pipe_config->hw.mode, + &pipe_config->hw.adjusted_mode);I915_WRITE (dvo_reg, temp |DVO_ENABLE );I915_READ (dvo_reg);@@ -253,7 +253,7 @@ static int intel_dvo_compute_config(struct intel_encoder *encoder,struct intel_dvo *intel_dvo =enc_to_dvo (encoder);const struct drm_display_mode *fixed_mode = intel_dvo->attached_connector->panel.fixed_mode; -struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;/* * If we have timings from the BIOS for the panel, put them in @@ -277,8 +277,8 @@ static void intel_dvo_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 *crtc =to_intel_crtc (pipe_config->base.crtc); -const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; +struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc); +const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;struct intel_dvo *intel_dvo =enc_to_dvo (encoder);enum pipe pipe = crtc->pipe;u32 dvo_val;drivers/gpu/drm/i915/display/intel_fbc.c +1
-1@@ -667,7 +667,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->vma =NULL ; cache->flags =0 ; - cache->crtc.mode_flags = crtc_state->base.adjusted_mode.flags; + cache->crtc.mode_flags = crtc_state->hw.adjusted_mode.flags;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) cache->crtc.hsw_bdw_pixel_rate = crtc_state->pixel_rate;drivers/gpu/drm/i915/display/intel_hdmi.c +31
-31@@ -279,7 +279,7 @@ static void ibx_write_infoframe(struct intel_encoder *encoder, {const u32 *data = frame;Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_lspcon.c +2
-2Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_lvds.c +6
-6Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_panel.c +7
-7Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_pipe_crc.c +3
-3Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_psr.c +5
-5Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_sdvo.c +11
-11Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_sprite.c +13
-12Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_tv.c +4
-4Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/intel_vdsc.c +6
-6Lines of this file are not shown. View the raw message.
drivers/gpu/drm/i915/display/vlv_dsi.c +10
-10Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.20.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Part of the diff is not shown here. View the raw message.
Maarten Lankhorst
maintainerPATCH 4/23 drm/i915: Handle a few more cases for hw/sw split
In reply to Maarten LankhorstWe are still looking at drm_crtc_state in a few places, convert those to use intel_crtc_state instead. Look at uapi/hw where appropriate.
--- drivers/gpu/drm/i915/display/intel_display.c | 14 +++++++------- drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +7 -7
@@ -16081,8 +16081,8 @@ static int intel_initial_commit(struct drm_device *dev) {struct drm_atomic_state *state =NULL ;struct drm_modeset_acquire_ctx ctx; -struct drm_crtc *crtc; -struct drm_crtc_state *crtc_state; +struct intel_crtc *crtc; +struct intel_crtc_state *crtc_state;int ret =0 ; state =drm_atomic_state_alloc (dev);
@@ -16094,15 +16094,15 @@ static int intel_initial_commit(struct drm_device *dev) retry: state->acquire_ctx = &ctx; -drm_for_each_crtc (crtc, dev) { - crtc_state =drm_atomic_get_crtc_state (state, crtc); +for_each_intel_crtc (dev, crtc) { + crtc_state =intel_atomic_get_crtc_state (state, crtc);if (IS_ERR (crtc_state)) { ret =PTR_ERR (crtc_state); goto out; } -if (crtc_state->active) { - ret =drm_atomic_add_affected_planes (state, crtc); +if (crtc_state->hw.active) { + ret =drm_atomic_add_affected_planes (state, &crtc->base);if (ret) goto out;
@@ -16112,7 +16112,7 @@ static int intel_initial_commit(struct drm_device *dev)* having a proper LUT loaded. Remove once we * have readout for pipe gamma enable. */ - crtc_state->color_mgmt_changed = true; + crtc_state->uapi.color_mgmt_changed = true; } }
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -1
@@ -187,7 +187,7 @@ intel_dp_mst_atomic_check(struct drm_connector *connector,if (!crtc_state || !drm_atomic_crtc_needs_modeset (crtc_state) || - crtc_state->enable) +to_intel_crtc_state (crtc_state)->hw.enable)return 0 ; }
drivers/gpu/drm/i915/display/intel_psr.c +2 -2
@@ -1068,9 +1068,9 @@ static int intel_psr_fastset_force(struct drm_i915_private *dev_priv) intel_crtc_state =to_intel_crtc_state (crtc_state); -if (crtc_state->active && intel_crtc_state->has_psr) { +if (intel_crtc_state->hw.active && intel_crtc_state->has_psr) {/* Mark mode as changed to trigger a pipe->update() */ - crtc_state->mode_changed = true; + intel_crtc_state->uapi.mode_changed = true;break ; } }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/23] drm/i915: Handle a few more cases for hw/sw split
Quoted 4 lines · Maarten Lankhorst
We are still looking at
drm_crtc_statein a few places, convert those to useintel_crtc_stateinstead. Look at uapi/hw where appropriate.Signed-off-by Maarten Lankhorst <[email protected]>
Quoted 86 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 14 +++++++------- drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +7
-7@@ -16081,8 +16081,8 @@ static int intel_initial_commit(struct drm_device *dev) {struct drm_atomic_state *state =NULL ;struct drm_modeset_acquire_ctx ctx; -struct drm_crtc *crtc; -struct drm_crtc_state *crtc_state; +struct intel_crtc *crtc; +struct intel_crtc_state *crtc_state;int ret =0 ; state =drm_atomic_state_alloc (dev);@@ -16094,15 +16094,15 @@ static int intel_initial_commit(struct drm_device *dev) retry: state->acquire_ctx = &ctx; -drm_for_each_crtc (crtc, dev) { - crtc_state =drm_atomic_get_crtc_state (state, crtc); +for_each_intel_crtc (dev, crtc) { + crtc_state =intel_atomic_get_crtc_state (state, crtc);if (IS_ERR (crtc_state)) { ret =PTR_ERR (crtc_state); goto out; } -if (crtc_state->active) { - ret =drm_atomic_add_affected_planes (state, crtc); +if (crtc_state->hw.active) { + ret =drm_atomic_add_affected_planes (state, &crtc->base);if (ret) goto out;@@ -16112,7 +16112,7 @@ static int intel_initial_commit(struct drm_device *dev)* having a proper LUT loaded. Remove once we * have readout for pipe gamma enable. */ - crtc_state->color_mgmt_changed = true; + crtc_state->uapi.color_mgmt_changed = true; } }drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-1@@ -187,7 +187,7 @@ intel_dp_mst_atomic_check(struct drm_connector *connector,if (!crtc_state || !drm_atomic_crtc_needs_modeset (crtc_state) || - crtc_state->enable) +to_intel_crtc_state (crtc_state)->hw.enable)return 0 ; }drivers/gpu/drm/i915/display/intel_psr.c +2
-2@@ -1068,9 +1068,9 @@ static int intel_psr_fastset_force(struct drm_i915_private *dev_priv) intel_crtc_state =to_intel_crtc_state (crtc_state); -if (crtc_state->active && intel_crtc_state->has_psr) { +if (intel_crtc_state->hw.active && intel_crtc_state->has_psr) {/* Mark mode as changed to trigger a pipe->update() */ - crtc_state->mode_changed = true; + intel_crtc_state->uapi.mode_changed = true;break ; } }Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 5/23 drm/i915: Complete sw/hw split
In reply to Maarten LankhorstNow that we separated everything into uapi and hw, it's time to make the split definitive. Remove the union and make a copy of the hw state on modeset and fastset.
Color blobs are copied in crtc atomic_check(), right before color management is checked.
--- drivers/gpu/drm/i915/display/intel_atomic.c | 44 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 39 +++++++++++++--- .../drm/i915/display/intel_display_types.h | 8 ++-- 4 files changed, 85 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +44 -0
@@ -195,6 +195,14 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); +/* copy color blobs */ +if (crtc_state->hw.degamma_lut) +drm_property_blob_get (crtc_state->hw.degamma_lut); +if (crtc_state->hw.ctm) +drm_property_blob_get (crtc_state->hw.ctm); +if (crtc_state->hw.gamma_lut) +drm_property_blob_get (crtc_state->hw.gamma_lut); + crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false;
@@ -209,6 +217,41 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)return &crtc_state->uapi; } +static void intel_crtc_put_color_blobs (struct intel_crtc_state *crtc_state) +{ +drm_property_blob_put (crtc_state->hw.degamma_lut); +drm_property_blob_put (crtc_state->hw.gamma_lut); +drm_property_blob_put (crtc_state->hw.ctm); +} + +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); +} + +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); + +if (crtc_state->uapi.degamma_lut) + crtc_state->hw.degamma_lut = +drm_property_blob_get (crtc_state->uapi.degamma_lut); +else + crtc_state->hw.degamma_lut =NULL ; + +if (crtc_state->uapi.gamma_lut) + crtc_state->hw.gamma_lut = +drm_property_blob_get (crtc_state->uapi.gamma_lut); +else + crtc_state->hw.gamma_lut =NULL ; + +if (crtc_state->uapi.ctm) + crtc_state->hw.ctm = +drm_property_blob_get (crtc_state->uapi.ctm); +else + crtc_state->hw.ctm =NULL ; +} +/** * intel_crtc_destroy_state - destroy crtc state * @crtc: drm crtc
@@ -224,6 +267,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,struct intel_crtc_state *crtc_state =to_intel_crtc_state (state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);kfree (crtc_state); }
drivers/gpu/drm/i915/display/intel_atomic.h +2 -0
@@ -35,6 +35,8 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state); +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state); +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *state);
drivers/gpu/drm/i915/display/intel_display.c +34 -5
@@ -114,6 +114,7 @@ static const u64 cursor_format_modifiers[] = {DRM_FORMAT_MOD_INVALID }; +static void copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state);static void i9xx_crtc_clock_get (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config); static void ironlake_pch_clock_get(struct intel_crtc *crtc,
@@ -7097,6 +7098,7 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, crtc->enabled = false; crtc->state->connector_mask =0 ; crtc->state->encoder_mask =0 ; +copy_uapi_to_hw_state (to_intel_crtc_state (crtc->state));for_each_encoder_on_crtc (crtc->dev, crtc, encoder) encoder->base.crtc =NULL ;
@@ -11804,6 +11806,9 @@ static int intel_crtc_atomic_check(struct drm_crtc *_crtc,if (mode_changed || crtc_state->update_pipe || crtc_state->uapi.color_mgmt_changed) { +/* Copy color blobs to hw state */ +intel_crtc_copy_color_blobs (crtc_state); + ret =intel_color_check (crtc_state);if (ret)return ret;
@@ -12251,6 +12256,22 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state)return ret; } +static void copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->hw.enable = crtc_state->uapi.enable; + crtc_state->hw.active = crtc_state->uapi.active; + crtc_state->hw.mode = crtc_state->uapi.mode; + crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; +} + +static void copy_hw_to_uapi_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->uapi.enable = crtc_state->hw.enable; + crtc_state->uapi.active = crtc_state->hw.active; + crtc_state->uapi.mode = crtc_state->hw.mode; + crtc_state->uapi.adjusted_mode = crtc_state->hw.adjusted_mode; +} +static int clear_intel_crtc_state (struct intel_crtc_state *crtc_state) {
@@ -12267,6 +12288,7 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)* fixed, so that the crtc_state can be safely duplicated. For now, * only fields that are know to not cause problems are preserved. */ + saved_state->uapi = crtc_state->uapi; saved_state->scaler_state = crtc_state->scaler_state; saved_state->shared_dpll = crtc_state->shared_dpll; saved_state->dpll_hw_state = crtc_state->dpll_hw_state;
@@ -12277,11 +12299,9 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) saved_state->wm = crtc_state->wm; -/* Keep base drm_crtc_state intact, only clear our extended struct */ -BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw)); -memcpy (&crtc_state->uapi +1 , &saved_state->uapi +1 , -sizeof (*crtc_state) -sizeof (crtc_state->uapi)); +intel_crtc_free_hw_state (crtc_state); +memcpy (crtc_state, saved_state,sizeof (*crtc_state)); +copy_uapi_to_hw_state (crtc_state);kfree (saved_state);return 0 ;
@@ -12421,6 +12441,9 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)DRM_DEBUG_KMS ("hw max bpp: %i, pipe bpp: %i, dithering: %i\n" , base_bpp, pipe_config->pipe_bpp, pipe_config->dither); +/* uapi wants a copy of the adjusted_mode for vblank bookkeeping */ + pipe_config->uapi.adjusted_mode = pipe_config->hw.adjusted_mode; +return 0 ; }
@@ -13142,6 +13165,8 @@ verify_crtc_state(struct intel_crtc *crtc, state = old_crtc_state->uapi.state;__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->uapi); +intel_crtc_free_hw_state (old_crtc_state); + pipe_config = old_crtc_state;memset (pipe_config,0 ,sizeof (*pipe_config)); pipe_config->uapi.crtc = &crtc->base;
@@ -13568,6 +13593,7 @@ static int intel_atomic_check(struct drm_device *dev,if (!new_crtc_state->uapi.enable) { any_ms = true; +clear_intel_crtc_state (new_crtc_state);continue ; }
@@ -16686,6 +16712,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)to_intel_crtc_state (crtc->base.state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);memset (crtc_state,0 ,sizeof (*crtc_state));__drm_atomic_helper_crtc_reset (&crtc->base, &crtc_state->uapi);
@@ -16802,6 +16829,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) crtc->base.mode.vdisplay = crtc_state->pipe_src_h;intel_mode_from_pipe_config (&crtc_state->hw.adjusted_mode, crtc_state); + crtc_state->hw.mode = crtc->base.mode;WARN_ON (drm_atomic_set_mode_for_crtc (crtc->base.state, &crtc->base.mode));/*
@@ -16847,6 +16875,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)intel_bw_crtc_update (bw_state, crtc_state); +copy_hw_to_uapi_state (crtc_state);intel_pipe_config_sanity_check (dev_priv, crtc_state); } }
drivers/gpu/drm/i915/display/intel_display_types.h +5 -3
@@ -749,7 +749,6 @@ enum intel_output_format { };struct intel_crtc_state { -union {/* * uapi (drm) state. This is the software state shown to userspace. * In particular, the following members are used for bookkeeping:
@@ -772,8 +771,11 @@ struct intel_crtc_state {* * During initial hw readout, they need to be copied to uapi. */ -struct drm_crtc_state hw; - }; +struct { +bool active, enable; +struct drm_property_blob *degamma_lut, *gamma_lut, *ctm; +struct drm_display_mode mode, adjusted_mode; + } hw;/** * quirks - bitfield with hw state readout quirks
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/23] drm/i915: Complete sw/hw split
Quoted 110 lines · Maarten Lankhorst
Now that we separated everything into uapi and hw, it's time to make the split definitive. Remove the union and make a copy of the hw state on modeset and fastset.
Color blobs are copied in crtc
atomic_check(), right before color management is checked.Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 44 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 39 +++++++++++++--- .../drm/i915/display/intel_display_types.h | 8 ++-- 4 files changed, 85 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +44
-0@@ -195,6 +195,14 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); +/* copy color blobs */ +if (crtc_state->hw.degamma_lut) +drm_property_blob_get (crtc_state->hw.degamma_lut); +if (crtc_state->hw.ctm) +drm_property_blob_get (crtc_state->hw.ctm); +if (crtc_state->hw.gamma_lut) +drm_property_blob_get (crtc_state->hw.gamma_lut); + crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false;@@ -209,6 +217,41 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)return &crtc_state->uapi; } +static void intel_crtc_put_color_blobs (struct intel_crtc_state *crtc_state) +{ +drm_property_blob_put (crtc_state->hw.degamma_lut); +drm_property_blob_put (crtc_state->hw.gamma_lut); +drm_property_blob_put (crtc_state->hw.ctm); +} + +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); +} + +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); + +if (crtc_state->uapi.degamma_lut) + crtc_state->hw.degamma_lut = +drm_property_blob_get (crtc_state->uapi.degamma_lut); +else + crtc_state->hw.degamma_lut =NULL ; + +if (crtc_state->uapi.gamma_lut) + crtc_state->hw.gamma_lut = +drm_property_blob_get (crtc_state->uapi.gamma_lut); +else + crtc_state->hw.gamma_lut =NULL ; + +if (crtc_state->uapi.ctm) + crtc_state->hw.ctm = +drm_property_blob_get (crtc_state->uapi.ctm); +else + crtc_state->hw.ctm =NULL ; +} +/** * intel_crtc_destroy_state - destroy crtc state * @crtc: drm crtc @@ -224,6 +267,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,struct intel_crtc_state *crtc_state =to_intel_crtc_state (state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);kfree (crtc_state); }drivers/gpu/drm/i915/display/intel_atomic.h +2
-0@@ -35,6 +35,8 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state); +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state); +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *state);drivers/gpu/drm/i915/display/intel_display.c +1
-0@@ -114,6 +114,7 @@ static const u64 cursor_format_modifiers[] = {DRM_FORMAT_MOD_INVALID }; +static void copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state);static void i9xx_crtc_clock_get (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config); static void ironlake_pch_clock_get(struct intel_crtc *crtc,
drivers/gpu/drm/i915/display/intel_display.c static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, · line 7102
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-0@@ -7097,6 +7098,7 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, crtc->enabled = false; crtc->state->connector_mask =0 ; crtc->state->encoder_mask =0 ; +copy_uapi_to_hw_state (to_intel_crtc_state (crtc->state));
Do we actually have any valid uapi state to copy at this point? I thought intel_crtc_disable_noatomic was only called during initial hardware readout (which only updates hw state and then does a hw->uapi copy at the end)?
drivers/gpu/drm/i915/display/intel_display.c static int intel_crtc_atomic_check(struct drm_crtc *_crtc, · line 11810
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c +2
-0for_each_encoder_on_crtc (crtc->dev, crtc, encoder) encoder->base.crtc =NULL ;@@ -11804,6 +11806,9 @@ static int intel_crtc_atomic_check(struct drm_crtc *_crtc,if (mode_changed || crtc_state->update_pipe || crtc_state->uapi.color_mgmt_changed) { +/* Copy color blobs to hw state */ +intel_crtc_copy_color_blobs (crtc_state);
The copy only matters if crtc_state->uapi.color_mgmt_changed, right? I guess it doesn't really matter if we call this more often than we need to since we're not actually copying the blobs themselves, just dropping/taking extra references.
Quoted 70 lines
drivers/gpu/drm/i915/display/intel_display.c +26
-5+ ret =intel_color_check (crtc_state);if (ret)return ret;@@ -12251,6 +12256,22 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state)return ret; } +static void copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->hw.enable = crtc_state->uapi.enable; + crtc_state->hw.active = crtc_state->uapi.active; + crtc_state->hw.mode = crtc_state->uapi.mode; + crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; +} + +static void copy_hw_to_uapi_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->uapi.enable = crtc_state->hw.enable; + crtc_state->uapi.active = crtc_state->hw.active; + crtc_state->uapi.mode = crtc_state->hw.mode; + crtc_state->uapi.adjusted_mode = crtc_state->hw.adjusted_mode; +} +static int clear_intel_crtc_state (struct intel_crtc_state *crtc_state) {@@ -12267,6 +12288,7 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)* fixed, so that the crtc_state can be safely duplicated. For now, * only fields that are know to not cause problems are preserved. */ + saved_state->uapi = crtc_state->uapi; saved_state->scaler_state = crtc_state->scaler_state; saved_state->shared_dpll = crtc_state->shared_dpll; saved_state->dpll_hw_state = crtc_state->dpll_hw_state;@@ -12277,11 +12299,9 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) saved_state->wm = crtc_state->wm; -/* Keep base drm_crtc_state intact, only clear our extended struct */ -BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw)); -memcpy (&crtc_state->uapi +1 , &saved_state->uapi +1 , -sizeof (*crtc_state) -sizeof (crtc_state->uapi)); +intel_crtc_free_hw_state (crtc_state); +memcpy (crtc_state, saved_state,sizeof (*crtc_state)); +copy_uapi_to_hw_state (crtc_state);kfree (saved_state);return 0 ;@@ -12421,6 +12441,9 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)DRM_DEBUG_KMS ("hw max bpp: %i, pipe bpp: %i, dithering: %i\n" , base_bpp, pipe_config->pipe_bpp, pipe_config->dither); +/* uapi wants a copy of the adjusted_mode for vblank bookkeeping */ + pipe_config->uapi.adjusted_mode = pipe_config->hw.adjusted_mode; +return 0 ; }@@ -13142,6 +13165,8 @@ verify_crtc_state(struct intel_crtc *crtc, state = old_crtc_state->uapi.state;__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->uapi); +intel_crtc_free_hw_state (old_crtc_state); + pipe_config = old_crtc_state;memset (pipe_config,0 ,sizeof (*pipe_config)); pipe_config->uapi.crtc = &crtc->base;
drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 13596
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-0@@ -13568,6 +13593,7 @@ static int intel_atomic_check(struct drm_device *dev,if (!new_crtc_state->uapi.enable) { any_ms = true; +clear_intel_crtc_state (new_crtc_state);
Why do we need this call? uapi is preserved during this call (and then re-copied to hw), so it doesn't seem like this has any effect on the uapi/hw split we're dealing with in this patch?
Matt
Quoted 60 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-0continue ; }@@ -16686,6 +16712,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)to_intel_crtc_state (crtc->base.state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);memset (crtc_state,0 ,sizeof (*crtc_state));__drm_atomic_helper_crtc_reset (&crtc->base, &crtc_state->uapi);@@ -16802,6 +16829,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) crtc->base.mode.vdisplay = crtc_state->pipe_src_h;intel_mode_from_pipe_config (&crtc_state->hw.adjusted_mode, crtc_state); + crtc_state->hw.mode = crtc->base.mode;WARN_ON (drm_atomic_set_mode_for_crtc (crtc->base.state, &crtc->base.mode));/* @@ -16847,6 +16875,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)intel_bw_crtc_update (bw_state, crtc_state); +copy_hw_to_uapi_state (crtc_state);intel_pipe_config_sanity_check (dev_priv, crtc_state); } }drivers/gpu/drm/i915/display/intel_display_types.h +5
-3@@ -749,7 +749,6 @@ enum intel_output_format { };struct intel_crtc_state { -union {/* * uapi (drm) state. This is the software state shown to userspace. * In particular, the following members are used for bookkeeping: @@ -772,8 +771,11 @@ struct intel_crtc_state {* * During initial hw readout, they need to be copied to uapi. */ -struct drm_crtc_state hw; - }; +struct { +bool active, enable; +struct drm_property_blob *degamma_lut, *gamma_lut, *ctm; +struct drm_display_mode mode, adjusted_mode; + } hw;/** * quirks - bitfield with hw state readout quirks Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH 05/23] drm/i915: Complete sw/hw split
Op 25-09-2019 om 01:41 schreef Matt Roper:
Quoted 126 lines · Maarten Lankhorst
Quoted 110 lines
Now that we separated everything into uapi and hw, it's time to make the split definitive. Remove the union and make a copy of the hw state on modeset and fastset.
Color blobs are copied in crtc
atomic_check(), right before color management is checked.Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 44 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 39 +++++++++++++--- .../drm/i915/display/intel_display_types.h | 8 ++-- 4 files changed, 85 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +44
-0@@ -195,6 +195,14 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); +/* copy color blobs */ +if (crtc_state->hw.degamma_lut) +drm_property_blob_get (crtc_state->hw.degamma_lut); +if (crtc_state->hw.ctm) +drm_property_blob_get (crtc_state->hw.ctm); +if (crtc_state->hw.gamma_lut) +drm_property_blob_get (crtc_state->hw.gamma_lut); + crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false;@@ -209,6 +217,41 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)return &crtc_state->uapi; } +static void intel_crtc_put_color_blobs (struct intel_crtc_state *crtc_state) +{ +drm_property_blob_put (crtc_state->hw.degamma_lut); +drm_property_blob_put (crtc_state->hw.gamma_lut); +drm_property_blob_put (crtc_state->hw.ctm); +} + +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); +} + +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); + +if (crtc_state->uapi.degamma_lut) + crtc_state->hw.degamma_lut = +drm_property_blob_get (crtc_state->uapi.degamma_lut); +else + crtc_state->hw.degamma_lut =NULL ; + +if (crtc_state->uapi.gamma_lut) + crtc_state->hw.gamma_lut = +drm_property_blob_get (crtc_state->uapi.gamma_lut); +else + crtc_state->hw.gamma_lut =NULL ; + +if (crtc_state->uapi.ctm) + crtc_state->hw.ctm = +drm_property_blob_get (crtc_state->uapi.ctm); +else + crtc_state->hw.ctm =NULL ; +} +/** * intel_crtc_destroy_state - destroy crtc state * @crtc: drm crtc @@ -224,6 +267,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,struct intel_crtc_state *crtc_state =to_intel_crtc_state (state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);kfree (crtc_state); }drivers/gpu/drm/i915/display/intel_atomic.h +2
-0@@ -35,6 +35,8 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state); +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state); +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *state);drivers/gpu/drm/i915/display/intel_display.c +1
-0@@ -114,6 +114,7 @@ static const u64 cursor_format_modifiers[] = {DRM_FORMAT_MOD_INVALID }; +static void copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state);static void i9xx_crtc_clock_get (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config); static void ironlake_pch_clock_get(struct intel_crtc *crtc,drivers/gpu/drm/i915/display/intel_display.c static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, · line 7102
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-0@@ -7097,6 +7098,7 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, crtc->enabled = false; crtc->state->connector_mask =0 ; crtc->state->encoder_mask =0 ; +copy_uapi_to_hw_state (to_intel_crtc_state (crtc->state));Do we actually have any valid uapi state to copy at this point? I thought
intel_crtc_disable_noatomicwas only called during initial hardware readout (which only updates hw state and then does ahw->uapicopy at the end)?Quoted 4 lines
drivers/gpu/drm/i915/display/intel_display.c +0
-0for_each_encoder_on_crtc (crtc->dev, crtc, encoder) encoder->base.crtc =NULL ;@@ -11804,6 +11806,9 @@ static int intel_crtc_atomic_check(struct drm_crtc *_crtc,
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_display.c static int intel_crtc_atomic_check(struct drm_crtc *_crtc, · line 11810
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_display.c +2
-0if (mode_changed || crtc_state->updatenoughe_pipe || crtc_state->uapi.color_mgmt_changed) { +/* Copy color blobs to hw state */ +intel_crtc_copy_color_blobs (crtc_state);The copy only matters if
crtc_state->uapi.color_mgmt_changed, right? I guess it doesn't really matter if we call this more often than we need to since we're not actually copying the blobs themselves, just dropping/taking extra references.
Yes, exactly. :)
intel_color_commit is only called when color_mgmt_changed is set, so that's sufficient.
Quoted 72 lines
Quoted 72 lines
drivers/gpu/drm/i915/display/intel_display.c +26
-5+ ret =intel_color_check (crtc_state);if (ret)return ret;@@ -12251,6 +12256,22 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state)return ret; } +static void copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->hw.enable = crtc_state->uapi.enable; + crtc_state->hw.active = crtc_state->uapi.active; + crtc_state->hw.mode = crtc_state->uapi.mode; + crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; +} + +static void copy_hw_to_uapi_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->uapi.enable = crtc_state->hw.enable; + crtc_state->uapi.active = crtc_state->hw.active; + crtc_state->uapi.mode = crtc_state->hw.mode; + crtc_state->uapi.adjusted_mode = crtc_state->hw.adjusted_mode; +} +static int clear_intel_crtc_state (struct intel_crtc_state *crtc_state) {@@ -12267,6 +12288,7 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)* fixed, so that the crtc_state can be safely duplicated. For now, * only fields that are know to not cause problems are preserved. */ + saved_state->uapi = crtc_state->uapi; saved_state->scaler_state = crtc_state->scaler_state; saved_state->shared_dpll = crtc_state->shared_dpll; saved_state->dpll_hw_state = crtc_state->dpll_hw_state;@@ -12277,11 +12299,9 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) saved_state->wm = crtc_state->wm; -/* Keep base drm_crtc_state intact, only clear our extended struct */ -BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw)); -memcpy (&crtc_state->uapi +1 , &saved_state->uapi +1 , -sizeof (*crtc_state) -sizeof (crtc_state->uapi)); +intel_crtc_free_hw_state (crtc_state); +memcpy (crtc_state, saved_state,sizeof (*crtc_state)); +copy_uapi_to_hw_state (crtc_state);kfree (saved_state);return 0 ;@@ -12421,6 +12441,9 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)DRM_DEBUG_KMS ("hw max bpp: %i, pipe bpp: %i, dithering: %i\n" , base_bpp, pipe_config->pipe_bpp, pipe_config->dither); +/* uapi wants a copy of the adjusted_mode for vblank bookkeeping */ + pipe_config->uapi.adjusted_mode = pipe_config->hw.adjusted_mode; +return 0 ; }@@ -13142,6 +13165,8 @@ verify_crtc_state(struct intel_crtc *crtc, state = old_crtc_state->uapi.state;__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->uapi); +intel_crtc_free_hw_state (old_crtc_state); + pipe_config = old_crtc_state;memset (pipe_config,0 ,sizeof (*pipe_config)); pipe_config->uapi.crtc = &crtc->base;@@ -13568,6 +13593,7 @@ static int intel_atomic_check(struct drm_device *dev,
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display.c static int intel_atomic_check(struct drm_device *dev, · line 13596
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_display.c +1
-0if (!new_crtc_state->uapi.enable) { any_ms = true; +clear_intel_crtc_state (new_crtc_state);Why do we need this call? uapi is preserved during this call (and then re-copied to hw), so it doesn't seem like this has any effect on the uapi/hw split we're dealing with in this patch?
We want to clear crtc_state->hw, it can be replaced with a intel_crtc_free_hw_state() + memset on crtc_state->hw.
I wanted to clear the entire state, so when dumping crtc_state you don't see any old state.
Although we're missing error checking here, so that needs fixing.
Quoted 57 lines
Quoted 57 lines
drivers/gpu/drm/i915/display/intel_display.c +3
-0continue ; }@@ -16686,6 +16712,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)to_intel_crtc_state (crtc->base.state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);memset (crtc_state,0 ,sizeof (*crtc_state));__drm_atomic_helper_crtc_reset (&crtc->base, &crtc_state->uapi);@@ -16802,6 +16829,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) crtc->base.mode.vdisplay = crtc_state->pipe_src_h;intel_mode_from_pipe_config (&crtc_state->hw.adjusted_mode, crtc_state); + crtc_state->hw.mode = crtc->base.mode;WARN_ON (drm_atomic_set_mode_for_crtc (crtc->base.state, &crtc->base.mode));/* @@ -16847,6 +16875,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)intel_bw_crtc_update (bw_state, crtc_state); +copy_hw_to_uapi_state (crtc_state);intel_pipe_config_sanity_check (dev_priv, crtc_state); } }drivers/gpu/drm/i915/display/intel_display_types.h +5
-3@@ -749,7 +749,6 @@ enum intel_output_format { };struct intel_crtc_state { -union {/* * uapi (drm) state. This is the software state shown to userspace. * In particular, the following members are used for bookkeeping: @@ -772,8 +771,11 @@ struct intel_crtc_state {* * During initial hw readout, they need to be copied to uapi. */ -struct drm_crtc_state hw; - }; +struct { +bool active, enable; +struct drm_property_blob *degamma_lut, *gamma_lut, *ctm; +struct drm_display_mode mode, adjusted_mode; + } hw;/** * quirks - bitfield with hw state readout quirks Signature · 1 line
2.20.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/23] drm/i915: Complete sw/hw split
In reply to Maarten LankhorstQuoted 6 lines · Maarten Lankhorst
Now that we separated everything into uapi and hw, it's time to make the split definitive. Remove the union and make a copy of the hw state on modeset and fastset.
Color blobs are copied in crtc
atomic_check(), right before color management is checked.
Don't like. IMO there should be one and only one place where copy over the uapi state into the hw state. Otherwise it's a mess because you constantly have to remind yourself which bits of state already got copied and which didn't.
Quoted 251 lines
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 44 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 39 +++++++++++++--- .../drm/i915/display/intel_display_types.h | 8 ++-- 4 files changed, 85 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +44
-0@@ -195,6 +195,14 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); +/* copy color blobs */ +if (crtc_state->hw.degamma_lut) +drm_property_blob_get (crtc_state->hw.degamma_lut); +if (crtc_state->hw.ctm) +drm_property_blob_get (crtc_state->hw.ctm); +if (crtc_state->hw.gamma_lut) +drm_property_blob_get (crtc_state->hw.gamma_lut); + crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false;@@ -209,6 +217,41 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)return &crtc_state->uapi; } +static void intel_crtc_put_color_blobs (struct intel_crtc_state *crtc_state) +{ +drm_property_blob_put (crtc_state->hw.degamma_lut); +drm_property_blob_put (crtc_state->hw.gamma_lut); +drm_property_blob_put (crtc_state->hw.ctm); +} + +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); +} + +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); + +if (crtc_state->uapi.degamma_lut) + crtc_state->hw.degamma_lut = +drm_property_blob_get (crtc_state->uapi.degamma_lut); +else + crtc_state->hw.degamma_lut =NULL ; + +if (crtc_state->uapi.gamma_lut) + crtc_state->hw.gamma_lut = +drm_property_blob_get (crtc_state->uapi.gamma_lut); +else + crtc_state->hw.gamma_lut =NULL ; + +if (crtc_state->uapi.ctm) + crtc_state->hw.ctm = +drm_property_blob_get (crtc_state->uapi.ctm); +else + crtc_state->hw.ctm =NULL ; +} +/** * intel_crtc_destroy_state - destroy crtc state * @crtc: drm crtc @@ -224,6 +267,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,struct intel_crtc_state *crtc_state =to_intel_crtc_state (state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);kfree (crtc_state); }drivers/gpu/drm/i915/display/intel_atomic.h +2
-0@@ -35,6 +35,8 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state); +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state); +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *state);drivers/gpu/drm/i915/display/intel_display.c +34
-5@@ -114,6 +114,7 @@ static const u64 cursor_format_modifiers[] = {DRM_FORMAT_MOD_INVALID }; +static void copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state);static void i9xx_crtc_clock_get (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config); static void ironlake_pch_clock_get(struct intel_crtc *crtc,@@ -7097,6 +7098,7 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, crtc->enabled = false; crtc->state->connector_mask =0 ; crtc->state->encoder_mask =0 ; +copy_uapi_to_hw_state (to_intel_crtc_state (crtc->state));for_each_encoder_on_crtc (crtc->dev, crtc, encoder) encoder->base.crtc =NULL ;@@ -11804,6 +11806,9 @@ static int intel_crtc_atomic_check(struct drm_crtc *_crtc,if (mode_changed || crtc_state->update_pipe || crtc_state->uapi.color_mgmt_changed) { +/* Copy color blobs to hw state */ +intel_crtc_copy_color_blobs (crtc_state); + ret =intel_color_check (crtc_state);if (ret)return ret;@@ -12251,6 +12256,22 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state)return ret; } +static void copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->hw.enable = crtc_state->uapi.enable; + crtc_state->hw.active = crtc_state->uapi.active; + crtc_state->hw.mode = crtc_state->uapi.mode; + crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; +} + +static void copy_hw_to_uapi_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->uapi.enable = crtc_state->hw.enable; + crtc_state->uapi.active = crtc_state->hw.active; + crtc_state->uapi.mode = crtc_state->hw.mode; + crtc_state->uapi.adjusted_mode = crtc_state->hw.adjusted_mode; +} +static int clear_intel_crtc_state (struct intel_crtc_state *crtc_state) {@@ -12267,6 +12288,7 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)* fixed, so that the crtc_state can be safely duplicated. For now, * only fields that are know to not cause problems are preserved. */ + saved_state->uapi = crtc_state->uapi; saved_state->scaler_state = crtc_state->scaler_state; saved_state->shared_dpll = crtc_state->shared_dpll; saved_state->dpll_hw_state = crtc_state->dpll_hw_state;@@ -12277,11 +12299,9 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) saved_state->wm = crtc_state->wm; -/* Keep base drm_crtc_state intact, only clear our extended struct */ -BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw)); -memcpy (&crtc_state->uapi +1 , &saved_state->uapi +1 , -sizeof (*crtc_state) -sizeof (crtc_state->uapi)); +intel_crtc_free_hw_state (crtc_state); +memcpy (crtc_state, saved_state,sizeof (*crtc_state)); +copy_uapi_to_hw_state (crtc_state);kfree (saved_state);return 0 ;@@ -12421,6 +12441,9 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)DRM_DEBUG_KMS ("hw max bpp: %i, pipe bpp: %i, dithering: %i\n" , base_bpp, pipe_config->pipe_bpp, pipe_config->dither); +/* uapi wants a copy of the adjusted_mode for vblank bookkeeping */ + pipe_config->uapi.adjusted_mode = pipe_config->hw.adjusted_mode; +return 0 ; }@@ -13142,6 +13165,8 @@ verify_crtc_state(struct intel_crtc *crtc, state = old_crtc_state->uapi.state;__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->uapi); +intel_crtc_free_hw_state (old_crtc_state); + pipe_config = old_crtc_state;memset (pipe_config,0 ,sizeof (*pipe_config)); pipe_config->uapi.crtc = &crtc->base;@@ -13568,6 +13593,7 @@ static int intel_atomic_check(struct drm_device *dev,if (!new_crtc_state->uapi.enable) { any_ms = true; +clear_intel_crtc_state (new_crtc_state);continue ; }@@ -16686,6 +16712,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)to_intel_crtc_state (crtc->base.state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);memset (crtc_state,0 ,sizeof (*crtc_state));__drm_atomic_helper_crtc_reset (&crtc->base, &crtc_state->uapi);@@ -16802,6 +16829,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) crtc->base.mode.vdisplay = crtc_state->pipe_src_h;intel_mode_from_pipe_config (&crtc_state->hw.adjusted_mode, crtc_state); + crtc_state->hw.mode = crtc->base.mode;WARN_ON (drm_atomic_set_mode_for_crtc (crtc->base.state, &crtc->base.mode));/* @@ -16847,6 +16875,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)intel_bw_crtc_update (bw_state, crtc_state); +copy_hw_to_uapi_state (crtc_state);intel_pipe_config_sanity_check (dev_priv, crtc_state); } }drivers/gpu/drm/i915/display/intel_display_types.h +5
-3@@ -749,7 +749,6 @@ enum intel_output_format { };struct intel_crtc_state { -union {/* * uapi (drm) state. This is the software state shown to userspace. * In particular, the following members are used for bookkeeping: @@ -772,8 +771,11 @@ struct intel_crtc_state {* * During initial hw readout, they need to be copied to uapi. */ -struct drm_crtc_state hw; - }; +struct { +bool active, enable; +struct drm_property_blob *degamma_lut, *gamma_lut, *ctm; +struct drm_display_mode mode, adjusted_mode; + } hw;/** * quirks - bitfield with hw state readout quirks Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH 05/23] drm/i915: Complete sw/hw split
Op 25-09-2019 om 15:01 schreef Ville Syrjälä:
Quoted 11 lines · Maarten Lankhorst
Quoted 6 lines
Now that we separated everything into uapi and hw, it's time to make the split definitive. Remove the union and make a copy of the hw state on modeset and fastset.
Color blobs are copied in crtc
atomic_check(), right before color management is checked.Don't like. IMO there should be one and only one place where copy over the uapi state into the hw state. Otherwise it's a mess because you constantly have to remind yourself which bits of state already got copied and which didn't.
Yeah it's a tad annoying, can always just do it in this loop. We either copy full state on modeset or just the blobs..
Will send a new version.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH 05/23] drm/i915: Complete sw/hw split
In reply to Ville SyrjäläOp 25-09-2019 om 15:01 schreef Ville Syrjälä:
Quoted 11 lines · Maarten Lankhorst
Quoted 6 lines
Now that we separated everything into uapi and hw, it's time to make the split definitive. Remove the union and make a copy of the hw state on modeset and fastset.
Color blobs are copied in crtc
atomic_check(), right before color management is checked.Don't like. IMO there should be one and only one place where copy over the uapi state into the hw state. Otherwise it's a mess because you constantly have to remind yourself which bits of state already got copied and which didn't.
Oh now I remember, because bigjoiner is assigned later on we can't copy blobs yet
and bigjoiner was the whole reaon we wanted separate blobs so it didn't have to look at the other crtc_state..
Would it help if I copy the blobs in intel_color_check() instead?
Quoted 246 lines
Quoted 246 lines
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 44 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 39 +++++++++++++--- .../drm/i915/display/intel_display_types.h | 8 ++-- 4 files changed, 85 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +44
-0@@ -195,6 +195,14 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); +/* copy color blobs */ +if (crtc_state->hw.degamma_lut) +drm_property_blob_get (crtc_state->hw.degamma_lut); +if (crtc_state->hw.ctm) +drm_property_blob_get (crtc_state->hw.ctm); +if (crtc_state->hw.gamma_lut) +drm_property_blob_get (crtc_state->hw.gamma_lut); + crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false;@@ -209,6 +217,41 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)return &crtc_state->uapi; } +static void intel_crtc_put_color_blobs (struct intel_crtc_state *crtc_state) +{ +drm_property_blob_put (crtc_state->hw.degamma_lut); +drm_property_blob_put (crtc_state->hw.gamma_lut); +drm_property_blob_put (crtc_state->hw.ctm); +} + +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); +} + +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); + +if (crtc_state->uapi.degamma_lut) + crtc_state->hw.degamma_lut = +drm_property_blob_get (crtc_state->uapi.degamma_lut); +else + crtc_state->hw.degamma_lut =NULL ; + +if (crtc_state->uapi.gamma_lut) + crtc_state->hw.gamma_lut = +drm_property_blob_get (crtc_state->uapi.gamma_lut); +else + crtc_state->hw.gamma_lut =NULL ; + +if (crtc_state->uapi.ctm) + crtc_state->hw.ctm = +drm_property_blob_get (crtc_state->uapi.ctm); +else + crtc_state->hw.ctm =NULL ; +} +/** * intel_crtc_destroy_state - destroy crtc state * @crtc: drm crtc @@ -224,6 +267,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,struct intel_crtc_state *crtc_state =to_intel_crtc_state (state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);kfree (crtc_state); }drivers/gpu/drm/i915/display/intel_atomic.h +2
-0@@ -35,6 +35,8 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state); +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state); +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *state);drivers/gpu/drm/i915/display/intel_display.c +34
-5@@ -114,6 +114,7 @@ static const u64 cursor_format_modifiers[] = {DRM_FORMAT_MOD_INVALID }; +static void copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state);static void i9xx_crtc_clock_get (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config); static void ironlake_pch_clock_get(struct intel_crtc *crtc,@@ -7097,6 +7098,7 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, crtc->enabled = false; crtc->state->connector_mask =0 ; crtc->state->encoder_mask =0 ; +copy_uapi_to_hw_state (to_intel_crtc_state (crtc->state));for_each_encoder_on_crtc (crtc->dev, crtc, encoder) encoder->base.crtc =NULL ;@@ -11804,6 +11806,9 @@ static int intel_crtc_atomic_check(struct drm_crtc *_crtc,if (mode_changed || crtc_state->update_pipe || crtc_state->uapi.color_mgmt_changed) { +/* Copy color blobs to hw state */ +intel_crtc_copy_color_blobs (crtc_state); + ret =intel_color_check (crtc_state);if (ret)return ret;@@ -12251,6 +12256,22 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state)return ret; } +static void copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->hw.enable = crtc_state->uapi.enable; + crtc_state->hw.active = crtc_state->uapi.active; + crtc_state->hw.mode = crtc_state->uapi.mode; + crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; +} + +static void copy_hw_to_uapi_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->uapi.enable = crtc_state->hw.enable; + crtc_state->uapi.active = crtc_state->hw.active; + crtc_state->uapi.mode = crtc_state->hw.mode; + crtc_state->uapi.adjusted_mode = crtc_state->hw.adjusted_mode; +} +static int clear_intel_crtc_state (struct intel_crtc_state *crtc_state) {@@ -12267,6 +12288,7 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)* fixed, so that the crtc_state can be safely duplicated. For now, * only fields that are know to not cause problems are preserved. */ + saved_state->uapi = crtc_state->uapi; saved_state->scaler_state = crtc_state->scaler_state; saved_state->shared_dpll = crtc_state->shared_dpll; saved_state->dpll_hw_state = crtc_state->dpll_hw_state;@@ -12277,11 +12299,9 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) saved_state->wm = crtc_state->wm; -/* Keep base drm_crtc_state intact, only clear our extended struct */ -BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw)); -memcpy (&crtc_state->uapi +1 , &saved_state->uapi +1 , -sizeof (*crtc_state) -sizeof (crtc_state->uapi)); +intel_crtc_free_hw_state (crtc_state); +memcpy (crtc_state, saved_state,sizeof (*crtc_state)); +copy_uapi_to_hw_state (crtc_state);kfree (saved_state);return 0 ;@@ -12421,6 +12441,9 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)DRM_DEBUG_KMS ("hw max bpp: %i, pipe bpp: %i, dithering: %i\n" , base_bpp, pipe_config->pipe_bpp, pipe_config->dither); +/* uapi wants a copy of the adjusted_mode for vblank bookkeeping */ + pipe_config->uapi.adjusted_mode = pipe_config->hw.adjusted_mode; +return 0 ; }@@ -13142,6 +13165,8 @@ verify_crtc_state(struct intel_crtc *crtc, state = old_crtc_state->uapi.state;__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->uapi); +intel_crtc_free_hw_state (old_crtc_state); + pipe_config = old_crtc_state;memset (pipe_config,0 ,sizeof (*pipe_config)); pipe_config->uapi.crtc = &crtc->base;@@ -13568,6 +13593,7 @@ static int intel_atomic_check(struct drm_device *dev,if (!new_crtc_state->uapi.enable) { any_ms = true; +clear_intel_crtc_state (new_crtc_state);continue ; }@@ -16686,6 +16712,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)to_intel_crtc_state (crtc->base.state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);memset (crtc_state,0 ,sizeof (*crtc_state));__drm_atomic_helper_crtc_reset (&crtc->base, &crtc_state->uapi);@@ -16802,6 +16829,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) crtc->base.mode.vdisplay = crtc_state->pipe_src_h;intel_mode_from_pipe_config (&crtc_state->hw.adjusted_mode, crtc_state); + crtc_state->hw.mode = crtc->base.mode;WARN_ON (drm_atomic_set_mode_for_crtc (crtc->base.state, &crtc->base.mode));/* @@ -16847,6 +16875,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)intel_bw_crtc_update (bw_state, crtc_state); +copy_hw_to_uapi_state (crtc_state);intel_pipe_config_sanity_check (dev_priv, crtc_state); } }drivers/gpu/drm/i915/display/intel_display_types.h +5
-3@@ -749,7 +749,6 @@ enum intel_output_format { };struct intel_crtc_state { -union {/* * uapi (drm) state. This is the software state shown to userspace. * In particular, the following members are used for bookkeeping: @@ -772,8 +771,11 @@ struct intel_crtc_state {* * During initial hw readout, they need to be copied to uapi. */ -struct drm_crtc_state hw; - }; +struct { +bool active, enable; +struct drm_property_blob *degamma_lut, *gamma_lut, *ctm; +struct drm_display_mode mode, adjusted_mode; + } hw;/** * quirks - bitfield with hw state readout quirks Signature · 1 line
2.20.1
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/23] drm/i915: Complete sw/hw split
Quoted 13 lines · Maarten Lankhorst
Op 25-09-2019 om 15:01 schreef Ville Syrjälä:
Quoted 11 lines · Maarten Lankhorst
Quoted 6 lines
Now that we separated everything into uapi and hw, it's time to make the split definitive. Remove the union and make a copy of the hw state on modeset and fastset.
Color blobs are copied in crtc
atomic_check(), right before color management is checked.Don't like. IMO there should be one and only one place where copy over the uapi state into the hw state. Otherwise it's a mess because you constantly have to remind yourself which bits of state already got copied and which didn't.
Quoted 5 lines
Oh now I remember, because bigjoiner is assigned later on we can't copy blobs yet
and bigjoiner was the whole reaon we wanted separate blobs so it didn't have to look at the other
crtc_state..Would it help if I copy the blobs in
intel_color_check()instead?
Can't we just do something like:
drm_atomic_helper_check_modeset();
for_each_crtc_in_state() {
if (crtc_state->enable)
copy_uapi_to_hw();
}compute_config() {
if (need_bigjoiner) {
get_other_crtc_state();
if (other_crtc_state->uapi.enable)
fail;
other_hw = current_hw;
adjust_hw_state_for_bigjoiner(other_hw);
}
}?
Quoted 252 lines
Quoted 251 lines
Quoted 251 lines
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 44 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_atomic.h | 2 + drivers/gpu/drm/i915/display/intel_display.c | 39 +++++++++++++--- .../drm/i915/display/intel_display_types.h | 8 ++-- 4 files changed, 85 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +44
-0@@ -195,6 +195,14 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)__drm_atomic_helper_crtc_duplicate_state (crtc, &crtc_state->uapi); +/* copy color blobs */ +if (crtc_state->hw.degamma_lut) +drm_property_blob_get (crtc_state->hw.degamma_lut); +if (crtc_state->hw.ctm) +drm_property_blob_get (crtc_state->hw.ctm); +if (crtc_state->hw.gamma_lut) +drm_property_blob_get (crtc_state->hw.gamma_lut); + crtc_state->update_pipe = false; crtc_state->disable_lp_wm = false; crtc_state->disable_cxsr = false;@@ -209,6 +217,41 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)return &crtc_state->uapi; } +static void intel_crtc_put_color_blobs (struct intel_crtc_state *crtc_state) +{ +drm_property_blob_put (crtc_state->hw.degamma_lut); +drm_property_blob_put (crtc_state->hw.gamma_lut); +drm_property_blob_put (crtc_state->hw.ctm); +} + +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); +} + +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state) +{ +intel_crtc_put_color_blobs (crtc_state); + +if (crtc_state->uapi.degamma_lut) + crtc_state->hw.degamma_lut = +drm_property_blob_get (crtc_state->uapi.degamma_lut); +else + crtc_state->hw.degamma_lut =NULL ; + +if (crtc_state->uapi.gamma_lut) + crtc_state->hw.gamma_lut = +drm_property_blob_get (crtc_state->uapi.gamma_lut); +else + crtc_state->hw.gamma_lut =NULL ; + +if (crtc_state->uapi.ctm) + crtc_state->hw.ctm = +drm_property_blob_get (crtc_state->uapi.ctm); +else + crtc_state->hw.ctm =NULL ; +} +/** * intel_crtc_destroy_state - destroy crtc state * @crtc: drm crtc @@ -224,6 +267,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,struct intel_crtc_state *crtc_state =to_intel_crtc_state (state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);kfree (crtc_state); }drivers/gpu/drm/i915/display/intel_atomic.h +2
-0@@ -35,6 +35,8 @@ intel_digital_connector_duplicate_state(struct drm_connector *connector);struct drm_crtc_state *intel_crtc_duplicate_state (struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state); +void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state); +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *state);drivers/gpu/drm/i915/display/intel_display.c +34
-5@@ -114,6 +114,7 @@ static const u64 cursor_format_modifiers[] = {DRM_FORMAT_MOD_INVALID }; +static void copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state);static void i9xx_crtc_clock_get (struct intel_crtc *crtc,struct intel_crtc_state *pipe_config); static void ironlake_pch_clock_get(struct intel_crtc *crtc,@@ -7097,6 +7098,7 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc, crtc->enabled = false; crtc->state->connector_mask =0 ; crtc->state->encoder_mask =0 ; +copy_uapi_to_hw_state (to_intel_crtc_state (crtc->state));for_each_encoder_on_crtc (crtc->dev, crtc, encoder) encoder->base.crtc =NULL ;@@ -11804,6 +11806,9 @@ static int intel_crtc_atomic_check(struct drm_crtc *_crtc,if (mode_changed || crtc_state->update_pipe || crtc_state->uapi.color_mgmt_changed) { +/* Copy color blobs to hw state */ +intel_crtc_copy_color_blobs (crtc_state); + ret =intel_color_check (crtc_state);if (ret)return ret;@@ -12251,6 +12256,22 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state)return ret; } +static void copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->hw.enable = crtc_state->uapi.enable; + crtc_state->hw.active = crtc_state->uapi.active; + crtc_state->hw.mode = crtc_state->uapi.mode; + crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; +} + +static void copy_hw_to_uapi_state (struct intel_crtc_state *crtc_state) +{ + crtc_state->uapi.enable = crtc_state->hw.enable; + crtc_state->uapi.active = crtc_state->hw.active; + crtc_state->uapi.mode = crtc_state->hw.mode; + crtc_state->uapi.adjusted_mode = crtc_state->hw.adjusted_mode; +} +static int clear_intel_crtc_state (struct intel_crtc_state *crtc_state) {@@ -12267,6 +12288,7 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state)* fixed, so that the crtc_state can be safely duplicated. For now, * only fields that are know to not cause problems are preserved. */ + saved_state->uapi = crtc_state->uapi; saved_state->scaler_state = crtc_state->scaler_state; saved_state->shared_dpll = crtc_state->shared_dpll; saved_state->dpll_hw_state = crtc_state->dpll_hw_state;@@ -12277,11 +12299,9 @@ clear_intel_crtc_state(struct intel_crtc_state *crtc_state) IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) saved_state->wm = crtc_state->wm; -/* Keep base drm_crtc_state intact, only clear our extended struct */ -BUILD_BUG_ON (offsetof(struct intel_crtc_state , uapi)); -BUILD_BUG_ON (offsetof(struct intel_crtc_state , hw)); -memcpy (&crtc_state->uapi +1 , &saved_state->uapi +1 , -sizeof (*crtc_state) -sizeof (crtc_state->uapi)); +intel_crtc_free_hw_state (crtc_state); +memcpy (crtc_state, saved_state,sizeof (*crtc_state)); +copy_uapi_to_hw_state (crtc_state);kfree (saved_state);return 0 ;@@ -12421,6 +12441,9 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)DRM_DEBUG_KMS ("hw max bpp: %i, pipe bpp: %i, dithering: %i\n" , base_bpp, pipe_config->pipe_bpp, pipe_config->dither); +/* uapi wants a copy of the adjusted_mode for vblank bookkeeping */ + pipe_config->uapi.adjusted_mode = pipe_config->hw.adjusted_mode; +return 0 ; }@@ -13142,6 +13165,8 @@ verify_crtc_state(struct intel_crtc *crtc, state = old_crtc_state->uapi.state;__drm_atomic_helper_crtc_destroy_state (&old_crtc_state->uapi); +intel_crtc_free_hw_state (old_crtc_state); + pipe_config = old_crtc_state;memset (pipe_config,0 ,sizeof (*pipe_config)); pipe_config->uapi.crtc = &crtc->base;@@ -13568,6 +13593,7 @@ static int intel_atomic_check(struct drm_device *dev,if (!new_crtc_state->uapi.enable) { any_ms = true; +clear_intel_crtc_state (new_crtc_state);continue ; }@@ -16686,6 +16712,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)to_intel_crtc_state (crtc->base.state);__drm_atomic_helper_crtc_destroy_state (&crtc_state->uapi); +intel_crtc_free_hw_state (crtc_state);memset (crtc_state,0 ,sizeof (*crtc_state));__drm_atomic_helper_crtc_reset (&crtc->base, &crtc_state->uapi);@@ -16802,6 +16829,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) crtc->base.mode.vdisplay = crtc_state->pipe_src_h;intel_mode_from_pipe_config (&crtc_state->hw.adjusted_mode, crtc_state); + crtc_state->hw.mode = crtc->base.mode;WARN_ON (drm_atomic_set_mode_for_crtc (crtc->base.state, &crtc->base.mode));/* @@ -16847,6 +16875,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)intel_bw_crtc_update (bw_state, crtc_state); +copy_hw_to_uapi_state (crtc_state);intel_pipe_config_sanity_check (dev_priv, crtc_state); } }drivers/gpu/drm/i915/display/intel_display_types.h +5
-3@@ -749,7 +749,6 @@ enum intel_output_format { };struct intel_crtc_state { -union {/* * uapi (drm) state. This is the software state shown to userspace. * In particular, the following members are used for bookkeeping: @@ -772,8 +771,11 @@ struct intel_crtc_state {* * During initial hw readout, they need to be copied to uapi. */ -struct drm_crtc_state hw; - }; +struct { +bool active, enable; +struct drm_property_blob *degamma_lut, *gamma_lut, *ctm; +struct drm_display_mode mode, adjusted_mode; + } hw;/** * quirks - bitfield with hw state readout quirks Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 6/23 drm/i915: Get rid of crtc_state->fb_changed
In reply to Maarten LankhorstWe had this as an optimization to not do a plane update, but we killed it off because there are so many reasons we may have to do a plane update or fastset that it's best to just assume everything changed.
--- drivers/gpu/drm/i915/display/intel_atomic.c | 1 - drivers/gpu/drm/i915/display/intel_display.c | 10 +--------- drivers/gpu/drm/i915/display/intel_display_types.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +0 -1
@@ -208,7 +208,6 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) crtc_state->disable_cxsr = false; crtc_state->update_wm_pre = false; crtc_state->update_wm_post = false; - crtc_state->fb_changed = false; crtc_state->fifo_changed = false; crtc_state->wm.need_postvbl_update = false; crtc_state->fb_bits =0 ;
drivers/gpu/drm/i915/display/intel_display.c +1 -9
@@ -11521,7 +11521,6 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_statbool was_crtc_enabled = old_crtc_state->hw.active;bool is_crtc_enabled = crtc_state->hw.active;bool turn_off, turn_on, visible, was_visible; -struct drm_framebuffer *fb = plane_state->base.fb;int ret;if (INTEL_GEN (dev_priv) >=9 && plane->id !=PLANE_CURSOR ) {
@@ -11555,18 +11554,11 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_statif (!was_visible && !visible)return 0 ; -if (fb != old_plane_state->base.fb) - crtc_state->fb_changed = true; - turn_off = was_visible && (!visible || mode_changed); turn_on = visible && (!was_visible || mode_changed); -DRM_DEBUG_ATOMIC ("[CRTC:%d:%s] has [PLANE:%d:%s] with fb %i\n" , +DRM_DEBUG_ATOMIC ("[CRTC:%d:%s] with [PLANE:%d:%s] visible %i -> %i, off %i, on %i, ms %i\n" , crtc->base.base.id, crtc->base.name, - plane->base.base.id, plane->base.name, - fb ? fb->base.id :-1 ); - -DRM_DEBUG_ATOMIC ("[PLANE:%d:%s] visible %i -> %i, off %i, on %i, ms %i\n" , plane->base.base.id, plane->base.name, was_visible, visible, turn_off, turn_on, mode_changed);
drivers/gpu/drm/i915/display/intel_display_types.h +0 -1
@@ -792,7 +792,6 @@ struct intel_crtc_state {bool update_pipe;/* can a fast modeset be performed? */ bool disable_cxsr;bool update_wm_pre, update_wm_post;/* watermarks are updated */ -bool fb_changed;/* fb on any of the planes is changed */ bool fifo_changed;/* FIFO split is changed */ /* Pipe source size (ie. panel fitter input size)
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 06/23] drm/i915: Get rid of crtc_state->fb_changed
Quoted 5 lines · Maarten Lankhorst
We had this as an optimization to not do a plane update, but we killed it off because there are so many reasons we may have to do a plane update or fastset that it's best to just assume everything changed.
Signed-off-by Maarten Lankhorst <[email protected]>
Quoted 69 lines
--- drivers/gpu/drm/i915/display/intel_atomic.c | 1 - drivers/gpu/drm/i915/display/intel_display.c | 10 +--------- drivers/gpu/drm/i915/display/intel_display_types.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +0
-1@@ -208,7 +208,6 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) crtc_state->disable_cxsr = false; crtc_state->update_wm_pre = false; crtc_state->update_wm_post = false; - crtc_state->fb_changed = false; crtc_state->fifo_changed = false; crtc_state->wm.need_postvbl_update = false; crtc_state->fb_bits =0 ;drivers/gpu/drm/i915/display/intel_display.c +1
-9@@ -11521,7 +11521,6 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_statbool was_crtc_enabled = old_crtc_state->hw.active;bool is_crtc_enabled = crtc_state->hw.active;bool turn_off, turn_on, visible, was_visible; -struct drm_framebuffer *fb = plane_state->base.fb;int ret;if (INTEL_GEN (dev_priv) >=9 && plane->id !=PLANE_CURSOR ) {@@ -11555,18 +11554,11 @@ int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_statif (!was_visible && !visible)return 0 ; -if (fb != old_plane_state->base.fb) - crtc_state->fb_changed = true; - turn_off = was_visible && (!visible || mode_changed); turn_on = visible && (!was_visible || mode_changed); -DRM_DEBUG_ATOMIC ("[CRTC:%d:%s] has [PLANE:%d:%s] with fb %i\n" , +DRM_DEBUG_ATOMIC ("[CRTC:%d:%s] with [PLANE:%d:%s] visible %i -> %i, off %i, on %i, ms %i\n" , crtc->base.base.id, crtc->base.name, - plane->base.base.id, plane->base.name, - fb ? fb->base.id :-1 ); - -DRM_DEBUG_ATOMIC ("[PLANE:%d:%s] visible %i -> %i, off %i, on %i, ms %i\n" , plane->base.base.id, plane->base.name, was_visible, visible, turn_off, turn_on, mode_changed);drivers/gpu/drm/i915/display/intel_display_types.h +0
-1@@ -792,7 +792,6 @@ struct intel_crtc_state {bool update_pipe;/* can a fast modeset be performed? */ bool disable_cxsr;bool update_wm_pre, update_wm_post;/* watermarks are updated */ -bool fb_changed;/* fb on any of the planes is changed */ bool fifo_changed;/* FIFO split is changed */ /* Pipe source size (ie. panel fitter input size) Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 7/23 drm/i915: Remove begin/finish_crtc_commit.
In reply to Maarten LankhorstThis can all be done from the intel_update_crtc function. Split out the pipe update into a separate function, just like is done for the planes.
--- drivers/gpu/drm/i915/display/intel_display.c | 124 ++++++++----------- 1 file changed, 52 insertions(+), 72 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +52 -72
@@ -136,8 +136,6 @@ static void vlv_prepare_pll(struct intel_crtc *crtc, const struct intel_crtc_state *pipe_config);static void chv_prepare_pll (struct intel_crtc *crtc,const struct intel_crtc_state *pipe_config); -static void intel_begin_crtc_commit (struct intel_atomic_state *,struct intel_crtc *); -static void intel_finish_crtc_commit (struct intel_atomic_state *,struct intel_crtc *);static void intel_crtc_init_scalers (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state);static void skylake_pfit_enable (const struct intel_crtc_state *crtc_state);
@@ -13673,13 +13671,54 @@ u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc)return crtc->base.funcs->get_vblank_counter (&crtc->base); } +void intel_crtc_arm_fifo_underrun (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); + +if (!IS_GEN (dev_priv,2 )) +intel_set_cpu_fifo_underrun_reporting (dev_priv, crtc->pipe, true); + +if (crtc_state->has_pch_encoder) { +enum pipe pch_transcoder = +intel_crtc_pch_transcoder (crtc); + +intel_set_pch_fifo_underrun_reporting (dev_priv, pch_transcoder, true); + } +} + +static void commit_pipe_config (struct intel_atomic_state *state, +struct intel_crtc_state *old_crtc_state, +struct intel_crtc_state *new_crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +bool modeset =needs_modeset (new_crtc_state); + +if (!modeset) { +if (new_crtc_state->uapi.color_mgmt_changed || + new_crtc_state->update_pipe) +intel_color_commit (new_crtc_state); + +if (new_crtc_state->update_pipe) +intel_update_pipe_config (old_crtc_state, new_crtc_state); +else if (INTEL_GEN (dev_priv) >=9 ) +skl_detach_scalers (new_crtc_state); + +if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) +bdw_set_pipemisc (new_crtc_state); + } + +if (dev_priv->display.atomic_update_watermarks) + dev_priv->display.atomic_update_watermarks (state, + new_crtc_state); +} +static void intel_update_crtc (struct intel_crtc *crtc,struct intel_atomic_state *state,struct intel_crtc_state *old_crtc_state,struct intel_crtc_state *new_crtc_state) { -struct drm_device *dev = state->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (state->base.dev);bool modeset =needs_modeset (new_crtc_state);struct intel_plane_state *new_plane_state = intel_atomic_get_new_plane_state(state,
@@ -13703,14 +13742,21 @@ static void intel_update_crtc(struct intel_crtc *crtc,else if (new_plane_state)intel_fbc_enable (crtc, new_crtc_state, new_plane_state); -intel_begin_crtc_commit (state, crtc); +/* Perform vblank evasion around commit operation */ +intel_pipe_update_start (new_crtc_state); + +commit_pipe_config (state, old_crtc_state, new_crtc_state);if (INTEL_GEN (dev_priv) >=9 )skl_update_planes_on_crtc (state, crtc);else i9xx_update_planes_on_crtc (state, crtc); -intel_finish_crtc_commit (state, crtc); +intel_pipe_update_end (new_crtc_state); + +if (new_crtc_state->update_pipe && !modeset && + old_crtc_state->hw.mode.private_flags &I915_MODE_FLAG_INHERITED ) +intel_crtc_arm_fifo_underrun (crtc, new_crtc_state); } static void intel_old_crtc_state_disables(struct intel_atomic_state *state,
@@ -14507,72 +14553,6 @@ skl_max_scale(const struct intel_crtc_state *crtc_state,return max_scale; } -static void intel_begin_crtc_commit (struct intel_atomic_state *state, -struct intel_crtc *crtc) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -struct intel_crtc_state *old_crtc_state = -intel_atomic_get_old_crtc_state (state, crtc); -struct intel_crtc_state *new_crtc_state = -intel_atomic_get_new_crtc_state (state, crtc); -bool modeset =needs_modeset (new_crtc_state); - -/* Perform vblank evasion around commit operation */ -intel_pipe_update_start (new_crtc_state); - -if (modeset) - goto out; - -if (new_crtc_state->uapi.color_mgmt_changed || - new_crtc_state->update_pipe) -intel_color_commit (new_crtc_state); - -if (new_crtc_state->update_pipe) -intel_update_pipe_config (old_crtc_state, new_crtc_state); -else if (INTEL_GEN (dev_priv) >=9 ) -skl_detach_scalers (new_crtc_state); - -if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) -bdw_set_pipemisc (new_crtc_state); - -out: -if (dev_priv->display.atomic_update_watermarks) - dev_priv->display.atomic_update_watermarks (state, - new_crtc_state); -} - -void intel_crtc_arm_fifo_underrun (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); - -if (!IS_GEN (dev_priv,2 )) -intel_set_cpu_fifo_underrun_reporting (dev_priv, crtc->pipe, true); - -if (crtc_state->has_pch_encoder) { -enum pipe pch_transcoder = -intel_crtc_pch_transcoder (crtc); - -intel_set_pch_fifo_underrun_reporting (dev_priv, pch_transcoder, true); - } -} - -static void intel_finish_crtc_commit (struct intel_atomic_state *state, -struct intel_crtc *crtc) -{ -struct intel_crtc_state *old_crtc_state = -intel_atomic_get_old_crtc_state (state, crtc); -struct intel_crtc_state *new_crtc_state = -intel_atomic_get_new_crtc_state (state, crtc); - -intel_pipe_update_end (new_crtc_state); - -if (new_crtc_state->update_pipe && - !needs_modeset (new_crtc_state) && - old_crtc_state->hw.mode.private_flags &I915_MODE_FLAG_INHERITED ) -intel_crtc_arm_fifo_underrun (crtc, new_crtc_state); -} -/** * intel_plane_destroy - destroy a plane * @plane: plane to destroy
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/23] drm/i915: Remove begin/finish_crtc_commit.
Quoted 4 lines · Maarten Lankhorst
This can all be done from the
intel_update_crtcfunction. Split out the pipe update into a separate function, just like is done for the planes.Signed-off-by Maarten Lankhorst <[email protected]>
The code here all looks logically correct, but I think our various pipe functions are still somewhat confusing. E.g., intel_update_pipe_config() and commit_pipe_config() have names that make it sound like they're doing the same thing. At the moment intel_update_pipe_config() is basically the fastset-specific stuff, but is there any reason most of those operations can't just be done on all commits? Re-writing the pfit/scaler registers or pipe chicken seems like a pretty small number of registers to try to avoid.
If we want to keep them separate, I'd suggest renaming intel_update_pipe_config() (and probably the 'update_pipe' flag too) to make it more clear that it's meant for the fastset special case.
Matt
Quoted 178 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 124 ++++++++----------- 1 file changed, 52 insertions(+), 72 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +52
-72@@ -136,8 +136,6 @@ static void vlv_prepare_pll(struct intel_crtc *crtc, const struct intel_crtc_state *pipe_config);static void chv_prepare_pll (struct intel_crtc *crtc,const struct intel_crtc_state *pipe_config); -static void intel_begin_crtc_commit (struct intel_atomic_state *,struct intel_crtc *); -static void intel_finish_crtc_commit (struct intel_atomic_state *,struct intel_crtc *);static void intel_crtc_init_scalers (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state);static void skylake_pfit_enable (const struct intel_crtc_state *crtc_state);@@ -13673,13 +13671,54 @@ u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc)return crtc->base.funcs->get_vblank_counter (&crtc->base); } +void intel_crtc_arm_fifo_underrun (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); + +if (!IS_GEN (dev_priv,2 )) +intel_set_cpu_fifo_underrun_reporting (dev_priv, crtc->pipe, true); + +if (crtc_state->has_pch_encoder) { +enum pipe pch_transcoder = +intel_crtc_pch_transcoder (crtc); + +intel_set_pch_fifo_underrun_reporting (dev_priv, pch_transcoder, true); + } +} + +static void commit_pipe_config (struct intel_atomic_state *state, +struct intel_crtc_state *old_crtc_state, +struct intel_crtc_state *new_crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +bool modeset =needs_modeset (new_crtc_state); + +if (!modeset) { +if (new_crtc_state->uapi.color_mgmt_changed || + new_crtc_state->update_pipe) +intel_color_commit (new_crtc_state); + +if (new_crtc_state->update_pipe) +intel_update_pipe_config (old_crtc_state, new_crtc_state); +else if (INTEL_GEN (dev_priv) >=9 ) +skl_detach_scalers (new_crtc_state); + +if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) +bdw_set_pipemisc (new_crtc_state); + } + +if (dev_priv->display.atomic_update_watermarks) + dev_priv->display.atomic_update_watermarks (state, + new_crtc_state); +} +static void intel_update_crtc (struct intel_crtc *crtc,struct intel_atomic_state *state,struct intel_crtc_state *old_crtc_state,struct intel_crtc_state *new_crtc_state) { -struct drm_device *dev = state->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (state->base.dev);bool modeset =needs_modeset (new_crtc_state);struct intel_plane_state *new_plane_state = intel_atomic_get_new_plane_state(state,@@ -13703,14 +13742,21 @@ static void intel_update_crtc(struct intel_crtc *crtc,else if (new_plane_state)intel_fbc_enable (crtc, new_crtc_state, new_plane_state); -intel_begin_crtc_commit (state, crtc); +/* Perform vblank evasion around commit operation */ +intel_pipe_update_start (new_crtc_state); + +commit_pipe_config (state, old_crtc_state, new_crtc_state);if (INTEL_GEN (dev_priv) >=9 )skl_update_planes_on_crtc (state, crtc);else i9xx_update_planes_on_crtc (state, crtc); -intel_finish_crtc_commit (state, crtc); +intel_pipe_update_end (new_crtc_state); + +if (new_crtc_state->update_pipe && !modeset && + old_crtc_state->hw.mode.private_flags &I915_MODE_FLAG_INHERITED ) +intel_crtc_arm_fifo_underrun (crtc, new_crtc_state); } static void intel_old_crtc_state_disables(struct intel_atomic_state *state,@@ -14507,72 +14553,6 @@ skl_max_scale(const struct intel_crtc_state *crtc_state,return max_scale; } -static void intel_begin_crtc_commit (struct intel_atomic_state *state, -struct intel_crtc *crtc) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -struct intel_crtc_state *old_crtc_state = -intel_atomic_get_old_crtc_state (state, crtc); -struct intel_crtc_state *new_crtc_state = -intel_atomic_get_new_crtc_state (state, crtc); -bool modeset =needs_modeset (new_crtc_state); - -/* Perform vblank evasion around commit operation */ -intel_pipe_update_start (new_crtc_state); - -if (modeset) - goto out; - -if (new_crtc_state->uapi.color_mgmt_changed || - new_crtc_state->update_pipe) -intel_color_commit (new_crtc_state); - -if (new_crtc_state->update_pipe) -intel_update_pipe_config (old_crtc_state, new_crtc_state); -else if (INTEL_GEN (dev_priv) >=9 ) -skl_detach_scalers (new_crtc_state); - -if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) -bdw_set_pipemisc (new_crtc_state); - -out: -if (dev_priv->display.atomic_update_watermarks) - dev_priv->display.atomic_update_watermarks (state, - new_crtc_state); -} - -void intel_crtc_arm_fifo_underrun (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); - -if (!IS_GEN (dev_priv,2 )) -intel_set_cpu_fifo_underrun_reporting (dev_priv, crtc->pipe, true); - -if (crtc_state->has_pch_encoder) { -enum pipe pch_transcoder = -intel_crtc_pch_transcoder (crtc); - -intel_set_pch_fifo_underrun_reporting (dev_priv, pch_transcoder, true); - } -} - -static void intel_finish_crtc_commit (struct intel_atomic_state *state, -struct intel_crtc *crtc) -{ -struct intel_crtc_state *old_crtc_state = -intel_atomic_get_old_crtc_state (state, crtc); -struct intel_crtc_state *new_crtc_state = -intel_atomic_get_new_crtc_state (state, crtc); - -intel_pipe_update_end (new_crtc_state); - -if (new_crtc_state->update_pipe && - !needs_modeset (new_crtc_state) && - old_crtc_state->hw.mode.private_flags &I915_MODE_FLAG_INHERITED ) -intel_crtc_arm_fifo_underrun (crtc, new_crtc_state); -} -/** * intel_plane_destroy - destroy a plane * @plane: plane to destroy Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH 07/23] drm/i915: Remove begin/finish_crtc_commit.
Op 25-09-2019 om 06:17 schreef Matt Roper:
Quoted 14 lines · Maarten Lankhorst
Quoted 4 lines
This can all be done from the
intel_update_crtcfunction. Split out the pipe update into a separate function, just like is done for the planes.Signed-off-by Maarten Lankhorst <[email protected]>The code here all looks logically correct, but I think our various pipe functions are still somewhat confusing. E.g.,
intel_update_pipe_config()andcommit_pipe_config()have names that make it sound like they're doing the same thing. At the momentintel_update_pipe_config()is basically the fastset-specific stuff, but is there any reason most of those operations can't just be done on all commits? Re-writing the pfit/scaler registers or pipe chicken seems like a pretty small number of registers to try to avoid.
Quoted 4 lines
If we want to keep them separate, I'd suggest renaming
intel_update_pipe_config()(and probably the 'update_pipe' flag too) to make it more clear that it's meant for the fastset special case.
I'm sending a new version with intel_update_pipe_config inlined.
It makes sense to avoid, especially the chicken bits because that function performs a read as well.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 07/23] drm/i915: Remove begin/finish_crtc_commit.
In reply to Maarten LankhorstHi Maarten,
Could you hold off on merging this patch and big joiner enabling patch else my 2p2p series which is almost ready to merge except for the final r-b from you on the HW state patch will need to rebased and that will delay the landing of the series.
Manasi
Quoted 182 lines · Maarten Lankhorst
This can all be done from the
intel_update_crtcfunction. Split out the pipe update into a separate function, just like is done for the planes.Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 124 ++++++++----------- 1 file changed, 52 insertions(+), 72 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +52
-72@@ -136,8 +136,6 @@ static void vlv_prepare_pll(struct intel_crtc *crtc, const struct intel_crtc_state *pipe_config);static void chv_prepare_pll (struct intel_crtc *crtc,const struct intel_crtc_state *pipe_config); -static void intel_begin_crtc_commit (struct intel_atomic_state *,struct intel_crtc *); -static void intel_finish_crtc_commit (struct intel_atomic_state *,struct intel_crtc *);static void intel_crtc_init_scalers (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state);static void skylake_pfit_enable (const struct intel_crtc_state *crtc_state);@@ -13673,13 +13671,54 @@ u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc)return crtc->base.funcs->get_vblank_counter (&crtc->base); } +void intel_crtc_arm_fifo_underrun (struct intel_crtc *crtc, +struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); + +if (!IS_GEN (dev_priv,2 )) +intel_set_cpu_fifo_underrun_reporting (dev_priv, crtc->pipe, true); + +if (crtc_state->has_pch_encoder) { +enum pipe pch_transcoder = +intel_crtc_pch_transcoder (crtc); + +intel_set_pch_fifo_underrun_reporting (dev_priv, pch_transcoder, true); + } +} + +static void commit_pipe_config (struct intel_atomic_state *state, +struct intel_crtc_state *old_crtc_state, +struct intel_crtc_state *new_crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (state->base.dev); +bool modeset =needs_modeset (new_crtc_state); + +if (!modeset) { +if (new_crtc_state->uapi.color_mgmt_changed || + new_crtc_state->update_pipe) +intel_color_commit (new_crtc_state); + +if (new_crtc_state->update_pipe) +intel_update_pipe_config (old_crtc_state, new_crtc_state); +else if (INTEL_GEN (dev_priv) >=9 ) +skl_detach_scalers (new_crtc_state); + +if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) +bdw_set_pipemisc (new_crtc_state); + } + +if (dev_priv->display.atomic_update_watermarks) + dev_priv->display.atomic_update_watermarks (state, + new_crtc_state); +} +static void intel_update_crtc (struct intel_crtc *crtc,struct intel_atomic_state *state,struct intel_crtc_state *old_crtc_state,struct intel_crtc_state *new_crtc_state) { -struct drm_device *dev = state->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *dev_priv =to_i915 (state->base.dev);bool modeset =needs_modeset (new_crtc_state);struct intel_plane_state *new_plane_state = intel_atomic_get_new_plane_state(state,@@ -13703,14 +13742,21 @@ static void intel_update_crtc(struct intel_crtc *crtc,else if (new_plane_state)intel_fbc_enable (crtc, new_crtc_state, new_plane_state); -intel_begin_crtc_commit (state, crtc); +/* Perform vblank evasion around commit operation */ +intel_pipe_update_start (new_crtc_state); + +commit_pipe_config (state, old_crtc_state, new_crtc_state);if (INTEL_GEN (dev_priv) >=9 )skl_update_planes_on_crtc (state, crtc);else i9xx_update_planes_on_crtc (state, crtc); -intel_finish_crtc_commit (state, crtc); +intel_pipe_update_end (new_crtc_state); + +if (new_crtc_state->update_pipe && !modeset && + old_crtc_state->hw.mode.private_flags &I915_MODE_FLAG_INHERITED ) +intel_crtc_arm_fifo_underrun (crtc, new_crtc_state); } static void intel_old_crtc_state_disables(struct intel_atomic_state *state,@@ -14507,72 +14553,6 @@ skl_max_scale(const struct intel_crtc_state *crtc_state,return max_scale; } -static void intel_begin_crtc_commit (struct intel_atomic_state *state, -struct intel_crtc *crtc) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -struct intel_crtc_state *old_crtc_state = -intel_atomic_get_old_crtc_state (state, crtc); -struct intel_crtc_state *new_crtc_state = -intel_atomic_get_new_crtc_state (state, crtc); -bool modeset =needs_modeset (new_crtc_state); - -/* Perform vblank evasion around commit operation */ -intel_pipe_update_start (new_crtc_state); - -if (modeset) - goto out; - -if (new_crtc_state->uapi.color_mgmt_changed || - new_crtc_state->update_pipe) -intel_color_commit (new_crtc_state); - -if (new_crtc_state->update_pipe) -intel_update_pipe_config (old_crtc_state, new_crtc_state); -else if (INTEL_GEN (dev_priv) >=9 ) -skl_detach_scalers (new_crtc_state); - -if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv)) -bdw_set_pipemisc (new_crtc_state); - -out: -if (dev_priv->display.atomic_update_watermarks) - dev_priv->display.atomic_update_watermarks (state, - new_crtc_state); -} - -void intel_crtc_arm_fifo_underrun (struct intel_crtc *crtc, -struct intel_crtc_state *crtc_state) -{ -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); - -if (!IS_GEN (dev_priv,2 )) -intel_set_cpu_fifo_underrun_reporting (dev_priv, crtc->pipe, true); - -if (crtc_state->has_pch_encoder) { -enum pipe pch_transcoder = -intel_crtc_pch_transcoder (crtc); - -intel_set_pch_fifo_underrun_reporting (dev_priv, pch_transcoder, true); - } -} - -static void intel_finish_crtc_commit (struct intel_atomic_state *state, -struct intel_crtc *crtc) -{ -struct intel_crtc_state *old_crtc_state = -intel_atomic_get_old_crtc_state (state, crtc); -struct intel_crtc_state *new_crtc_state = -intel_atomic_get_new_crtc_state (state, crtc); - -intel_pipe_update_end (new_crtc_state); - -if (new_crtc_state->update_pipe && - !needs_modeset (new_crtc_state) && - old_crtc_state->hw.mode.private_flags &I915_MODE_FLAG_INHERITED ) -intel_crtc_arm_fifo_underrun (crtc, new_crtc_state); -} -/** * intel_plane_destroy - destroy a plane * @plane: plane to destroy Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 8/23 drm/i915: Rename planar linked plane variables
In reply to Maarten LankhorstRename linked_plane to planar_linked_plane and slave to planar_slave, this will make it easier to keep apart bigjoiner linking and planar plane linking.
--- drivers/gpu/drm/i915/display/intel_atomic.c | 7 ++++-- .../gpu/drm/i915/display/intel_atomic_plane.c | 4 ++-- drivers/gpu/drm/i915/display/intel_display.c | 22 +++++++++---------- .../drm/i915/display/intel_display_types.h | 8 +++---- drivers/gpu/drm/i915/display/intel_sprite.c | 4 ++-- drivers/gpu/drm/i915/intel_pm.c | 12 +++++----- 6 files changed, 30 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +5 -2
@@ -311,10 +311,13 @@ static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_sta*/ mode =PS_SCALER_MODE_NORMAL ; }else { +struct intel_plane *linked = + plane_state->planar_linked_plane; + mode =PS_SCALER_MODE_PLANAR ; -if (plane_state->linked_plane) - mode |=PS_PLANE_Y_SEL (plane_state->linked_plane->id); +if (linked) + mode |=PS_PLANE_Y_SEL (linked->id); } }else if (INTEL_GEN (dev_priv) >9 ||IS_GEMINILAKE (dev_priv)) { mode =PS_SCALER_MODE_NORMAL ;
drivers/gpu/drm/i915/display/intel_atomic_plane.c +2 -2
@@ -321,9 +321,9 @@ void skl_update_planes_on_crtc(struct intel_atomic_state *state,if (new_plane_state->base.visible) {intel_update_plane (plane, new_crtc_state, new_plane_state); - }else if (new_plane_state->slave) { + }else if (new_plane_state->planar_slave) {struct intel_plane *master = - new_plane_state->linked_plane; + new_plane_state->planar_linked_plane;/* * We update the slave plane from this function because
drivers/gpu/drm/i915/display/intel_display.c +11 -11
@@ -11666,7 +11666,7 @@ static int icl_add_linked_planes(struct intel_atomic_state *state)int i;for_each_new_intel_plane_in_state (state, plane, plane_state, i) { - linked = plane_state->linked_plane; + linked = plane_state->planar_linked_plane;if (!linked)continue ;
@@ -11675,8 +11675,8 @@ static int icl_add_linked_planes(struct intel_atomic_state *state)if (IS_ERR (linked_plane_state))return PTR_ERR (linked_plane_state); -WARN_ON (linked_plane_state->linked_plane != plane); -WARN_ON (linked_plane_state->slave == plane_state->slave); +WARN_ON (linked_plane_state->planar_linked_plane != plane); +WARN_ON (linked_plane_state->planar_slave == plane_state->planar_slave); }return 0 ;
@@ -11699,16 +11699,16 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)* in the crtc_state->active_planes mask. */ for_each_new_intel_plane_in_state (state, plane, plane_state, i) { -if (plane->pipe != crtc->pipe || !plane_state->linked_plane) +if (plane->pipe != crtc->pipe || !plane_state->planar_linked_plane)continue ; - plane_state->linked_plane =NULL ; -if (plane_state->slave && !plane_state->base.visible) { + plane_state->planar_linked_plane =NULL ; +if (plane_state->planar_slave && !plane_state->base.visible) { crtc_state->active_planes &= ~BIT (plane->id); crtc_state->update_planes |=BIT (plane->id); } - plane_state->slave = false; + plane_state->planar_slave = false; }if (!crtc_state->nv12_planes)
@@ -11742,10 +11742,10 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)return -EINVAL ; } - plane_state->linked_plane = linked; + plane_state->planar_linked_plane = linked; - linked_state->slave = true; - linked_state->linked_plane = plane; + linked_state->planar_slave = true; + linked_state->planar_linked_plane = plane; crtc_state->active_planes |=BIT (linked->id); crtc_state->update_planes |=BIT (linked->id);DRM_DEBUG_KMS ("Using %s as Y plane for %s\n" , linked->base.name, plane->base.name);
@@ -13221,7 +13221,7 @@ intel_verify_planes(struct intel_atomic_state *state)for_each_new_intel_plane_in_state (state, plane, plane_state, i) -assert_plane (plane, plane_state->slave || +assert_plane (plane, plane_state->planar_slave || plane_state->base.visible); }
drivers/gpu/drm/i915/display/intel_display_types.h +4 -4
@@ -559,24 +559,24 @@ struct intel_plane_state {int scaler_id;/* -* linked_plane: +* planar_linked_plane: * * ICL planar formats require 2 planes that are updated as pairs. * This member is used to make sure the other plane is also updated * when required, and for update_slave() to find the correct * plane_state to pass as argument. */ -struct intel_plane *linked_plane; +struct intel_plane *planar_linked_plane;/* -* slave: +* planar_slave: * If set don't update use the linked plane's state for updating * this plane during atomic commit with the update_slave() callback. * * It's also used by the watermark code to ignore wm calculations on * this plane. They're calculated by the linked plane's wm code. */ -u32 slave; +u32 planar_slave;struct drm_intel_sprite_colorkey ckey; };
drivers/gpu/drm/i915/display/intel_sprite.c +2 -2
@@ -543,7 +543,7 @@ skl_program_plane(struct intel_plane *plane,u32 y = plane_state->color_plane[color_plane].y;u32 src_w =drm_rect_width (&plane_state->base.src) >>16 ;u32 src_h =drm_rect_height (&plane_state->base.src) >>16 ; -struct intel_plane *linked = plane_state->linked_plane; +struct intel_plane *linked = plane_state->planar_linked_plane;const struct drm_framebuffer *fb = plane_state->base.fb;u8 alpha = plane_state->base.alpha >>8 ;u32 plane_color_ctl =0 ;
@@ -642,7 +642,7 @@ skl_update_plane(struct intel_plane *plane, {int color_plane =0 ; -if (plane_state->linked_plane) { +if (plane_state->planar_linked_plane) {/* Program the UV plane */ color_plane =1 ; }
drivers/gpu/drm/i915/intel_pm.c +6 -6
@@ -4291,7 +4291,7 @@ icl_get_total_relative_data_rate(struct intel_crtc_state *crtc_state,enum plane_id plane_id =to_intel_plane (plane)->id;u64 rate; -if (!plane_state->linked_plane) { +if (!plane_state->planar_linked_plane) { rate =skl_plane_relative_data_rate (crtc_state, plane_state,0 ); plane_data_rate[plane_id] = rate; total_data_rate += rate;
@@ -4305,12 +4305,12 @@ icl_get_total_relative_data_rate(struct intel_crtc_state *crtc_state,* NULL if we try get_new_plane_state(), so we * always calculate from the master. */ -if (plane_state->slave) +if (plane_state->planar_slave)continue ;/* Y plane rate is calculated on the slave */ rate =skl_plane_relative_data_rate (crtc_state, plane_state,0 ); - y_plane_id = plane_state->linked_plane->id; + y_plane_id = plane_state->planar_linked_plane->id; plane_data_rate[y_plane_id] = rate; total_data_rate += rate;
@@ -5049,12 +5049,12 @@ static int icl_build_plane_wm(struct intel_crtc_state *crtc_state,int ret;/* Watermarks calculated in master */ -if (plane_state->slave) +if (plane_state->planar_slave)return 0 ; -if (plane_state->linked_plane) { +if (plane_state->planar_linked_plane) {const struct drm_framebuffer *fb = plane_state->base.fb; -enum plane_id y_plane_id = plane_state->linked_plane->id; +enum plane_id y_plane_id = plane_state->planar_linked_plane->id;WARN_ON (!intel_wm_plane_visible (crtc_state, plane_state)); WARN_ON(!fb->format->is_yuv ||
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 08/23] drm/i915: Rename planar linked plane variables
Quoted 5 lines · Maarten Lankhorst
Rename
linked_planetoplanar_linked_planeand slave toplanar_slave, this will make it easier to keep apart bigjoiner linking and planar plane linking.Signed-off-by Maarten Lankhorst <[email protected]>
Another good candidate for a coccinelle spatch to make rebase conflicts easier to resolve.
Quoted 219 lines
--- drivers/gpu/drm/i915/display/intel_atomic.c | 7 ++++-- .../gpu/drm/i915/display/intel_atomic_plane.c | 4 ++-- drivers/gpu/drm/i915/display/intel_display.c | 22 +++++++++---------- .../drm/i915/display/intel_display_types.h | 8 +++---- drivers/gpu/drm/i915/display/intel_sprite.c | 4 ++-- drivers/gpu/drm/i915/intel_pm.c | 12 +++++----- 6 files changed, 30 insertions(+), 27 deletions(-)drivers/gpu/drm/i915/display/intel_atomic.c +5
-2@@ -311,10 +311,13 @@ static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_sta*/ mode =PS_SCALER_MODE_NORMAL ; }else { +struct intel_plane *linked = + plane_state->planar_linked_plane; + mode =PS_SCALER_MODE_PLANAR ; -if (plane_state->linked_plane) - mode |=PS_PLANE_Y_SEL (plane_state->linked_plane->id); +if (linked) + mode |=PS_PLANE_Y_SEL (linked->id); } }else if (INTEL_GEN (dev_priv) >9 ||IS_GEMINILAKE (dev_priv)) { mode =PS_SCALER_MODE_NORMAL ;drivers/gpu/drm/i915/display/intel_atomic_plane.c +2
-2@@ -321,9 +321,9 @@ void skl_update_planes_on_crtc(struct intel_atomic_state *state,if (new_plane_state->base.visible) {intel_update_plane (plane, new_crtc_state, new_plane_state); - }else if (new_plane_state->slave) { + }else if (new_plane_state->planar_slave) {struct intel_plane *master = - new_plane_state->linked_plane; + new_plane_state->planar_linked_plane;/* * We update the slave plane from this function because drivers/gpu/drm/i915/display/intel_display.c +11
-11@@ -11666,7 +11666,7 @@ static int icl_add_linked_planes(struct intel_atomic_state *state)int i;for_each_new_intel_plane_in_state (state, plane, plane_state, i) { - linked = plane_state->linked_plane; + linked = plane_state->planar_linked_plane;if (!linked)continue ;@@ -11675,8 +11675,8 @@ static int icl_add_linked_planes(struct intel_atomic_state *state)if (IS_ERR (linked_plane_state))return PTR_ERR (linked_plane_state); -WARN_ON (linked_plane_state->linked_plane != plane); -WARN_ON (linked_plane_state->slave == plane_state->slave); +WARN_ON (linked_plane_state->planar_linked_plane != plane); +WARN_ON (linked_plane_state->planar_slave == plane_state->planar_slave); }return 0 ;@@ -11699,16 +11699,16 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)* in the crtc_state->active_planes mask. */ for_each_new_intel_plane_in_state (state, plane, plane_state, i) { -if (plane->pipe != crtc->pipe || !plane_state->linked_plane) +if (plane->pipe != crtc->pipe || !plane_state->planar_linked_plane)continue ; - plane_state->linked_plane =NULL ; -if (plane_state->slave && !plane_state->base.visible) { + plane_state->planar_linked_plane =NULL ; +if (plane_state->planar_slave && !plane_state->base.visible) { crtc_state->active_planes &= ~BIT (plane->id); crtc_state->update_planes |=BIT (plane->id); } - plane_state->slave = false; + plane_state->planar_slave = false; }if (!crtc_state->nv12_planes)@@ -11742,10 +11742,10 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)return -EINVAL ; } - plane_state->linked_plane = linked; + plane_state->planar_linked_plane = linked; - linked_state->slave = true; - linked_state->linked_plane = plane; + linked_state->planar_slave = true; + linked_state->planar_linked_plane = plane; crtc_state->active_planes |=BIT (linked->id); crtc_state->update_planes |=BIT (linked->id);DRM_DEBUG_KMS ("Using %s as Y plane for %s\n" , linked->base.name, plane->base.name);@@ -13221,7 +13221,7 @@ intel_verify_planes(struct intel_atomic_state *state)for_each_new_intel_plane_in_state (state, plane, plane_state, i) -assert_plane (plane, plane_state->slave || +assert_plane (plane, plane_state->planar_slave || plane_state->base.visible); }drivers/gpu/drm/i915/display/intel_display_types.h +4
-4@@ -559,24 +559,24 @@ struct intel_plane_state {int scaler_id;/* -* linked_plane: +* planar_linked_plane: * * ICL planar formats require 2 planes that are updated as pairs. * This member is used to make sure the other plane is also updated * when required, and for update_slave() to find the correct * plane_state to pass as argument. */ -struct intel_plane *linked_plane; +struct intel_plane *planar_linked_plane;/* -* slave: +* planar_slave: * If set don't update use the linked plane's state for updating * this plane during atomic commit with the update_slave() callback. * * It's also used by the watermark code to ignore wm calculations on * this plane. They're calculated by the linked plane's wm code. */ -u32 slave; +u32 planar_slave;struct drm_intel_sprite_colorkey ckey; };drivers/gpu/drm/i915/display/intel_sprite.c +2
-2@@ -543,7 +543,7 @@ skl_program_plane(struct intel_plane *plane,u32 y = plane_state->color_plane[color_plane].y;u32 src_w =drm_rect_width (&plane_state->base.src) >>16 ;u32 src_h =drm_rect_height (&plane_state->base.src) >>16 ; -struct intel_plane *linked = plane_state->linked_plane; +struct intel_plane *linked = plane_state->planar_linked_plane;const struct drm_framebuffer *fb = plane_state->base.fb;u8 alpha = plane_state->base.alpha >>8 ;u32 plane_color_ctl =0 ;@@ -642,7 +642,7 @@ skl_update_plane(struct intel_plane *plane, {int color_plane =0 ; -if (plane_state->linked_plane) { +if (plane_state->planar_linked_plane) {/* Program the UV plane */ color_plane =1 ; }drivers/gpu/drm/i915/intel_pm.c +6
-6@@ -4291,7 +4291,7 @@ icl_get_total_relative_data_rate(struct intel_crtc_state *crtc_state,enum plane_id plane_id =to_intel_plane (plane)->id;u64 rate; -if (!plane_state->linked_plane) { +if (!plane_state->planar_linked_plane) { rate =skl_plane_relative_data_rate (crtc_state, plane_state,0 ); plane_data_rate[plane_id] = rate; total_data_rate += rate;@@ -4305,12 +4305,12 @@ icl_get_total_relative_data_rate(struct intel_crtc_state *crtc_state,* NULL if we try get_new_plane_state(), so we * always calculate from the master. */ -if (plane_state->slave) +if (plane_state->planar_slave)continue ;/* Y plane rate is calculated on the slave */ rate =skl_plane_relative_data_rate (crtc_state, plane_state,0 ); - y_plane_id = plane_state->linked_plane->id; + y_plane_id = plane_state->planar_linked_plane->id; plane_data_rate[y_plane_id] = rate; total_data_rate += rate;@@ -5049,12 +5049,12 @@ static int icl_build_plane_wm(struct intel_crtc_state *crtc_state,int ret;/* Watermarks calculated in master */ -if (plane_state->slave) +if (plane_state->planar_slave)return 0 ; -if (plane_state->linked_plane) { +if (plane_state->planar_linked_plane) {const struct drm_framebuffer *fb = plane_state->base.fb; -enum plane_id y_plane_id = plane_state->linked_plane->id; +enum plane_id y_plane_id = plane_state->planar_linked_plane->id;WARN_ON (!intel_wm_plane_visible (crtc_state, plane_state)); WARN_ON(!fb->format->is_yuv ||Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 9/23 drm/i915: Do not add all planes when checking scalers on glk+
In reply to Maarten LankhorstWe cannot switch between HQ and normal mode on GLK+, so only add planes on platforms where it makes sense.
We could probably restrict it even more to only add when scaler users toggles between 1 and 2, but lets just leave it for now.
--- drivers/gpu/drm/i915/display/intel_atomic.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/display/intel_atomic.c +5 -0
@@ -421,6 +421,11 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,*/ if (!plane) {struct drm_plane_state *state; + +/* No need to reprogram, we're not changing scaling mode */ +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) +continue ; + plane =drm_plane_from_index (&dev_priv->drm, i); state =drm_atomic_get_plane_state (drm_state, plane);if (IS_ERR (state)) {
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 09/23] drm/i915: Do not add all planes when checking scalers on glk+
Quoted 16 lines · Maarten Lankhorst
We cannot switch between HQ and normal mode on GLK+, so only add planes on platforms where it makes sense.
We could probably restrict it even more to only add when scaler users toggles between 1 and 2, but lets just leave it for now.
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/gpu/drm/i915/display/intel_atomic.c +0
-0
drivers/gpu/drm/i915/display/intel_atomic.c int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, · line 428
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_atomic.c +5
-0@@ -421,6 +421,11 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,*/ if (!plane) {struct drm_plane_state *state; + +/* No need to reprogram, we're not changing scaling mode */ +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) +continue ; +
We could probably just combine this into the existing !plane condition and enhance the comment above that to say "Note that GLK+ scalers don't have a HQ mode so this isn't necessary on those platforms."
Either way,
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_atomic.c +0
-0plane =drm_plane_from_index (&dev_priv->drm, i); state =drm_atomic_get_plane_state (drm_state, plane);if (IS_ERR (state)) {Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH 09/23] drm/i915: Do not add all planes when checking scalers on glk+
Op 25-09-2019 om 06:55 schreef Matt Roper:
Quoted 29 lines · Maarten Lankhorst
Quoted 16 lines
We cannot switch between HQ and normal mode on GLK+, so only add planes on platforms where it makes sense.
We could probably restrict it even more to only add when scaler users toggles between 1 and 2, but lets just leave it for now.
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/gpu/drm/i915/display/intel_atomic.c +0
-0drivers/gpu/drm/i915/display/intel_atomic.c int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, · line 428
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_atomic.c +5
-0@@ -421,6 +421,11 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,*/ if (!plane) {struct drm_plane_state *state; + +/* No need to reprogram, we're not changing scaling mode */ +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) +continue ; +We could probably just combine this into the existing !plane condition and enhance the comment above that to say "Note that GLK+ scalers don't have a HQ mode so this isn't necessary on those platforms."
Quoted 3 lines
Either way,
Reviewed-by Matt Roper <[email protected]>
I changed the coment slightly, but we need the continue or we get a null pointer deref.
Thanks for review, pushed 6, 8, 9 and the first patch (although newer v5 version with Ville's R-B).
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/i915/display/intel_atomic.c +0
-0plane =drm_plane_from_index (&dev_priv->drm, i); state =drm_atomic_get_plane_state (drm_state, plane);if (IS_ERR (state)) {Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 09/23] drm/i915: Do not add all planes when checking scalers on glk+
In reply to Matt RoperQuoted 21 lines · Matt Roper
Quoted 20 lines · Maarten Lankhorst
We cannot switch between HQ and normal mode on GLK+, so only add planes on platforms where it makes sense.
We could probably restrict it even more to only add when scaler users toggles between 1 and 2, but lets just leave it for now.
Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_atomic.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/gpu/drm/i915/display/intel_atomic.c +1
-0@@ -421,6 +421,11 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,*/ if (!plane) {struct drm_plane_state *state; +
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_atomic.c int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, · line 428
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_atomic.c +4
-0+/* No need to reprogram, we're not changing scaling mode */ +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) +continue ; +We could probably just combine this into the existing !plane condition and enhance the comment above that to say "Note that GLK+ scalers don't have a HQ mode so this isn't necessary on those platforms."
I'm rewriting this whole scaler mess.
Quoted 27 lines
Either way,
Reviewed-by Matt Roper <[email protected]>Quoted 10 lines
drivers/gpu/drm/i915/display/intel_atomic.c +0
-0plane =drm_plane_from_index (&dev_priv->drm, i); state =drm_atomic_get_plane_state (drm_state, plane);if (IS_ERR (state)) {Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 10/23 drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid()
In reply to Maarten LankhorstSmall changes to intel_dp_mode_valid(), allow listing modes that can only be supported in the bigjoiner configuration, which is not supported yet.
Also unexport a few functions only used internally in intel_dp.c
--- drivers/gpu/drm/i915/display/intel_dp.c | 98 +++++++++++++++++++------ 1 file changed, 75 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +75 -23
@@ -247,7 +247,7 @@ intel_dp_max_data_rate(int max_link_clock, int max_lanes) }static int -intel_dp_downstream_max_dotclock (struct intel_dp *intel_dp) +intel_dp_downstream_max_dotclock (struct intel_dp *intel_dp,bool allow_bigjoiner) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct intel_encoder *encoder = &intel_dig_port->base;
@@ -257,6 +257,9 @@ intel_dp_downstream_max_dotclock(struct intel_dp *intel_dp)int type = intel_dp->downstream_ports[0 ] &DP_DS_PORT_TYPE_MASK ; +if (allow_bigjoiner &&INTEL_GEN (dev_priv) >=11 ) + max_dotclk *=2 ; +if (type !=DP_DS_PORT_TYPE_VGA )return max_dotclk;
@@ -505,8 +508,10 @@ u32 intel_dp_fec_to_mode_clock(u32 fec_clock) 1000000U); } -static u16 intel_dp_dsc_get_output_bpp (u32 link_clock,u32 lane_count, -u32 mode_clock,u32 mode_hdisplay) +static u16 intel_dp_dsc_get_output_bpp (struct drm_i915_private *dev_priv, +u32 link_clock,u32 lane_count, +u32 mode_clock,u32 mode_hdisplay, +bool bigjoiner) {u32 bits_per_pixel, max_bpp_small_joiner_ram;int i;
@@ -523,6 +528,10 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count,/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */ max_bpp_small_joiner_ram =DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER / mode_hdisplay; + +if (bigjoiner) + max_bpp_small_joiner_ram *=2 ; +DRM_DEBUG_KMS ("Max small joiner bpp: %u\n" , max_bpp_small_joiner_ram);/*
@@ -531,6 +540,15 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count,*/ bits_per_pixel =min (bits_per_pixel, max_bpp_small_joiner_ram); +if (bigjoiner) { +u32 max_bpp_bigjoiner = + dev_priv->max_cdclk_freq *48 / +intel_dp_mode_to_fec_clock (mode_clock); + +DRM_DEBUG_KMS ("Max big joiner bpp: %u\n" , max_bpp_bigjoiner); + bits_per_pixel =min (bits_per_pixel, max_bpp_bigjoiner); + } +/* Error out if the max bpp is less than smallest allowed valid bpp */ if (bits_per_pixel < valid_dsc_bpp[0 ]) { DRM_DEBUG_KMS("Unsupported BPP %u, min %u\n",
@@ -553,7 +571,8 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, }static u8 intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp, -int mode_clock,int mode_hdisplay) +int mode_clock,int mode_hdisplay, +bool bigjoiner) {u8 min_slice_count, i;int max_slice_width;
@@ -578,12 +597,20 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,/* Find the closest match to the valid slice count values */ for (i =0 ; i <ARRAY_SIZE (valid_dsc_slicecount); i++) { -if (valid_dsc_slicecount[i] > -drm_dp_dsc_sink_max_slice_count (intel_dp->dsc_dpcd, - false)) +u8 test_slice_count = bigjoiner ? +2 * valid_dsc_slicecount[i] : + valid_dsc_slicecount[i]; + +if (test_slice_count > +drm_dp_dsc_sink_max_slice_count (intel_dp->dsc_dpcd, false))break ; -if (min_slice_count <= valid_dsc_slicecount[i]) -return valid_dsc_slicecount[i]; + +/* big joiner needs small joiner to be enabled */ +if (bigjoiner && test_slice_count <4 ) +continue ; + +if (min_slice_count <= test_slice_count) +return test_slice_count; }DRM_DEBUG_KMS ("Unsupported Slice Count %d\n" , min_slice_count);
@@ -603,11 +630,15 @@ intel_dp_mode_valid(struct drm_connector *connector,int max_dotclk;u16 dsc_max_output_bpp =0 ;u8 dsc_slice_count =0 ; +bool dsc = false, bigjoiner = false;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ; - max_dotclk =intel_dp_downstream_max_dotclock (intel_dp); +if (mode->flags &DRM_MODE_FLAG_DBLCLK ) +return MODE_H_ILLEGAL ; + + max_dotclk =intel_dp_downstream_max_dotclock (intel_dp, false);if (intel_dp_is_edp (intel_dp) && fixed_mode) {if (mode->hdisplay > fixed_mode->hdisplay)
@@ -619,6 +650,18 @@ intel_dp_mode_valid(struct drm_connector *connector, target_clock = fixed_mode->clock; } +if (mode->clock <10000 ) +return MODE_CLOCK_LOW ; + +if (target_clock > max_dotclk) { + max_dotclk =intel_dp_downstream_max_dotclock (intel_dp, true); + +if (target_clock > max_dotclk) +return MODE_CLOCK_HIGH ; + + bigjoiner = true; + } + max_link_clock =intel_dp_max_link_rate (intel_dp); max_lanes =intel_dp_max_lane_count (intel_dp);
@@ -639,26 +682,32 @@ intel_dp_mode_valid(struct drm_connector *connector, true); }else if (drm_dp_sink_supports_fec (intel_dp->fec_capable)) { dsc_max_output_bpp = -intel_dp_dsc_get_output_bpp (max_link_clock, +intel_dp_dsc_get_output_bpp (dev_priv, + max_link_clock, max_lanes, target_clock, - mode->hdisplay) >>4 ; + mode->hdisplay, + bigjoiner) >>4 ; dsc_slice_count =intel_dp_dsc_get_slice_count (intel_dp, target_clock, - mode->hdisplay); + mode->hdisplay, + bigjoiner); } + + dsc = dsc_max_output_bpp && dsc_slice_count; } -if ((mode_rate > max_rate && !(dsc_max_output_bpp && dsc_slice_count)) || - target_clock > max_dotclk) +/* big joiner configuration needs DSC */ +if (bigjoiner && !dsc) { +DRM_DEBUG_KMS ("Link clock needs bigjoiner, but DSC or FEC not available\n" );return MODE_CLOCK_HIGH ; + } -if (mode->clock <10000 ) -return MODE_CLOCK_LOW ; - -if (mode->flags &DRM_MODE_FLAG_DBLCLK ) -return MODE_H_ILLEGAL ; +if (mode_rate > max_rate && !dsc) { +DRM_DEBUG_KMS ("Cannot drive without DSC\n" ); +return MODE_CLOCK_HIGH ; + }return intel_mode_valid_max_plane_size (dev_priv, mode); }
@@ -2068,14 +2117,17 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,u8 dsc_dp_slice_count; dsc_max_output_bpp = -intel_dp_dsc_get_output_bpp (pipe_config->port_clock, +intel_dp_dsc_get_output_bpp (dev_priv, + pipe_config->port_clock, pipe_config->lane_count, adjusted_mode->crtc_clock, - adjusted_mode->crtc_hdisplay); + adjusted_mode->crtc_hdisplay, + false); dsc_dp_slice_count =intel_dp_dsc_get_slice_count (intel_dp, adjusted_mode->crtc_clock, - adjusted_mode->crtc_hdisplay); + adjusted_mode->crtc_hdisplay, + false);if (!dsc_max_output_bpp || !dsc_dp_slice_count) {DRM_DEBUG_KMS ("Compressed BPP/Slice Count not supported\n" );return -EINVAL ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/23] drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid()
Quoted 25 lines · Maarten Lankhorst
Small changes to
intel_dp_mode_valid(), allow listing modes that can only be supported in the bigjoiner configuration, which is not supported yet.Also unexport a few functions only used internally in
intel_dp.cSigned-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp.c | 98 +++++++++++++++++++------ 1 file changed, 75 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +1
-1@@ -247,7 +247,7 @@ intel_dp_max_data_rate(int max_link_clock, int max_lanes) }static int -intel_dp_downstream_max_dotclock (struct intel_dp *intel_dp) +intel_dp_downstream_max_dotclock (struct intel_dp *intel_dp,bool allow_bigjoiner) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct intel_encoder *encoder = &intel_dig_port->base;
drivers/gpu/drm/i915/display/intel_dp.c intel_dp_downstream_max_dotclock(struct intel_dp *intel_dp) · line 262
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_dp.c +3
-0@@ -257,6 +257,9 @@ intel_dp_downstream_max_dotclock(struct intel_dp *intel_dp)int type = intel_dp->downstream_ports[0 ] &DP_DS_PORT_TYPE_MASK ; +if (allow_bigjoiner &&INTEL_GEN (dev_priv) >=11 ) + max_dotclk *=2 ; +
Should we be checking if the specific pipe can do big joiner on the platform (gen11 vs gen12 differences) and also omitting eDP from consideration?
Quoted 17 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-2if (type !=DP_DS_PORT_TYPE_VGA )return max_dotclk;@@ -505,8 +508,10 @@ u32 intel_dp_fec_to_mode_clock(u32 fec_clock) 1000000U); } -static u16 intel_dp_dsc_get_output_bpp (u32 link_clock,u32 lane_count, -u32 mode_clock,u32 mode_hdisplay) +static u16 intel_dp_dsc_get_output_bpp (struct drm_i915_private *dev_priv, +u32 link_clock,u32 lane_count, +u32 mode_clock,u32 mode_hdisplay, +bool bigjoiner) {u32 bits_per_pixel, max_bpp_small_joiner_ram;int i;
drivers/gpu/drm/i915/display/intel_dp.c static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, · line 534
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-0@@ -523,6 +528,10 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count,/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */ max_bpp_small_joiner_ram =DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER / mode_hdisplay; + +if (bigjoiner) + max_bpp_small_joiner_ram *=2 ; +
This change is correct, but while confirming in the bspec I noticed that we may have the wrong DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER value for gen11+. It indicates 6144 for GLK, CNL, but 7680 for ICL+ (and double that to 15360 when using big joiner).
Bspec: 20388
Bspec: 49259
drivers/gpu/drm/i915/display/intel_dp.c static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, · line 546
Quoted 11 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-0DRM_DEBUG_KMS ("Max small joiner bpp: %u\n" , max_bpp_small_joiner_ram);/* @@ -531,6 +540,15 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count,*/ bits_per_pixel =min (bits_per_pixel, max_bpp_small_joiner_ram); +if (bigjoiner) { +u32 max_bpp_bigjoiner = + dev_priv->max_cdclk_freq *48 / +intel_dp_mode_to_fec_clock (mode_clock);
Minor nitpick, but just to match the bspec (PPC * CDCLK * 24 bits / pixel clock), I'd keep the 2 PPC and 24 bit factors separate here.
Quoted 100 lines
drivers/gpu/drm/i915/display/intel_dp.c +44
-10+ +DRM_DEBUG_KMS ("Max big joiner bpp: %u\n" , max_bpp_bigjoiner); + bits_per_pixel =min (bits_per_pixel, max_bpp_bigjoiner); + } +/* Error out if the max bpp is less than smallest allowed valid bpp */ if (bits_per_pixel < valid_dsc_bpp[0 ]) { DRM_DEBUG_KMS("Unsupported BPP %u, min %u\n",@@ -553,7 +571,8 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, }static u8 intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp, -int mode_clock,int mode_hdisplay) +int mode_clock,int mode_hdisplay, +bool bigjoiner) {u8 min_slice_count, i;int max_slice_width;@@ -578,12 +597,20 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,/* Find the closest match to the valid slice count values */ for (i =0 ; i <ARRAY_SIZE (valid_dsc_slicecount); i++) { -if (valid_dsc_slicecount[i] > -drm_dp_dsc_sink_max_slice_count (intel_dp->dsc_dpcd, - false)) +u8 test_slice_count = bigjoiner ? +2 * valid_dsc_slicecount[i] : + valid_dsc_slicecount[i]; + +if (test_slice_count > +drm_dp_dsc_sink_max_slice_count (intel_dp->dsc_dpcd, false))break ; -if (min_slice_count <= valid_dsc_slicecount[i]) -return valid_dsc_slicecount[i]; + +/* big joiner needs small joiner to be enabled */ +if (bigjoiner && test_slice_count <4 ) +continue ; + +if (min_slice_count <= test_slice_count) +return test_slice_count; }DRM_DEBUG_KMS ("Unsupported Slice Count %d\n" , min_slice_count);@@ -603,11 +630,15 @@ intel_dp_mode_valid(struct drm_connector *connector,int max_dotclk;u16 dsc_max_output_bpp =0 ;u8 dsc_slice_count =0 ; +bool dsc = false, bigjoiner = false;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ; - max_dotclk =intel_dp_downstream_max_dotclock (intel_dp); +if (mode->flags &DRM_MODE_FLAG_DBLCLK ) +return MODE_H_ILLEGAL ; + + max_dotclk =intel_dp_downstream_max_dotclock (intel_dp, false);if (intel_dp_is_edp (intel_dp) && fixed_mode) {if (mode->hdisplay > fixed_mode->hdisplay)@@ -619,6 +650,18 @@ intel_dp_mode_valid(struct drm_connector *connector, target_clock = fixed_mode->clock; } +if (mode->clock <10000 ) +return MODE_CLOCK_LOW ; + +if (target_clock > max_dotclk) { + max_dotclk =intel_dp_downstream_max_dotclock (intel_dp, true); + +if (target_clock > max_dotclk) +return MODE_CLOCK_HIGH ; + + bigjoiner = true; + } + max_link_clock =intel_dp_max_link_rate (intel_dp); max_lanes =intel_dp_max_lane_count (intel_dp);@@ -639,26 +682,32 @@ intel_dp_mode_valid(struct drm_connector *connector, true); }else if (drm_dp_sink_supports_fec (intel_dp->fec_capable)) { dsc_max_output_bpp = -intel_dp_dsc_get_output_bpp (max_link_clock, +intel_dp_dsc_get_output_bpp (dev_priv, + max_link_clock, max_lanes, target_clock, - mode->hdisplay) >>4 ; + mode->hdisplay, + bigjoiner) >>4 ; dsc_slice_count =intel_dp_dsc_get_slice_count (intel_dp, target_clock, - mode->hdisplay); + mode->hdisplay, + bigjoiner); } +
drivers/gpu/drm/i915/display/intel_dp.c intel_dp_mode_valid(struct drm_connector *connector, · line 705
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp.c +5
-2+ dsc = dsc_max_output_bpp && dsc_slice_count; } -if ((mode_rate > max_rate && !(dsc_max_output_bpp && dsc_slice_count)) || - target_clock > max_dotclk) +/* big joiner configuration needs DSC */ +if (bigjoiner && !dsc) { +DRM_DEBUG_KMS ("Link clock needs bigjoiner, but DSC or FEC not available\n" );return MODE_CLOCK_HIGH ; + }
Somewhere in this function we probably also need to make sure that the big joiner is available on the pipe and that we're not using eDP.
Matt
Quoted 41 lines
drivers/gpu/drm/i915/display/intel_dp.c +10
-8-if (mode->clock <10000 ) -return MODE_CLOCK_LOW ; - -if (mode->flags &DRM_MODE_FLAG_DBLCLK ) -return MODE_H_ILLEGAL ; +if (mode_rate > max_rate && !dsc) { +DRM_DEBUG_KMS ("Cannot drive without DSC\n" ); +return MODE_CLOCK_HIGH ; + }return intel_mode_valid_max_plane_size (dev_priv, mode); }@@ -2068,14 +2117,17 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,u8 dsc_dp_slice_count; dsc_max_output_bpp = -intel_dp_dsc_get_output_bpp (pipe_config->port_clock, +intel_dp_dsc_get_output_bpp (dev_priv, + pipe_config->port_clock, pipe_config->lane_count, adjusted_mode->crtc_clock, - adjusted_mode->crtc_hdisplay); + adjusted_mode->crtc_hdisplay, + false); dsc_dp_slice_count =intel_dp_dsc_get_slice_count (intel_dp, adjusted_mode->crtc_clock, - adjusted_mode->crtc_hdisplay); + adjusted_mode->crtc_hdisplay, + false);if (!dsc_max_output_bpp || !dsc_dp_slice_count) {DRM_DEBUG_KMS ("Compressed BPP/Slice Count not supported\n" );return -EINVAL ;Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/23] drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid()
Quoted 56 lines · Matt Roper
Quoted 25 lines · Maarten Lankhorst
Small changes to
intel_dp_mode_valid(), allow listing modes that can only be supported in the bigjoiner configuration, which is not supported yet.Also unexport a few functions only used internally in
intel_dp.cSigned-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp.c | 98 +++++++++++++++++++------ 1 file changed, 75 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +1
-1@@ -247,7 +247,7 @@ intel_dp_max_data_rate(int max_link_clock, int max_lanes) }static int -intel_dp_downstream_max_dotclock (struct intel_dp *intel_dp) +intel_dp_downstream_max_dotclock (struct intel_dp *intel_dp,bool allow_bigjoiner) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct intel_encoder *encoder = &intel_dig_port->base;drivers/gpu/drm/i915/display/intel_dp.c intel_dp_downstream_max_dotclock(struct intel_dp *intel_dp) · line 262
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_dp.c +3
-0@@ -257,6 +257,9 @@ intel_dp_downstream_max_dotclock(struct intel_dp *intel_dp)int type = intel_dp->downstream_ports[0 ] &DP_DS_PORT_TYPE_MASK ; +if (allow_bigjoiner &&INTEL_GEN (dev_priv) >=11 ) + max_dotclk *=2 ; +Should we be checking if the specific pipe can do big joiner on the platform (gen11 vs gen12 differences) and also omitting eDP from consideration?
Quoted 18 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-2if (type !=DP_DS_PORT_TYPE_VGA )return max_dotclk;@@ -505,8 +508,10 @@ u32 intel_dp_fec_to_mode_clock(u32 fec_clock) 1000000U); } -static u16 intel_dp_dsc_get_output_bpp (u32 link_clock,u32 lane_count, -u32 mode_clock,u32 mode_hdisplay) +static u16 intel_dp_dsc_get_output_bpp (struct drm_i915_private *dev_priv, +u32 link_clock,u32 lane_count, +u32 mode_clock,u32 mode_hdisplay, +bool bigjoiner) {u32 bits_per_pixel, max_bpp_small_joiner_ram;int i;@@ -523,6 +528,10 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count,
Quoted 11 lines
drivers/gpu/drm/i915/display/intel_dp.c static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, · line 534
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-0/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */ max_bpp_small_joiner_ram =DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER / mode_hdisplay; + +if (bigjoiner) + max_bpp_small_joiner_ram *=2 ; +This change is correct, but while confirming in the bspec I noticed that we may have the wrong
DP_DSC_MAX_SMALL_JOINER_RAM_BUFFERvalue for gen11+. It indicates 6144 for GLK, CNL, but 7680 for ICL+ (and double that to 15360 when using big joiner).
Sorry, meant to say wrong value for < gen11. The current 61440 value we use is 8 bits * 7680, so it's correct for gen11+, but too big for GLK/CNL.
I just sent a simple patch to make the value platform-specific:
https://patchwork.freedesktop.org/series/67195/
Matt
Quoted 188 lines
Bspec: 20388
Bspec: 49259drivers/gpu/drm/i915/display/intel_dp.c static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, · line 546
Quoted 11 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-0DRM_DEBUG_KMS ("Max small joiner bpp: %u\n" , max_bpp_small_joiner_ram);/* @@ -531,6 +540,15 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count,*/ bits_per_pixel =min (bits_per_pixel, max_bpp_small_joiner_ram); +if (bigjoiner) { +u32 max_bpp_bigjoiner = + dev_priv->max_cdclk_freq *48 / +intel_dp_mode_to_fec_clock (mode_clock);Minor nitpick, but just to match the bspec (PPC * CDCLK * 24 bits / pixel clock), I'd keep the 2 PPC and 24 bit factors separate here.
Quoted 100 lines
drivers/gpu/drm/i915/display/intel_dp.c +44
-10+ +DRM_DEBUG_KMS ("Max big joiner bpp: %u\n" , max_bpp_bigjoiner); + bits_per_pixel =min (bits_per_pixel, max_bpp_bigjoiner); + } +/* Error out if the max bpp is less than smallest allowed valid bpp */ if (bits_per_pixel < valid_dsc_bpp[0 ]) { DRM_DEBUG_KMS("Unsupported BPP %u, min %u\n",@@ -553,7 +571,8 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, }static u8 intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp, -int mode_clock,int mode_hdisplay) +int mode_clock,int mode_hdisplay, +bool bigjoiner) {u8 min_slice_count, i;int max_slice_width;@@ -578,12 +597,20 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,/* Find the closest match to the valid slice count values */ for (i =0 ; i <ARRAY_SIZE (valid_dsc_slicecount); i++) { -if (valid_dsc_slicecount[i] > -drm_dp_dsc_sink_max_slice_count (intel_dp->dsc_dpcd, - false)) +u8 test_slice_count = bigjoiner ? +2 * valid_dsc_slicecount[i] : + valid_dsc_slicecount[i]; + +if (test_slice_count > +drm_dp_dsc_sink_max_slice_count (intel_dp->dsc_dpcd, false))break ; -if (min_slice_count <= valid_dsc_slicecount[i]) -return valid_dsc_slicecount[i]; + +/* big joiner needs small joiner to be enabled */ +if (bigjoiner && test_slice_count <4 ) +continue ; + +if (min_slice_count <= test_slice_count) +return test_slice_count; }DRM_DEBUG_KMS ("Unsupported Slice Count %d\n" , min_slice_count);@@ -603,11 +630,15 @@ intel_dp_mode_valid(struct drm_connector *connector,int max_dotclk;u16 dsc_max_output_bpp =0 ;u8 dsc_slice_count =0 ; +bool dsc = false, bigjoiner = false;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ; - max_dotclk =intel_dp_downstream_max_dotclock (intel_dp); +if (mode->flags &DRM_MODE_FLAG_DBLCLK ) +return MODE_H_ILLEGAL ; + + max_dotclk =intel_dp_downstream_max_dotclock (intel_dp, false);if (intel_dp_is_edp (intel_dp) && fixed_mode) {if (mode->hdisplay > fixed_mode->hdisplay)@@ -619,6 +650,18 @@ intel_dp_mode_valid(struct drm_connector *connector, target_clock = fixed_mode->clock; } +if (mode->clock <10000 ) +return MODE_CLOCK_LOW ; + +if (target_clock > max_dotclk) { + max_dotclk =intel_dp_downstream_max_dotclock (intel_dp, true); + +if (target_clock > max_dotclk) +return MODE_CLOCK_HIGH ; + + bigjoiner = true; + } + max_link_clock =intel_dp_max_link_rate (intel_dp); max_lanes =intel_dp_max_lane_count (intel_dp);@@ -639,26 +682,32 @@ intel_dp_mode_valid(struct drm_connector *connector, true); }else if (drm_dp_sink_supports_fec (intel_dp->fec_capable)) { dsc_max_output_bpp = -intel_dp_dsc_get_output_bpp (max_link_clock, +intel_dp_dsc_get_output_bpp (dev_priv, + max_link_clock, max_lanes, target_clock, - mode->hdisplay) >>4 ; + mode->hdisplay, + bigjoiner) >>4 ; dsc_slice_count =intel_dp_dsc_get_slice_count (intel_dp, target_clock, - mode->hdisplay); + mode->hdisplay, + bigjoiner); } +drivers/gpu/drm/i915/display/intel_dp.c intel_dp_mode_valid(struct drm_connector *connector, · line 705
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp.c +5
-2+ dsc = dsc_max_output_bpp && dsc_slice_count; } -if ((mode_rate > max_rate && !(dsc_max_output_bpp && dsc_slice_count)) || - target_clock > max_dotclk) +/* big joiner configuration needs DSC */ +if (bigjoiner && !dsc) { +DRM_DEBUG_KMS ("Link clock needs bigjoiner, but DSC or FEC not available\n" );return MODE_CLOCK_HIGH ; + }Somewhere in this function we probably also need to make sure that the big joiner is available on the pipe and that we're not using eDP.
Matt
Quoted 41 lines
drivers/gpu/drm/i915/display/intel_dp.c +10
-8-if (mode->clock <10000 ) -return MODE_CLOCK_LOW ; - -if (mode->flags &DRM_MODE_FLAG_DBLCLK ) -return MODE_H_ILLEGAL ; +if (mode_rate > max_rate && !dsc) { +DRM_DEBUG_KMS ("Cannot drive without DSC\n" ); +return MODE_CLOCK_HIGH ; + }return intel_mode_valid_max_plane_size (dev_priv, mode); }@@ -2068,14 +2117,17 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,u8 dsc_dp_slice_count; dsc_max_output_bpp = -intel_dp_dsc_get_output_bpp (pipe_config->port_clock, +intel_dp_dsc_get_output_bpp (dev_priv, + pipe_config->port_clock, pipe_config->lane_count, adjusted_mode->crtc_clock, - adjusted_mode->crtc_hdisplay); + adjusted_mode->crtc_hdisplay, + false); dsc_dp_slice_count =intel_dp_dsc_get_slice_count (intel_dp, adjusted_mode->crtc_clock, - adjusted_mode->crtc_hdisplay); + adjusted_mode->crtc_hdisplay, + false);if (!dsc_max_output_bpp || !dsc_dp_slice_count) {DRM_DEBUG_KMS ("Compressed BPP/Slice Count not supported\n" );return -EINVAL ;Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/23] drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid()
In reply to Matt RoperQuoted 27 lines · Matt Roper
Quoted 26 lines · Maarten Lankhorst
Small changes to
intel_dp_mode_valid(), allow listing modes that can only be supported in the bigjoiner configuration, which is not supported yet.Also unexport a few functions only used internally in
intel_dp.cSigned-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp.c | 98 +++++++++++++++++++------ 1 file changed, 75 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +1
-1@@ -247,7 +247,7 @@ intel_dp_max_data_rate(int max_link_clock, int max_lanes) }static int -intel_dp_downstream_max_dotclock (struct intel_dp *intel_dp) +intel_dp_downstream_max_dotclock (struct intel_dp *intel_dp,bool allow_bigjoiner) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct intel_encoder *encoder = &intel_dig_port->base;@@ -257,6 +257,9 @@ intel_dp_downstream_max_dotclock(struct intel_dp *intel_dp)
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp.c intel_dp_downstream_max_dotclock(struct intel_dp *intel_dp) · line 262
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp.c +3
-0int type = intel_dp->downstream_ports[0 ] &DP_DS_PORT_TYPE_MASK ; +if (allow_bigjoiner &&INTEL_GEN (dev_priv) >=11 ) + max_dotclk *=2 ; +
Since here we allow the big joiner for >=11 (ICL+), we need to update the plane_mode_valid check to ensure that we allow the 8K mode only for TGL+
else with big joiner enabled on ICL we will enable it on ICL which is not permitted (not POR)
Quoted 36 lines
Should we be checking if the specific pipe can do big joiner on the platform (gen11 vs gen12 differences) and also omitting eDP from consideration?
Quoted 17 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-2if (type !=DP_DS_PORT_TYPE_VGA )return max_dotclk;@@ -505,8 +508,10 @@ u32 intel_dp_fec_to_mode_clock(u32 fec_clock) 1000000U); } -static u16 intel_dp_dsc_get_output_bpp (u32 link_clock,u32 lane_count, -u32 mode_clock,u32 mode_hdisplay) +static u16 intel_dp_dsc_get_output_bpp (struct drm_i915_private *dev_priv, +u32 link_clock,u32 lane_count, +u32 mode_clock,u32 mode_hdisplay, +bool bigjoiner) {u32 bits_per_pixel, max_bpp_small_joiner_ram;int i;drivers/gpu/drm/i915/display/intel_dp.c static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, · line 534
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-0@@ -523,6 +528,10 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count,/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */ max_bpp_small_joiner_ram =DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER / mode_hdisplay; + +if (bigjoiner) + max_bpp_small_joiner_ram *=2 ; +This change is correct, but while confirming in the bspec I noticed that we may have the wrong
DP_DSC_MAX_SMALL_JOINER_RAM_BUFFERvalue for gen11+. It indicates 6144 for GLK, CNL, but 7680 for ICL+ (and double that to 15360 when using big joiner).
Quoted 2 lines
Bspec: 20388
Bspec: 49259
@Matt, the 7680 is in bytes which translates to 61440 bits and thats what we are using, see the #DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER
and then its double for big joiner, so this is correct
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp.c +0
-0DRM_DEBUG_KMS ("Max small joiner bpp: %u\n" , max_bpp_small_joiner_ram);/* @@ -531,6 +540,15 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count,*/ bits_per_pixel =min (bits_per_pixel, max_bpp_small_joiner_ram);
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp.c static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, · line 546
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-0+if (bigjoiner) { +u32 max_bpp_bigjoiner = + dev_priv->max_cdclk_freq *48 / +intel_dp_mode_to_fec_clock (mode_clock);Minor nitpick, but just to match the bspec (PPC * CDCLK * 24 bits / pixel clock), I'd keep the 2 PPC and 24 bit factors separate here.
Yes I agree her with Matt that we shd keep the 2ppc separate just to match bspec
Quoted 103 lines
Quoted 103 lines
drivers/gpu/drm/i915/display/intel_dp.c +45
-10+ +DRM_DEBUG_KMS ("Max big joiner bpp: %u\n" , max_bpp_bigjoiner); + bits_per_pixel =min (bits_per_pixel, max_bpp_bigjoiner); + } +/* Error out if the max bpp is less than smallest allowed valid bpp */ if (bits_per_pixel < valid_dsc_bpp[0 ]) { DRM_DEBUG_KMS("Unsupported BPP %u, min %u\n",@@ -553,7 +571,8 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, }static u8 intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp, -int mode_clock,int mode_hdisplay) +int mode_clock,int mode_hdisplay, +bool bigjoiner) {u8 min_slice_count, i;int max_slice_width;@@ -578,12 +597,20 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,/* Find the closest match to the valid slice count values */ for (i =0 ; i <ARRAY_SIZE (valid_dsc_slicecount); i++) { -if (valid_dsc_slicecount[i] > -drm_dp_dsc_sink_max_slice_count (intel_dp->dsc_dpcd, - false)) +u8 test_slice_count = bigjoiner ? +2 * valid_dsc_slicecount[i] : + valid_dsc_slicecount[i]; + +if (test_slice_count > +drm_dp_dsc_sink_max_slice_count (intel_dp->dsc_dpcd, false))break ; -if (min_slice_count <= valid_dsc_slicecount[i]) -return valid_dsc_slicecount[i]; + +/* big joiner needs small joiner to be enabled */ +if (bigjoiner && test_slice_count <4 ) +continue ; + +if (min_slice_count <= test_slice_count) +return test_slice_count; }DRM_DEBUG_KMS ("Unsupported Slice Count %d\n" , min_slice_count);@@ -603,11 +630,15 @@ intel_dp_mode_valid(struct drm_connector *connector,int max_dotclk;u16 dsc_max_output_bpp =0 ;u8 dsc_slice_count =0 ; +bool dsc = false, bigjoiner = false;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ; - max_dotclk =intel_dp_downstream_max_dotclock (intel_dp); +if (mode->flags &DRM_MODE_FLAG_DBLCLK ) +return MODE_H_ILLEGAL ; + + max_dotclk =intel_dp_downstream_max_dotclock (intel_dp, false);if (intel_dp_is_edp (intel_dp) && fixed_mode) {if (mode->hdisplay > fixed_mode->hdisplay)@@ -619,6 +650,18 @@ intel_dp_mode_valid(struct drm_connector *connector, target_clock = fixed_mode->clock; } +if (mode->clock <10000 ) +return MODE_CLOCK_LOW ; + +if (target_clock > max_dotclk) { + max_dotclk =intel_dp_downstream_max_dotclock (intel_dp, true); + +if (target_clock > max_dotclk) +return MODE_CLOCK_HIGH ; + + bigjoiner = true; + } + max_link_clock =intel_dp_max_link_rate (intel_dp); max_lanes =intel_dp_max_lane_count (intel_dp);@@ -639,26 +682,32 @@ intel_dp_mode_valid(struct drm_connector *connector, true); }else if (drm_dp_sink_supports_fec (intel_dp->fec_capable)) { dsc_max_output_bpp = -intel_dp_dsc_get_output_bpp (max_link_clock, +intel_dp_dsc_get_output_bpp (dev_priv, + max_link_clock, max_lanes, target_clock, - mode->hdisplay) >>4 ; + mode->hdisplay, + bigjoiner) >>4 ; dsc_slice_count =intel_dp_dsc_get_slice_count (intel_dp, target_clock, - mode->hdisplay); + mode->hdisplay, + bigjoiner); } + + dsc = dsc_max_output_bpp && dsc_slice_count; }
Quoted 11 lines
drivers/gpu/drm/i915/display/intel_dp.c intel_dp_mode_valid(struct drm_connector *connector, · line 705
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-2-if ((mode_rate > max_rate && !(dsc_max_output_bpp && dsc_slice_count)) || - target_clock > max_dotclk) +/* big joiner configuration needs DSC */ +if (bigjoiner && !dsc) { +DRM_DEBUG_KMS ("Link clock needs bigjoiner, but DSC or FEC not available\n" );return MODE_CLOCK_HIGH ; + }Somewhere in this function we probably also need to make sure that the big joiner is available on the pipe and that we're not using eDP.
Yes I agree we need to check that we allow big joine only for B and C for ICL and then all pipes for TGL+ and not allow for eDP
Manasi
Quoted 40 lines
Matt
Quoted 37 lines
drivers/gpu/drm/i915/display/intel_dp.c +10
-8-if (mode->clock <10000 ) -return MODE_CLOCK_LOW ; - -if (mode->flags &DRM_MODE_FLAG_DBLCLK ) -return MODE_H_ILLEGAL ; +if (mode_rate > max_rate && !dsc) { +DRM_DEBUG_KMS ("Cannot drive without DSC\n" ); +return MODE_CLOCK_HIGH ; + }return intel_mode_valid_max_plane_size (dev_priv, mode); }@@ -2068,14 +2117,17 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,u8 dsc_dp_slice_count; dsc_max_output_bpp = -intel_dp_dsc_get_output_bpp (pipe_config->port_clock, +intel_dp_dsc_get_output_bpp (dev_priv, + pipe_config->port_clock, pipe_config->lane_count, adjusted_mode->crtc_clock, - adjusted_mode->crtc_hdisplay); + adjusted_mode->crtc_hdisplay, + false); dsc_dp_slice_count =intel_dp_dsc_get_slice_count (intel_dp, adjusted_mode->crtc_clock, - adjusted_mode->crtc_hdisplay); + adjusted_mode->crtc_hdisplay, + false);if (!dsc_max_output_bpp || !dsc_dp_slice_count) {DRM_DEBUG_KMS ("Compressed BPP/Slice Count not supported\n" );return -EINVAL ;Signature · 1 line
2.20.1
Quoted 15 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerRe: [PATCH 10/23] drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid()
Op 26-09-2019 om 00:09 schreef Manasi Navare:
Quoted 28 lines · Matt Roper
Quoted 27 lines · Maarten Lankhorst
Quoted 26 lines
Small changes to
intel_dp_mode_valid(), allow listing modes that can only be supported in the bigjoiner configuration, which is not supported yet.Also unexport a few functions only used internally in
intel_dp.cSigned-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp.c | 98 +++++++++++++++++++------ 1 file changed, 75 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +1
-1@@ -247,7 +247,7 @@ intel_dp_max_data_rate(int max_link_clock, int max_lanes) }static int -intel_dp_downstream_max_dotclock (struct intel_dp *intel_dp) +intel_dp_downstream_max_dotclock (struct intel_dp *intel_dp,bool allow_bigjoiner) {struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp);struct intel_encoder *encoder = &intel_dig_port->base;@@ -257,6 +257,9 @@ intel_dp_downstream_max_dotclock(struct intel_dp *intel_dp)
Quoted 8 lines
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp.c intel_dp_downstream_max_dotclock(struct intel_dp *intel_dp) · line 262
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dp.c +3
-0int type = intel_dp->downstream_ports[0 ] &DP_DS_PORT_TYPE_MASK ; +if (allow_bigjoiner &&INTEL_GEN (dev_priv) >=11 ) + max_dotclk *=2 ; +Since here we allow the big joiner for >=11 (ICL+), we need to update the
plane_mode_validcheck to ensure that we allow the 8K mode only for TGL+
else with big joiner enabled on ICL we will enable it on ICL which is not permitted (not POR)
Should we decrease hdisplay_max to 5120 then for < gen12?
intel_mode_valid() currently allows the full mode.
Quoted 172 lines
Quoted 36 lines
Should we be checking if the specific pipe can do big joiner on the platform (gen11 vs gen12 differences) and also omitting eDP from consideration?
Quoted 17 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-2if (type !=DP_DS_PORT_TYPE_VGA )return max_dotclk;@@ -505,8 +508,10 @@ u32 intel_dp_fec_to_mode_clock(u32 fec_clock) 1000000U); } -static u16 intel_dp_dsc_get_output_bpp (u32 link_clock,u32 lane_count, -u32 mode_clock,u32 mode_hdisplay) +static u16 intel_dp_dsc_get_output_bpp (struct drm_i915_private *dev_priv, +u32 link_clock,u32 lane_count, +u32 mode_clock,u32 mode_hdisplay, +bool bigjoiner) {u32 bits_per_pixel, max_bpp_small_joiner_ram;int i;drivers/gpu/drm/i915/display/intel_dp.c static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, · line 534
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-0@@ -523,6 +528,10 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count,/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */ max_bpp_small_joiner_ram =DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER / mode_hdisplay; + +if (bigjoiner) + max_bpp_small_joiner_ram *=2 ; +This change is correct, but while confirming in the bspec I noticed that we may have the wrong
DP_DSC_MAX_SMALL_JOINER_RAM_BUFFERvalue for gen11+. It indicates 6144 for GLK, CNL, but 7680 for ICL+ (and double that to 15360 when using big joiner).Quoted 2 lines
Bspec: 20388
Bspec: 49259@Matt, the 7680 is in bytes which translates to 61440 bits and thats what we are using, see the #DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER
and then its double for big joiner, so this is correct
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_dp.c +0
-0DRM_DEBUG_KMS ("Max small joiner bpp: %u\n" , max_bpp_small_joiner_ram);/* @@ -531,6 +540,15 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count,*/ bits_per_pixel =min (bits_per_pixel, max_bpp_small_joiner_ram);Quoted 7 lines
drivers/gpu/drm/i915/display/intel_dp.c static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, · line 546
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-0+if (bigjoiner) { +u32 max_bpp_bigjoiner = + dev_priv->max_cdclk_freq *48 / +intel_dp_mode_to_fec_clock (mode_clock);Minor nitpick, but just to match the bspec (PPC * CDCLK * 24 bits / pixel clock), I'd keep the 2 PPC and 24 bit factors separate here.
Yes I agree her with Matt that we shd keep the 2ppc separate just to match bspec
Quoted 103 lines
Quoted 103 lines
drivers/gpu/drm/i915/display/intel_dp.c +45
-10+ +DRM_DEBUG_KMS ("Max big joiner bpp: %u\n" , max_bpp_bigjoiner); + bits_per_pixel =min (bits_per_pixel, max_bpp_bigjoiner); + } +/* Error out if the max bpp is less than smallest allowed valid bpp */ if (bits_per_pixel < valid_dsc_bpp[0 ]) { DRM_DEBUG_KMS("Unsupported BPP %u, min %u\n",@@ -553,7 +571,8 @@ static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count, }static u8 intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp, -int mode_clock,int mode_hdisplay) +int mode_clock,int mode_hdisplay, +bool bigjoiner) {u8 min_slice_count, i;int max_slice_width;@@ -578,12 +597,20 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,/* Find the closest match to the valid slice count values */ for (i =0 ; i <ARRAY_SIZE (valid_dsc_slicecount); i++) { -if (valid_dsc_slicecount[i] > -drm_dp_dsc_sink_max_slice_count (intel_dp->dsc_dpcd, - false)) +u8 test_slice_count = bigjoiner ? +2 * valid_dsc_slicecount[i] : + valid_dsc_slicecount[i]; + +if (test_slice_count > +drm_dp_dsc_sink_max_slice_count (intel_dp->dsc_dpcd, false))break ; -if (min_slice_count <= valid_dsc_slicecount[i]) -return valid_dsc_slicecount[i]; + +/* big joiner needs small joiner to be enabled */ +if (bigjoiner && test_slice_count <4 ) +continue ; + +if (min_slice_count <= test_slice_count) +return test_slice_count; }DRM_DEBUG_KMS ("Unsupported Slice Count %d\n" , min_slice_count);@@ -603,11 +630,15 @@ intel_dp_mode_valid(struct drm_connector *connector,int max_dotclk;u16 dsc_max_output_bpp =0 ;u8 dsc_slice_count =0 ; +bool dsc = false, bigjoiner = false;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ; - max_dotclk =intel_dp_downstream_max_dotclock (intel_dp); +if (mode->flags &DRM_MODE_FLAG_DBLCLK ) +return MODE_H_ILLEGAL ; + + max_dotclk =intel_dp_downstream_max_dotclock (intel_dp, false);if (intel_dp_is_edp (intel_dp) && fixed_mode) {if (mode->hdisplay > fixed_mode->hdisplay)@@ -619,6 +650,18 @@ intel_dp_mode_valid(struct drm_connector *connector, target_clock = fixed_mode->clock; } +if (mode->clock <10000 ) +return MODE_CLOCK_LOW ; + +if (target_clock > max_dotclk) { + max_dotclk =intel_dp_downstream_max_dotclock (intel_dp, true); + +if (target_clock > max_dotclk) +return MODE_CLOCK_HIGH ; + + bigjoiner = true; + } + max_link_clock =intel_dp_max_link_rate (intel_dp); max_lanes =intel_dp_max_lane_count (intel_dp);@@ -639,26 +682,32 @@ intel_dp_mode_valid(struct drm_connector *connector, true); }else if (drm_dp_sink_supports_fec (intel_dp->fec_capable)) { dsc_max_output_bpp = -intel_dp_dsc_get_output_bpp (max_link_clock, +intel_dp_dsc_get_output_bpp (dev_priv, + max_link_clock, max_lanes, target_clock, - mode->hdisplay) >>4 ; + mode->hdisplay, + bigjoiner) >>4 ; dsc_slice_count =intel_dp_dsc_get_slice_count (intel_dp, target_clock, - mode->hdisplay); + mode->hdisplay, + bigjoiner); } + + dsc = dsc_max_output_bpp && dsc_slice_count; }Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp.c intel_dp_mode_valid(struct drm_connector *connector, · line 705
Quoted 7 lines
drivers/gpu/drm/i915/display/intel_dp.c +4
-2-if ((mode_rate > max_rate && !(dsc_max_output_bpp && dsc_slice_count)) || - target_clock > max_dotclk) +/* big joiner configuration needs DSC */ +if (bigjoiner && !dsc) { +DRM_DEBUG_KMS ("Link clock needs bigjoiner, but DSC or FEC not available\n" );return MODE_CLOCK_HIGH ; + }Somewhere in this function we probably also need to make sure that the big joiner is available on the pipe and that we're not using eDP.
Quoted 2 lines
Yes I agree we need to check that we allow big joine only for B and C for ICL and then all pipes for TGL+ and not allow for eDP
Yeah, I only allow for mode_valid() to succeed with eDP, will fix that with a check.
bigjoiner is not allowed on pipe A through intel_dp_source_supports_dsc, pipe A -> it didn't need an explicit check.
Quoted 39 lines
Quoted 39 lines
Matt
Quoted 37 lines
drivers/gpu/drm/i915/display/intel_dp.c +10
-8-if (mode->clock <10000 ) -return MODE_CLOCK_LOW ; - -if (mode->flags &DRM_MODE_FLAG_DBLCLK ) -return MODE_H_ILLEGAL ; +if (mode_rate > max_rate && !dsc) { +DRM_DEBUG_KMS ("Cannot drive without DSC\n" ); +return MODE_CLOCK_HIGH ; + }return intel_mode_valid_max_plane_size (dev_priv, mode); }@@ -2068,14 +2117,17 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,u8 dsc_dp_slice_count; dsc_max_output_bpp = -intel_dp_dsc_get_output_bpp (pipe_config->port_clock, +intel_dp_dsc_get_output_bpp (dev_priv, + pipe_config->port_clock, pipe_config->lane_count, adjusted_mode->crtc_clock, - adjusted_mode->crtc_hdisplay); + adjusted_mode->crtc_hdisplay, + false); dsc_dp_slice_count =intel_dp_dsc_get_slice_count (intel_dp, adjusted_mode->crtc_clock, - adjusted_mode->crtc_hdisplay); + adjusted_mode->crtc_hdisplay, + false);if (!dsc_max_output_bpp || !dsc_dp_slice_count) {DRM_DEBUG_KMS ("Compressed BPP/Slice Count not supported\n" );return -EINVAL ;Signature · 1 line
2.20.1
Quoted 14 lines
Quoted 14 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Maarten Lankhorst
maintainerPATCH 11/23 drm/i915: Try to make bigjoiner work in atomic check.
In reply to Maarten LankhorstWhen the clock is higher than the dotclock, try with 2 pipes enabled. If we can enable 2, then we will go into big joiner mode, and steal the adjacent crtc.
This only links the crtc's in software, no hardware or plane programming is done yet. Blobs are also copied from the master's crtc_state, so it doesn't depend at commit time on the other crtc_state.
--- drivers/gpu/drm/i915/display/intel_atomic.c | 15 +- drivers/gpu/drm/i915/display/intel_atomic.h | 3 +- drivers/gpu/drm/i915/display/intel_display.c | 197 +++++++++++++++++- .../drm/i915/display/intel_display_types.h | 11 +- drivers/gpu/drm/i915/display/intel_dp.c | 25 ++- 5 files changed, 228 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +8 -7
@@ -228,25 +228,26 @@ void intel_crtc_free_hw_state(struct intel_crtc_state *crtc_state)intel_crtc_put_color_blobs (crtc_state); } -void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state) +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state, +const struct intel_crtc_state *from_crtc_state) {intel_crtc_put_color_blobs (crtc_state); -if (crtc_state->uapi.degamma_lut) +if (from_crtc_state->uapi.degamma_lut) crtc_state->hw.degamma_lut = -drm_property_blob_get (crtc_state->uapi.degamma_lut); +drm_property_blob_get (from_crtc_state->uapi.degamma_lut);else crtc_state->hw.degamma_lut =NULL ; -if (crtc_state->uapi.gamma_lut) +if (from_crtc_state->uapi.gamma_lut) crtc_state->hw.gamma_lut = -drm_property_blob_get (crtc_state->uapi.gamma_lut); +drm_property_blob_get (from_crtc_state->uapi.gamma_lut);else crtc_state->hw.gamma_lut =NULL ; -if (crtc_state->uapi.ctm) +if (from_crtc_state->uapi.ctm) crtc_state->hw.ctm = -drm_property_blob_get (crtc_state->uapi.ctm); +drm_property_blob_get (from_crtc_state->uapi.ctm);else crtc_state->hw.ctm =NULL ; }
drivers/gpu/drm/i915/display/intel_atomic.h +2 -1
@@ -36,7 +36,8 @@ struct drm_crtc_state *intel_crtc_duplicate_state(struct drm_crtc *crtc);void intel_crtc_destroy_state (struct drm_crtc *crtc,struct drm_crtc_state *state);void intel_crtc_free_hw_state (struct intel_crtc_state *crtc_state); -void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state); +void intel_crtc_copy_color_blobs (struct intel_crtc_state *crtc_state, +const struct intel_crtc_state *from_crtc_state);struct drm_atomic_state *intel_atomic_state_alloc (struct drm_device *dev);void intel_atomic_state_clear (struct drm_atomic_state *state);
drivers/gpu/drm/i915/display/intel_display.c +189 -8
276 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_display_types.h +10 -1
@@ -774,7 +774,7 @@ struct intel_crtc_state {struct {bool active, enable;struct drm_property_blob *degamma_lut, *gamma_lut, *ctm; -struct drm_display_mode mode, adjusted_mode; +struct drm_display_mode mode, adjusted_mode, transcoder_mode; } hw;/**
@@ -1005,6 +1005,15 @@ struct intel_crtc_state {/* enable pipe csc? */ bool csc_enable; +/* enable pipe big joiner? */ +bool bigjoiner; + +/* big joiner slave crtc? */ +bool bigjoiner_slave; + +/* linked crtc for bigjoiner, either slave or master */ +struct intel_crtc *bigjoiner_linked_crtc; +/* Display Stream compression state */ struct {bool compression_enable;
drivers/gpu/drm/i915/display/intel_dp.c +19 -6
@@ -2105,6 +2105,19 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, pipe_config->port_clock = intel_dp->common_rates[limits->max_clock]; pipe_config->lane_count = limits->max_lane_count; +if (adjusted_mode->crtc_clock >intel_dp_downstream_max_dotclock (intel_dp, false)) { +if (adjusted_mode->crtc_clock >intel_dp_downstream_max_dotclock (intel_dp, true)) { +DRM_DEBUG_KMS ("Clock rate too high for big joiner\n" ); +return -EINVAL ; + } +if (intel_dp_is_edp (intel_dp)) { +DRM_DEBUG_KMS ("Cannot split eDP stream in bigjoiner configuration.\n" ); +return -EINVAL ; + } + pipe_config->bigjoiner = true; +DRM_DEBUG_KMS ("Using bigjoiner configuration\n" ); + } +if (intel_dp_is_edp (intel_dp)) { pipe_config->dsc_params.compressed_bpp = min_t(u16, drm_edp_dsc_sink_output_bpp(intel_dp->dsc_dpcd) >> 4,
@@ -2122,12 +2135,12 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, pipe_config->lane_count, adjusted_mode->crtc_clock, adjusted_mode->crtc_hdisplay, - false); + pipe_config->bigjoiner); dsc_dp_slice_count =intel_dp_dsc_get_slice_count (intel_dp, adjusted_mode->crtc_clock, adjusted_mode->crtc_hdisplay, - false); + pipe_config->bigjoiner);if (!dsc_max_output_bpp || !dsc_dp_slice_count) {DRM_DEBUG_KMS ("Compressed BPP/Slice Count not supported\n" );return -EINVAL ;
@@ -2142,13 +2155,13 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,* is greater than the maximum Cdclock and if slice count is even * then we need to use 2 VDSC instances. */ -if (adjusted_mode->crtc_clock > dev_priv->max_cdclk_freq) { -if (pipe_config->dsc_params.slice_count >1 ) { - pipe_config->dsc_params.dsc_split = true; - }else { +if (adjusted_mode->crtc_clock > dev_priv->max_cdclk_freq || pipe_config->bigjoiner) { +if (pipe_config->dsc_params.slice_count <2 ) {DRM_DEBUG_KMS ("Cannot split stream to use 2 VDSC instances\n" );return -EINVAL ; } + + pipe_config->dsc_params.dsc_split = true; } ret =intel_dp_compute_dsc_params (intel_dp, pipe_config);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx