drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes
Subsystems (3)
PATCH v8 1/7 drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes
No functional changes. This patch just moves some mode checks around to prepare for adding bigjoiner related mode validation
--- drivers/gpu/drm/i915/display/intel_dp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +6 -6
@@ -721,6 +721,9 @@ intel_dp_mode_valid(struct drm_connector *connector,if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ; +if (mode->flags &DRM_MODE_FLAG_DBLCLK ) +return MODE_H_ILLEGAL ; +if (intel_dp_is_edp (intel_dp) && fixed_mode) {if (mode->hdisplay > fixed_mode->hdisplay)return MODE_PANEL ;
@@ -731,6 +734,9 @@ intel_dp_mode_valid(struct drm_connector *connector, target_clock = fixed_mode->clock; } +if (mode->clock <10000 ) +return MODE_CLOCK_LOW ; + max_link_clock =intel_dp_max_link_rate (intel_dp); max_lanes =intel_dp_max_lane_count (intel_dp);
@@ -771,12 +777,6 @@ intel_dp_mode_valid(struct drm_connector *connector, target_clock > max_dotclk)return MODE_CLOCK_HIGH ; -if (mode->clock <10000 ) -return MODE_CLOCK_LOW ; - -if (mode->flags &DRM_MODE_FLAG_DBLCLK ) -return MODE_H_ILLEGAL ; - status =intel_dp_mode_valid_downstream (intel_connector, mode, target_clock);if (status !=MODE_OK )
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 2/7 drm/i915: Move encoder->get_config to a new function
No functional changes, create a separate intel_encoder_get_config() function that calls encoder->get_config hook.
This is needed so that later we can add beigjoienr related readout here.
--- drivers/gpu/drm/i915/display/intel_display.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +9 -3
@@ -8222,6 +8222,12 @@ static u32 ilk_pipe_pixel_rate(const struct intel_crtc_state *crtc_state) pfit_w * pfit_h); } +static void intel_encoder_get_config (struct intel_encoder *encoder, +struct intel_crtc_state *crtc_state) +{ + encoder->get_config (encoder, crtc_state); +} +static void intel_crtc_compute_pixel_rate (struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->uapi.crtc->dev);
@@ -12475,7 +12481,7 @@ intel_encoder_current_mode(struct intel_encoder *encoder)return NULL ; } - encoder->get_config (encoder, crtc_state); +intel_encoder_get_config (encoder, crtc_state);intel_mode_from_pipe_config (mode, crtc_state);
@@ -14520,7 +14526,7 @@ verify_crtc_state(struct intel_crtc *crtc, pipe_name(pipe));if (active) - encoder->get_config (encoder, pipe_config); +intel_encoder_get_config (encoder, pipe_config); }intel_crtc_compute_pixel_rate (pipe_config);
@@ -18833,7 +18839,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) crtc_state =to_intel_crtc_state (crtc->base.state); encoder->base.crtc = &crtc->base; - encoder->get_config (encoder, crtc_state); +intel_encoder_get_config (encoder, crtc_state);if (encoder->sync_state) encoder->sync_state (encoder, crtc_state); }else {
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 3/7 drm/i915/dp: Add a wrapper function around get_pipe_config
In reply to Manasi NavareCreate a new function intel_crtc_get_pipe_config() that calls platform specific hooks for get_pipe_config() No functional change here.
--- drivers/gpu/drm/i915/display/intel_display.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +11 -3
@@ -11479,6 +11479,14 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,return active; } +static bool intel_crtc_get_pipe_config (struct intel_crtc *crtc, +struct intel_crtc_state *pipe_config) +{ +struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); + +return dev_priv->display.get_pipe_config (crtc, pipe_config); +} +static u32 intel_cursor_base (const struct intel_plane_state *plane_state) { struct drm_i915_private *dev_priv =
@@ -12475,7 +12483,7 @@ intel_encoder_current_mode(struct intel_encoder *encoder)return NULL ; } -if (!dev_priv->display.get_pipe_config (crtc, crtc_state)) { +if (!intel_crtc_get_pipe_config (crtc, crtc_state)) {kfree (crtc_state);kfree (mode);return NULL ;
@@ -14495,7 +14503,7 @@ verify_crtc_state(struct intel_crtc *crtc, pipe_config->hw.enable = new_crtc_state->hw.enable; pipe_config->hw.active = - dev_priv->display.get_pipe_config (crtc, pipe_config); +intel_crtc_get_pipe_config (crtc, pipe_config);/* we keep both pipes enabled on 830 */ if (IS_I830 (dev_priv) && pipe_config->hw.active)
@@ -18808,7 +18816,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)intel_crtc_state_reset (crtc_state, crtc); crtc_state->hw.active = crtc_state->hw.enable = - dev_priv->display.get_pipe_config (crtc, crtc_state); +intel_crtc_get_pipe_config (crtc, crtc_state); crtc->base.enabled = crtc_state->hw.enable; crtc->active = crtc_state->hw.active;
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 4/7 drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split
In reply to Manasi NavareFrom: Maarten Lankhorst <[email protected]>
With bigjoiner, there will be 2 pipes driving 2 halves of 1 transcoder, because of this, we need a pipe_mode for various calculations, including for example watermarks, plane clipping, etc.
v10:
* remove redundant pipe_mode assignment (Ville) v9:
* pipe_mode in state dump nd state check (Ville) v8:
* Add pipe_mode in readout in verify_crtc_state (Ville) v7:
* Remove redundant comment (Ville)
* Just keep mode instead of pipe_mode (Ville)
v6:
* renaming in separate function, only pipe_mode here (Ville)
* Add description (Maarten)
v5:
* Rebase (Manasi)
v4:
* Manual rebase (Manasi)
v3:
* Change state to crtc_state, fix rebase err (Manasi) v2:
* Manual Rebase (Manasi)
--- drivers/gpu/drm/i915/display/intel_display.c | 55 +++++++++----- .../drm/i915/display/intel_display_types.h | 11 ++- drivers/gpu/drm/i915/intel_pm.c | 76 +++++++++---------- 3 files changed, 84 insertions(+), 58 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +37 -18
@@ -6167,18 +6167,16 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach,static int skl_update_scaler_crtc (struct intel_crtc_state *crtc_state) { -const struct drm_display_mode *adjusted_mode = - &crtc_state->hw.adjusted_mode; +const struct drm_display_mode *pipe_mode = &crtc_state->hw.pipe_mode;int width, height;if (crtc_state->pch_pfit.enabled) { width =drm_rect_width (&crtc_state->pch_pfit.dst); height =drm_rect_height (&crtc_state->pch_pfit.dst); }else { - width = adjusted_mode->crtc_hdisplay; - height = adjusted_mode->crtc_vdisplay; + width = pipe_mode->crtc_hdisplay; + height = pipe_mode->crtc_vdisplay; } - return skl_update_scaler(crtc_state, !crtc_state->hw.active, SKL_CRTC_INDEX, &crtc_state->scaler_state.scaler_id,
@@ -8192,7 +8190,7 @@ static bool intel_crtc_supports_double_wide(const struct intel_crtc *crtc)static u32 ilk_pipe_pixel_rate (const struct intel_crtc_state *crtc_state) { -u32 pixel_rate = crtc_state->hw.adjusted_mode.crtc_clock; +u32 pixel_rate = crtc_state->hw.pipe_mode.crtc_clock;unsigned int pipe_w, pipe_h, pfit_w, pfit_h;/*
@@ -8225,7 +8223,11 @@ static u32 ilk_pipe_pixel_rate(const struct intel_crtc_state *crtc_state)static void intel_encoder_get_config (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { +struct drm_display_mode *pipe_mode = &crtc_state->hw.pipe_mode; + encoder->get_config (encoder, crtc_state); + + *pipe_mode = crtc_state->hw.adjusted_mode; }static void intel_crtc_compute_pixel_rate (struct intel_crtc_state *crtc_state)
@@ -8235,7 +8237,7 @@ static void intel_crtc_compute_pixel_rate(struct intel_crtc_state *crtc_state)if (HAS_GMCH (dev_priv))/* FIXME calculate proper pipe pixel rate for GMCH pfit */ crtc_state->pixel_rate = - crtc_state->hw.adjusted_mode.crtc_clock; + crtc_state->hw.pipe_mode.crtc_clock;else crtc_state->pixel_rate =ilk_pipe_pixel_rate (crtc_state);
@@ -8245,9 +8247,11 @@ 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->hw.adjusted_mode; +struct drm_display_mode *pipe_mode = &pipe_config->hw.pipe_mode;int clock_limit = dev_priv->max_dotclk_freq; + *pipe_mode = pipe_config->hw.adjusted_mode; +if (INTEL_GEN (dev_priv) <4 ) { clock_limit = dev_priv->max_cdclk_freq *9 /10 ;
@@ -8256,16 +8260,16 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,* is > 90% of the (display) core speed. */ if (intel_crtc_supports_double_wide (crtc) && - adjusted_mode->crtc_clock > clock_limit) { + pipe_mode->crtc_clock > clock_limit) { clock_limit = dev_priv->max_dotclk_freq; pipe_config->double_wide = true; } } -if (adjusted_mode->crtc_clock > clock_limit) { +if (pipe_mode->crtc_clock > clock_limit) {drm_dbg_kms (&dev_priv->drm,"requested pixel clock (%d kHz) too high (max: %d kHz, double wide: %s)\n" , - adjusted_mode->crtc_clock, clock_limit, + pipe_mode->crtc_clock, clock_limit,yesno (pipe_config->double_wide));return -EINVAL ; }
@@ -8308,7 +8312,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,* WaPruneModeWithIncorrectHsyncOffset:ctg,elk,ilk,snb,ivb,vlv,hsw. */ if ((INTEL_GEN (dev_priv) >4 ||IS_G4X (dev_priv)) && - adjusted_mode->crtc_hsync_start == adjusted_mode->crtc_hdisplay) + pipe_mode->crtc_hsync_start == pipe_mode->crtc_hdisplay)return -EINVAL ;intel_crtc_compute_pixel_rate (pipe_config);
@@ -11483,8 +11487,12 @@ static bool intel_crtc_get_pipe_config(struct intel_crtc *crtc, struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +bool ret; -return dev_priv->display.get_pipe_config (crtc, pipe_config); + ret = dev_priv->display.get_pipe_config (crtc, pipe_config); + pipe_config->hw.pipe_mode = pipe_config->hw.adjusted_mode; + +return ret; }static u32 intel_cursor_base (const struct intel_plane_state *plane_state)
@@ -12835,15 +12843,15 @@ static bool c8_planes_changed(const struct intel_crtc_state *new_crtc_state)static u16 hsw_linetime_wm (const struct intel_crtc_state *crtc_state) { -const struct drm_display_mode *adjusted_mode = - &crtc_state->hw.adjusted_mode; +const struct drm_display_mode *pipe_mode = + &crtc_state->hw.pipe_mode;int linetime_wm;if (!crtc_state->hw.enable)return 0 ; - linetime_wm =DIV_ROUND_CLOSEST (adjusted_mode->crtc_htotal *1000 *8 , - adjusted_mode->crtc_clock); + linetime_wm =DIV_ROUND_CLOSEST (pipe_mode->crtc_htotal *1000 *8 , + pipe_mode->crtc_clock);return min (linetime_wm,0x1ff ); }
@@ -13330,7 +13338,10 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config,drm_mode_debug_printmodeline (&pipe_config->hw.mode);drm_dbg_kms (&dev_priv->drm,"adjusted mode:\n" );drm_mode_debug_printmodeline (&pipe_config->hw.adjusted_mode); +drm_dbg_kms (&dev_priv->drm,"pipe mode:\n" ); +drm_mode_debug_printmodeline (&pipe_config->hw.pipe_mode);intel_dump_crtc_timings (dev_priv, &pipe_config->hw.adjusted_mode); +intel_dump_crtc_timings (dev_priv, &pipe_config->hw.pipe_mode); drm_dbg_kms(&dev_priv->drm, "port clock: %d, pipe src size: %dx%d, pixel rate %d\n", pipe_config->port_clock,
@@ -13473,8 +13484,9 @@ intel_crtc_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; + crtc_state->hw.pipe_mode = crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; crtc_state->hw.scaling_filter = crtc_state->uapi.scaling_filter; +intel_crtc_copy_uapi_to_hw_state_nomodeset (crtc_state); }
@@ -13671,6 +13683,9 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)"hw max bpp: %i, pipe bpp: %i, dithering: %i\n" , base_bpp, pipe_config->pipe_bpp, pipe_config->dither); +/* without bigjoiner, pipe_mode == adjusted_mode */ + pipe_config->hw.pipe_mode = pipe_config->hw.adjusted_mode; +return 0 ; }
@@ -14079,6 +14094,10 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_X (output_types); +PIPE_CONF_CHECK_I (hw.pipe_mode.crtc_hdisplay); +PIPE_CONF_CHECK_I (hw.pipe_mode.crtc_hdisplay); +PIPE_CONF_CHECK_I (hw.pipe_mode.crtc_hdisplay); +PIPE_CONF_CHECK_I (hw.pipe_mode.crtc_hdisplay);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);
drivers/gpu/drm/i915/display/intel_display_types.h +9 -2
@@ -817,15 +817,22 @@ struct intel_crtc_state {* The following members are used to verify the hardware state: * - enable * - active -* - mode / adjusted_mode +* - mode/adjusted_mode * - color property blobs. * * During initial hw readout, they need to be copied to uapi. +* +* Bigjoiner will allow a transcoder mode that spans 2 pipes; +* Use the pipe_mode for calculations like watermarks, pipe +* scaler, and bandwidth. +* +* Use adjusted_mode for things that need to know the full +* mode on the transcoder, which spans all pipes. */ 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, pipe_mode, adjusted_mode;enum drm_scaling_filter scaling_filter; } hw;
drivers/gpu/drm/i915/intel_pm.c +38 -38
215 lines not on this page · raw message
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 5/7 drm/i915: Pass intel_atomic_state instead of drm_atomic_state
In reply to Manasi NavareNo functional changes, to align with previous cleanups pass intel_atomic_state instead of drm_atomic_state. Also pass this intel_atomic_state with crtc_state to some of the atomic_check functions.
v2:
* Squash some changes from next patch (Ville)
--- drivers/gpu/drm/i915/display/intel_display.c | 31 +++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +17 -14
@@ -12685,7 +12685,7 @@ static bool encoders_cloneable(const struct intel_encoder *a, b->cloneable & (1 << a->type)); } -static bool check_single_encoder_cloning (struct drm_atomic_state *state, +static bool check_single_encoder_cloning (struct intel_atomic_state *state,struct intel_crtc *crtc,struct intel_encoder *encoder) {
@@ -12694,7 +12694,7 @@ static bool check_single_encoder_cloning(struct drm_atomic_state *state,struct drm_connector_state *connector_state;int i; -for_each_new_connector_in_state (state, connector, connector_state, i) { +for_each_new_connector_in_state (&state->base, connector, connector_state, i) {if (connector_state->crtc != &crtc->base)continue ;
@@ -13473,13 +13473,15 @@ static bool check_digital_port_conflicts(struct intel_atomic_state *state) }static void -intel_crtc_copy_uapi_to_hw_state_nomodeset (struct intel_crtc_state *crtc_state) +intel_crtc_copy_uapi_to_hw_state_nomodeset (struct intel_atomic_state *state, +struct intel_crtc_state *crtc_state) {intel_crtc_copy_color_blobs (crtc_state); }static void -intel_crtc_copy_uapi_to_hw_state (struct intel_crtc_state *crtc_state) +intel_crtc_copy_uapi_to_hw_state (struct intel_atomic_state *state, +struct intel_crtc_state *crtc_state) { crtc_state->hw.enable = crtc_state->uapi.enable; crtc_state->hw.active = crtc_state->uapi.active;
@@ -13487,7 +13489,7 @@ intel_crtc_copy_uapi_to_hw_state(struct intel_crtc_state *crtc_state) crtc_state->hw.pipe_mode = crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode; crtc_state->hw.scaling_filter = crtc_state->uapi.scaling_filter; -intel_crtc_copy_uapi_to_hw_state_nomodeset (crtc_state); +intel_crtc_copy_uapi_to_hw_state_nomodeset (state, crtc_state); }static void intel_crtc_copy_hw_to_uapi_state (struct intel_crtc_state *crtc_state)
@@ -13510,7 +13512,8 @@ static void intel_crtc_copy_hw_to_uapi_state(struct intel_crtc_state *crtc_state }static int -intel_crtc_prepare_cleared_state (struct intel_crtc_state *crtc_state) +intel_crtc_prepare_cleared_state (struct intel_atomic_state *state, +struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);
@@ -13542,16 +13545,16 @@ intel_crtc_prepare_cleared_state(struct intel_crtc_state *crtc_state)memcpy (crtc_state, saved_state,sizeof (*crtc_state));kfree (saved_state); -intel_crtc_copy_uapi_to_hw_state (crtc_state); +intel_crtc_copy_uapi_to_hw_state (state, crtc_state);return 0 ; }static int -intel_modeset_pipe_config (struct intel_crtc_state *pipe_config) +intel_modeset_pipe_config (struct intel_atomic_state *state, +struct intel_crtc_state *pipe_config) {struct drm_crtc *crtc = pipe_config->uapi.crtc; -struct drm_atomic_state *state = pipe_config->uapi.state;struct drm_i915_private *i915 =to_i915 (pipe_config->uapi.crtc->dev);struct drm_connector *connector;struct drm_connector_state *connector_state;
@@ -13593,7 +13596,7 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config) &pipe_config->pipe_src_w, &pipe_config->pipe_src_h); -for_each_new_connector_in_state (state, connector, connector_state, i) { +for_each_new_connector_in_state (&state->base, connector, connector_state, i) {struct intel_encoder *encoder =to_intel_encoder (connector_state->best_encoder);
@@ -13631,7 +13634,7 @@ intel_modeset_pipe_config(struct intel_crtc_state *pipe_config)* adjust it according to limitations or connector properties, and also * a chance to reject the mode entirely. */ -for_each_new_connector_in_state (state, connector, connector_state, i) { +for_each_new_connector_in_state (&state->base, connector, connector_state, i) {struct intel_encoder *encoder =to_intel_encoder (connector_state->best_encoder);
@@ -15247,19 +15250,19 @@ static int intel_atomic_check(struct drm_device *dev, new_crtc_state, i) {if (!needs_modeset (new_crtc_state)) {/* Light copy */ -intel_crtc_copy_uapi_to_hw_state_nomodeset (new_crtc_state); +intel_crtc_copy_uapi_to_hw_state_nomodeset (state, new_crtc_state);continue ; } - ret =intel_crtc_prepare_cleared_state (new_crtc_state); + ret =intel_crtc_prepare_cleared_state (state, new_crtc_state);if (ret) goto fail;if (!new_crtc_state->hw.enable)continue ; - ret =intel_modeset_pipe_config (new_crtc_state); + ret =intel_modeset_pipe_config (state, new_crtc_state);if (ret) goto fail; }
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 6/7 drm/i915/dp: Add from_crtc_state to copy color blobs
In reply to Manasi NavareNo functional changes here, just adds a from_crtc_state as a prep for bigjoiner
v2:
* More prep with intel_atomic_state (Ville)
--- drivers/gpu/drm/i915/display/intel_atomic.c | 9 +++++---- drivers/gpu/drm/i915/display/intel_atomic.h | 3 ++- drivers/gpu/drm/i915/display/intel_display.c | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +5 -4
@@ -269,14 +269,15 @@ 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) {drm_property_replace_blob (&crtc_state->hw.degamma_lut, - crtc_state->uapi.degamma_lut); + from_crtc_state->uapi.degamma_lut);drm_property_replace_blob (&crtc_state->hw.gamma_lut, - crtc_state->uapi.gamma_lut); + from_crtc_state->uapi.gamma_lut);drm_property_replace_blob (&crtc_state->hw.ctm, - crtc_state->uapi.ctm); + from_crtc_state->uapi.ctm); }/**
drivers/gpu/drm/i915/display/intel_atomic.h +2 -1
@@ -43,7 +43,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_free (struct drm_atomic_state *state);void intel_atomic_state_clear (struct drm_atomic_state *state);
drivers/gpu/drm/i915/display/intel_display.c +3 -1
@@ -13476,7 +13476,9 @@ static void intel_crtc_copy_uapi_to_hw_state_nomodeset(struct intel_atomic_state *state, struct intel_crtc_state *crtc_state) { -intel_crtc_copy_color_blobs (crtc_state); + const struct intel_crtc_state *from_crtc_state = crtc_state; + +intel_crtc_copy_color_blobs (crtc_state, from_crtc_state); } static void
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v8 7/7 drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid(), v3.
In reply to Manasi NavareFrom: Maarten Lankhorst <[email protected]>
Small changes to intel_dp_mode_valid(), allow listing modes that can only be supported in the bigjoiner configuration, which is not supported yet.
v13:
* Allow bigjoiner if hdisplay >5120
v12:
* slice_count logic simplify (Ville)
* Fix unnecessary changes in downstream_mode_valid (Ville) v11:
* Make intel_dp_can_bigjoiner non static
so it can be used in intel_display (Manasi)
v10:
* Simplify logic (Ville)
* Allow bigjoiner on edp (Ville)
v9:
* Restric Bigjoiner on PORT A (Ville)
v8:
* use source dotclock for max dotclock (Manasi)
v7:
* Add can_bigjoiner() helper (Ville)
* Pass bigjoiner to plane_size validation (Ville)
v6:
* Rebase after dp_downstream mode valid changes (Manasi) v5:
* Increase max plane width to support 8K with bigjoiner (Maarten) v4:
* Rebase (Manasi)
Changes since v1:
- Disallow bigjoiner on eDP.
Changes since v2:
- Rename intel_dp_downstream_max_dotclock to intel_dp_max_dotclock, and split off the downstream and source checking to its own function. (Ville)
v3:
* Rebase (Manasi)
--- drivers/gpu/drm/i915/display/intel_display.c | 5 +- drivers/gpu/drm/i915/display/intel_display.h | 3 +- drivers/gpu/drm/i915/display/intel_dp.c | 78 ++++++++++++++++---- drivers/gpu/drm/i915/display/intel_dp.h | 1 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- drivers/gpu/drm/i915/display/intel_dsi.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- 7 files changed, 73 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +3 -2
@@ -17791,7 +17791,8 @@ intel_mode_valid(struct drm_device *dev,enum drm_mode_status intel_mode_valid_max_plane_size (struct drm_i915_private *dev_priv, -const struct drm_display_mode *mode) +const struct drm_display_mode *mode, +bool bigjoiner) {int plane_width_max, plane_height_max;
@@ -17808,7 +17809,7 @@ intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,* too big for that. */ if (INTEL_GEN (dev_priv) >=11 ) { - plane_width_max =5120 ; + plane_width_max =5120 << bigjoiner; plane_height_max =4320 ; }else { plane_width_max =5120 ;
drivers/gpu/drm/i915/display/intel_display.h +2 -1
@@ -513,7 +513,8 @@ u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv,bool intel_plane_can_remap (const struct intel_plane_state *plane_state);enum drm_mode_status intel_mode_valid_max_plane_size (struct drm_i915_private *dev_priv, -const struct drm_display_mode *mode); +const struct drm_display_mode *mode, +bool bigjoiner);enum phy intel_port_to_phy (struct drm_i915_private *i915,enum port port);bool is_trans_port_sync_mode (const struct intel_crtc_state *state);
drivers/gpu/drm/i915/display/intel_dp.c +64 -14
154 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dp.h +1 -0
@@ -106,6 +106,7 @@ bool intel_dp_source_supports_hbr3(struct intel_dp *intel_dp);bool intel_dp_get_colorimetry_status (struct intel_dp *intel_dp);int intel_dp_link_required (int pixel_clock,int bpp);int intel_dp_max_data_rate (int max_link_clock,int max_lanes); +bool intel_dp_can_bigjoiner (struct intel_dp *intel_dp);bool intel_dp_needs_vsc_sdp (const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state); void intel_dp_compute_psr_vsc_sdp(struct intel_dp *intel_dp,
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -1
@@ -714,7 +714,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,return 0 ; } - *status =intel_mode_valid_max_plane_size (dev_priv, mode); + *status =intel_mode_valid_max_plane_size (dev_priv, mode, false);return 0 ; }
drivers/gpu/drm/i915/display/intel_dsi.c +1 -1
@@ -75,7 +75,7 @@ enum drm_mode_status intel_dsi_mode_valid(struct drm_connector *connector,return MODE_CLOCK_HIGH ; } -return intel_mode_valid_max_plane_size (dev_priv, mode); +return intel_mode_valid_max_plane_size (dev_priv, mode, false); } struct intel_dsi_host *intel_dsi_host_init(struct intel_dsi *intel_dsi,
drivers/gpu/drm/i915/display/intel_hdmi.c +1 -1
@@ -2274,7 +2274,7 @@ intel_hdmi_mode_valid(struct drm_connector *connector,if (status !=MODE_OK )return status; -return intel_mode_valid_max_plane_size (dev_priv, mode); +return intel_mode_valid_max_plane_size (dev_priv, mode, false); } bool intel_hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v8 7/7] drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid(), v3.
All the review comments addressed here,
@Ville could you review this?
Manasi
Quoted 312 lines · Manasi Navare
From: Maarten Lankhorst <[email protected]>
Small changes to
intel_dp_mode_valid(), allow listing modes that can only be supported in the bigjoiner configuration, which is not supported yet.v13:
* Allow bigjoiner if hdisplay >5120
v12:
*slice_countlogic simplify (Ville)
* Fix unnecessary changes indownstream_mode_valid(Ville) v11:
* Makeintel_dp_can_bigjoinernon static
so it can be used inintel_display(Manasi)
v10:
* Simplify logic (Ville)
* Allow bigjoiner on edp (Ville)
v9:
* Restric Bigjoiner on PORT A (Ville)
v8:
* use source dotclock for max dotclock (Manasi)
v7:
* Addcan_bigjoiner()helper (Ville)
* Pass bigjoiner toplane_sizevalidation (Ville)
v6:
* Rebase afterdp_downstreammode valid changes (Manasi) v5:
* Increase max plane width to support 8K with bigjoiner (Maarten) v4:
* Rebase (Manasi)Changes since v1:
- Disallow bigjoiner on eDP.
Changes since v2:
- Renameintel_dp_downstream_max_dotclocktointel_dp_max_dotclock, and split off the downstream and source checking to its own function. (Ville)
v3:
* Rebase (Manasi)Signed-off-by Manasi Navare <[email protected]>Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 5 +- drivers/gpu/drm/i915/display/intel_display.h | 3 +- drivers/gpu/drm/i915/display/intel_dp.c | 78 ++++++++++++++++---- drivers/gpu/drm/i915/display/intel_dp.h | 1 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- drivers/gpu/drm/i915/display/intel_dsi.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- 7 files changed, 73 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +3
-2@@ -17791,7 +17791,8 @@ intel_mode_valid(struct drm_device *dev,enum drm_mode_status intel_mode_valid_max_plane_size (struct drm_i915_private *dev_priv, -const struct drm_display_mode *mode) +const struct drm_display_mode *mode, +bool bigjoiner) {int plane_width_max, plane_height_max;@@ -17808,7 +17809,7 @@ intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,* too big for that. */ if (INTEL_GEN (dev_priv) >=11 ) { - plane_width_max =5120 ; + plane_width_max =5120 << bigjoiner; plane_height_max =4320 ; }else { plane_width_max =5120 ;drivers/gpu/drm/i915/display/intel_display.h +2
-1@@ -513,7 +513,8 @@ u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv,bool intel_plane_can_remap (const struct intel_plane_state *plane_state);enum drm_mode_status intel_mode_valid_max_plane_size (struct drm_i915_private *dev_priv, -const struct drm_display_mode *mode); +const struct drm_display_mode *mode, +bool bigjoiner);enum phy intel_port_to_phy (struct drm_i915_private *i915,enum port port);bool is_trans_port_sync_mode (const struct intel_crtc_state *state);drivers/gpu/drm/i915/display/intel_dp.c +64
-14@@ -254,6 +254,17 @@ intel_dp_max_data_rate(int max_link_clock, int max_lanes)return max_link_clock * max_lanes; } +bool intel_dp_can_bigjoiner (struct intel_dp *intel_dp) +{ +struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); +struct intel_encoder *encoder = &intel_dig_port->base; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); + +return INTEL_GEN (dev_priv) >=12 || + (INTEL_GEN (dev_priv) ==11 && + encoder->port !=PORT_A ); +} +static int cnl_max_source_rate (struct intel_dp *intel_dp) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);@@ -519,7 +530,8 @@ small_joiner_ram_size_bits(struct drm_i915_private *i915)static u16 intel_dp_dsc_get_output_bpp (struct drm_i915_private *i915,u32 link_clock,u32 lane_count, -u32 mode_clock,u32 mode_hdisplay) +u32 mode_clock,u32 mode_hdisplay, +bool bigjoiner) {u32 bits_per_pixel, max_bpp_small_joiner_ram;int i;@@ -537,6 +549,10 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */ max_bpp_small_joiner_ram =small_joiner_ram_size_bits (i915) / mode_hdisplay; + +if (bigjoiner) + max_bpp_small_joiner_ram *=2 ; +drm_dbg_kms (&i915->drm,"Max small joiner bpp: %u\n" , max_bpp_small_joiner_ram);@@ -546,6 +562,15 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,*/ bits_per_pixel =min (bits_per_pixel, max_bpp_small_joiner_ram); +if (bigjoiner) { +u32 max_bpp_bigjoiner = + i915->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_dbg_kms(&i915->drm, "Unsupported BPP %u, min %u\n",@@ -568,7 +593,8 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915, }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) {struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 min_slice_count, i;@@ -595,12 +621,18 @@ 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 = valid_dsc_slicecount[i] << bigjoiner; + +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_dbg_kms(&i915->drm, "Unsupported Slice Count %d\n",@@ -717,6 +749,7 @@ intel_dp_mode_valid(struct drm_connector *connector,u16 dsc_max_output_bpp =0 ;u8 dsc_slice_count =0 ;enum drm_mode_status status; +bool dsc = false, bigjoiner = false;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ;@@ -737,6 +770,14 @@ intel_dp_mode_valid(struct drm_connector *connector,if (mode->clock <10000 )return MODE_CLOCK_LOW ; +if ((target_clock > max_dotclk || mode->hdisplay >5120 ) + &&intel_dp_can_bigjoiner (intel_dp)) { + bigjoiner = true; + max_dotclk *=2 ; + } +if (target_clock > max_dotclk) +return MODE_CLOCK_HIGH ; + max_link_clock =intel_dp_max_link_rate (intel_dp); max_lanes =intel_dp_max_lane_count (intel_dp);@@ -765,16 +806,23 @@ intel_dp_mode_valid(struct drm_connector *connector, 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) +return MODE_CLOCK_HIGH ; + +if (mode_rate > max_rate && !dsc)return MODE_CLOCK_HIGH ; status = intel_dp_mode_valid_downstream(intel_connector,@@ -782,7 +830,7 @@ intel_dp_mode_valid(struct drm_connector *connector,if (status !=MODE_OK )return status; -return intel_mode_valid_max_plane_size (dev_priv, mode); +return intel_mode_valid_max_plane_size (dev_priv, mode, bigjoiner); }u32 intel_dp_pack_aux (const u8 *src,int src_bytes)@@ -2351,11 +2399,13 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, 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_dbg_kms (&dev_priv->drm,"Compressed BPP/Slice Count not supported\n" );drivers/gpu/drm/i915/display/intel_dp.h +1
-0@@ -106,6 +106,7 @@ bool intel_dp_source_supports_hbr3(struct intel_dp *intel_dp);bool intel_dp_get_colorimetry_status (struct intel_dp *intel_dp);int intel_dp_link_required (int pixel_clock,int bpp);int intel_dp_max_data_rate (int max_link_clock,int max_lanes); +bool intel_dp_can_bigjoiner (struct intel_dp *intel_dp);bool intel_dp_needs_vsc_sdp (const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state); void intel_dp_compute_psr_vsc_sdp(struct intel_dp *intel_dp,drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-1@@ -714,7 +714,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,return 0 ; } - *status =intel_mode_valid_max_plane_size (dev_priv, mode); + *status =intel_mode_valid_max_plane_size (dev_priv, mode, false);return 0 ; }drivers/gpu/drm/i915/display/intel_dsi.c +1
-1@@ -75,7 +75,7 @@ enum drm_mode_status intel_dsi_mode_valid(struct drm_connector *connector,return MODE_CLOCK_HIGH ; } -return intel_mode_valid_max_plane_size (dev_priv, mode); +return intel_mode_valid_max_plane_size (dev_priv, mode, false); } struct intel_dsi_host *intel_dsi_host_init(struct intel_dsi *intel_dsi,drivers/gpu/drm/i915/display/intel_hdmi.c +1
-1@@ -2274,7 +2274,7 @@ intel_hdmi_mode_valid(struct drm_connector *connector,if (status !=MODE_OK )return status; -return intel_mode_valid_max_plane_size (dev_priv, mode); +return intel_mode_valid_max_plane_size (dev_priv, mode, false); } bool intel_hdmi_deep_color_possible(const struct intel_crtc_state *crtc_state,Signature · 1 line
2.19.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v8 7/7] drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid(), v3.
In reply to Manasi NavareChanges look good to me. Feel free to add my r-b.
Good to get feedback from Ville as he has review comments before.
Regards,
Animesh
Quoted 342 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Manasi Navare
Sent: Tuesday, November 10, 2020 1:43 AM
To: [email protected]
Subject: [Intel-gfx] [PATCH v8 7/7] drm/i915/dp: Allow big joiner modes inintel_dp_mode_valid(), v3.From: Maarten Lankhorst <[email protected]>
Small changes to
intel_dp_mode_valid(), allow listing modes that can only be supported in the bigjoiner configuration, which is not supported yet.v13:
* Allow bigjoiner if hdisplay >5120
v12:
*slice_countlogic simplify (Ville)
* Fix unnecessary changes indownstream_mode_valid(Ville)
v11:
* Makeintel_dp_can_bigjoinernon static so it can be used inintel_display(Manasi)
v10:
* Simplify logic (Ville)
* Allow bigjoiner on edp (Ville)
v9:
* Restric Bigjoiner on PORT A (Ville)
v8:
* use source dotclock for max dotclock (Manasi)
v7:
* Addcan_bigjoiner()helper (Ville)
* Pass bigjoiner toplane_sizevalidation (Ville)
v6:
* Rebase afterdp_downstreammode valid changes (Manasi)
v5:
* Increase max plane width to support 8K with bigjoiner (Maarten) v4:
* Rebase (Manasi)Changes since v1:
- Disallow bigjoiner on eDP.
Changes since v2:
- Renameintel_dp_downstream_max_dotclocktointel_dp_max_dotclock, and split off the downstream and source checking to its own function. (Ville)
v3:
* Rebase (Manasi)Signed-off-by Manasi Navare <[email protected]>Signed-off-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 5 +- drivers/gpu/drm/i915/display/intel_display.h | 3 +- drivers/gpu/drm/i915/display/intel_dp.c | 78 ++++++++++++++++---- drivers/gpu/drm/i915/display/intel_dp.h | 1 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- drivers/gpu/drm/i915/display/intel_dsi.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- 7 files changed, 73 insertions(+), 20 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +3
-2@@ -17791,7 +17791,8 @@ intel_mode_valid(struct drm_device *dev,enum drm_mode_status intel_mode_valid_max_plane_size (struct drm_i915_private *dev_priv, -const struct drm_display_mode *mode) +const struct drm_display_mode *mode, +bool bigjoiner) {int plane_width_max, plane_height_max;@@ -17808,7 +17809,7 @@ intel_mode_valid_max_plane_size(structdrm_i915_private *dev_priv, * too big for that. */ if (INTEL_GEN (dev_priv) >=11 ) { - plane_width_max =5120 ; + plane_width_max =5120 << bigjoiner; plane_height_max =4320 ; }else {drivers/gpu/drm/i915/display/intel_display.c +0
-0plane_width_max =5120 ;drivers/gpu/drm/i915/display/intel_display.h +2
-1@@ -513,7 +513,8 @@ u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv, bool intel_plane_can_remap(const struct intel_plane_state *plane_state);enum drm_mode_status intel_mode_valid_max_plane_size (struct drm_i915_private *dev_priv, -const struct drm_display_mode *mode); +const struct drm_display_mode *mode, +bool bigjoiner);enum phy intel_port_to_phy (struct drm_i915_private *i915,enum port port);bool is_trans_port_sync_mode (const struct intel_crtc_state *state);drivers/gpu/drm/i915/display/intel_dp.c +10
-0@@ -254,6 +254,17 @@ intel_dp_max_data_rate(int max_link_clock, int max_lanes)return max_link_clock * max_lanes; } +bool intel_dp_can_bigjoiner (struct intel_dp *intel_dp) { +struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); +struct intel_encoder *encoder = &intel_dig_port->base; +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); + +return INTEL_GEN (dev_priv) >=12 || + (INTEL_GEN (dev_priv) ==11 && + encoder->port !=PORT_A ); +} +static int cnl_max_source_rate (struct intel_dp *intel_dp) { struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); @@ -519,7 +530,8 @@
small_joiner_ram_size_bits(struct drm_i915_private *i915)static u16 intel_dp_dsc_get_output_bpp(struct
drm_i915_private*i915,drivers/gpu/drm/i915/display/intel_dp.c +15
-1u32 link_clock, u32 lane_count, - u32 mode_clock, u32 mode_hdisplay) + u32 mode_clock, u32 mode_hdisplay, + bool bigjoiner) { u32 bits_per_pixel, max_bpp_small_joiner_ram;int i;@@ -537,6 +549,10 @@ static u16 intel_dp_dsc_get_output_bpp(structdrm_i915_private *i915,/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */ max_bpp_small_joiner_ram =small_joiner_ram_size_bits (i915) / mode_hdisplay; + +if (bigjoiner) + max_bpp_small_joiner_ram *=2 ; +drm_dbg_kms (&i915->drm,"Max small joiner bpp: %u\n" , max_bpp_small_joiner_ram);@@ -546,6 +562,15 @@ static u16 intel_dp_dsc_get_output_bpp(structdrm_i915_private *i915, */ bits_per_pixel =min (bits_per_pixel, max_bpp_small_joiner_ram); +if (bigjoiner) { +u32 max_bpp_bigjoiner = + i915->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 */ drivers/gpu/drm/i915/display/intel_dp.c +13
-6if (bits_per_pixel < valid_dsc_bpp[0 ]) { drm_dbg_kms(&i915->drm, "Unsupported BPP %u, min %u\n",@@ -568,7 +593,8 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915, }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) {struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 min_slice_count, i;@@ -595,12 +621,18 @@ 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 = valid_dsc_slicecount[i] << bigjoiner; + +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_dbg_kms(&i915->drm, "Unsupported Slice Count %d\n", @@ -
717,6 +749,7 @@ intel_dp_mode_valid(structdrm_connector*connector,drivers/gpu/drm/i915/display/intel_dp.c +15
-3u16 dsc_max_output_bpp =0 ;u8 dsc_slice_count =0 ;enum drm_mode_status status; +bool dsc = false, bigjoiner = false;if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ;@@ -737,6 +770,14 @@ intel_dp_mode_valid(struct drm_connector *connector, if (mode->clock < 10000)return MODE_CLOCK_LOW ; +if ((target_clock > max_dotclk || mode->hdisplay >5120 ) + &&intel_dp_can_bigjoiner (intel_dp)) { + bigjoiner = true; + max_dotclk *=2 ; + } +if (target_clock > max_dotclk) +return MODE_CLOCK_HIGH ; + max_link_clock =intel_dp_max_link_rate (intel_dp); max_lanes =intel_dp_max_lane_count (intel_dp);@@ -765,16 +806,23 @@ intel_dp_mode_valid(struct drm_connector *connector, 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)) ||drivers/gpu/drm/i915/display/intel_dp.c +6
-2- target_clock > max_dotclk) +/* big joiner configuration needs DSC */ +if (bigjoiner && !dsc) +return MODE_CLOCK_HIGH ; + +if (mode_rate > max_rate && !dsc)return MODE_CLOCK_HIGH ; status = intel_dp_mode_valid_downstream(intel_connector,@@ -782,7 +830,7 @@ intel_dp_mode_valid(struct drm_connector *connector,if (status !=MODE_OK )return status; -return intel_mode_valid_max_plane_size (dev_priv, mode); +return intel_mode_valid_max_plane_size (dev_priv, mode, bigjoiner); } u32 intel_dp_pack_aux(const u8 *src, int src_bytes) @@ -2351,11 +2399,13@@ static int intel_dp_dsc_compute_config(struct
intel_dp*intel_dp,drivers/gpu/drm/i915/display/intel_dp.c +0
-1pipe_config->port_clock, pipe_config->lane_count, adjusted_mode->crtc_clock, - adjusted_mode-Quoted 1 line
crtc_hdisplay);drivers/gpu/drm/i915/display/intel_dp.c +1
-0+ adjusted_mode-Quoted 1 line
crtc_hdisplay,drivers/gpu/drm/i915/display/intel_dp.c +1
-1+ false); dsc_dp_slice_count = intel_dp_dsc_get_slice_count(intel_dp, adjusted_mode->crtc_clock, - adjusted_mode-Quoted 1 line
crtc_hdisplay);drivers/gpu/drm/i915/display/intel_dp.c +1
-0+ adjusted_mode-Quoted 1 line
crtc_hdisplay,drivers/gpu/drm/i915/display/intel_dp.c +1
-0+ false);if (!dsc_max_output_bpp || !dsc_dp_slice_count) { drm_dbg_kms(&dev_priv->drm, "Compressed BPP/Slice Count notsupported\n"); diff --git
a/drivers/gpu/drm/i915/display/intel_dp.hb/drivers/gpu/drm/i915/display/intel_dp.h
index3f862b4fd34f..b871a09b6901100644drivers/gpu/drm/i915/display/intel_dp.h +0
-0@@ -106,6 +106,7 @@ bool intel_dp_source_supports_hbr3(struct intel_dp *intel_dp); bool intel_dp_get_colorimetry_status(struct intel_dp *intel_dp); int
intel_dp_link_required(int pixel_clock, int bpp); intintel_dp_max_data_rate(int max_link_clock, int max_lanes);drivers/gpu/drm/i915/display/intel_dp.h +1
-0+bool intel_dp_can_bigjoiner (struct intel_dp *intel_dp);bool intel_dp_needs_vsc_sdp (const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state);void intel_dp_compute_psr_vsc_sdp(struct
intel_dp*intel_dp, diff --gita/drivers/gpu/drm/i915/display/intel_dp_mst.cb/drivers/gpu/drm/i915/display/intel_dp_mst.c
indexc8fcec4d0788..0c8684634fca100644drivers/gpu/drm/i915/display/intel_dp_mst.c +1
-1@@ -714,7 +714,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, return 0; } - *status =intel_mode_valid_max_plane_size (dev_priv, mode); + *status =intel_mode_valid_max_plane_size (dev_priv, mode, false);return 0 ; }drivers/gpu/drm/i915/display/intel_dsi.c +1
-1@@ -75,7 +75,7 @@ enum drm_mode_status intel_dsi_mode_valid(structdrm_connector *connector, return MODE_CLOCK_HIGH; } -return intel_mode_valid_max_plane_size (dev_priv, mode); +return intel_mode_valid_max_plane_size (dev_priv, mode, false); }struct
intel_dsi_host*intel_dsi_host_init(structintel_dsi*intel_dsi, diff --gita/drivers/gpu/drm/i915/display/intel_hdmi.cb/drivers/gpu/drm/i915/display/intel_hdmi.c
indexf90838bc74fb..82674a8853c6100644drivers/gpu/drm/i915/display/intel_hdmi.c +1
-1@@ -2274,7 +2274,7 @@ intel_hdmi_mode_valid(struct drm_connector *connector, if (status != MODE_OK)return status; -return intel_mode_valid_max_plane_size (dev_priv, mode); +return intel_mode_valid_max_plane_size (dev_priv, mode, false); }bool intel_hdmi_deep_color_possible(const struct
intel_crtc_state*crtc_state,
--
2.19.1
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
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [v8,1/7] drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes (rev2)
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: series starting with [v8,1/7] drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes (rev2)
URL : https://patchwork.freedesktop.org/series/83655/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 3642707f5f97 drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes 3abf2ed167c7 drm/i915: Move encoder->get_config to a new function 968544a3c74a drm/i915/dp: Add a wrapper function around get_pipe_config 7c6b8f47d385 drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split -:188: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #188: FILE: drivers/gpu/drm/i915/display/intel_display.c:13409: + crtc_state->hw.pipe_mode = crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode;
total: 0 errors, 0 warnings, 1 checks, 397 lines checkeda312828af913 drm/i915: Pass intel_atomic_state instead of drm_atomic_state bf239f8a9820 drm/i915/dp: Add from_crtc_state to copy color blobs f74e178a1a28 drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid(), v3. -:191: CHECK:LOGICAL_CONTINUATIONS: Logical continuations should be on the previous line #191: FILE: drivers/gpu/drm/i915/display/intel_dp.c:774:
+ if ((target_clock > max_dotclk || mode->hdisplay > 5120)
+ && intel_dp_can_bigjoiner(intel_dp)) {
total: 0 errors, 0 warnings, 1 checks, 211 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for series starting with [v8,1/7] drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes (rev2)
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: series starting with [v8,1/7] drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes (rev2)
URL : https://patchwork.freedesktop.org/series/83655/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9305 -> Patchwork_18880
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18880 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_18880, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18880:
### CI changes ###
#### Possible regressions ####
* boot (NEW):
- fi-icl-y: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-icl-y/boot.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-icl-y/boot.html
- fi-cfl-8109u: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-cfl-8109u/boot.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-cfl-8109u/boot.html
- fi-cfl-8700k: [PASS][5] -> [FAIL][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-cfl-8700k/boot.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-cfl-8700k/boot.html
- {fi-ehl-1}: [PASS][7] -> [FAIL][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-ehl-1/boot.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-ehl-1/boot.html
- fi-skl-6700k2: [PASS][9] -> [FAIL][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-skl-6700k2/boot.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-skl-6700k2/boot.html
- fi-cfl-guc: [PASS][11] -> [FAIL][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-cfl-guc/boot.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-cfl-guc/boot.html
- fi-skl-lmem: [PASS][13] -> [FAIL][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-skl-lmem/boot.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-skl-lmem/boot.html
- fi-glk-dsi: [PASS][15] -> [FAIL][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-glk-dsi/boot.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-glk-dsi/boot.html
- fi-kbl-7500u: [PASS][17] -> [FAIL][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-kbl-7500u/boot.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-kbl-7500u/boot.html
- fi-skl-guc: [PASS][19] -> [FAIL][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-skl-guc/boot.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-skl-guc/boot.html
New tests
---------
New tests have been introduced between CI_DRM_9305 and Patchwork_18880:
### New CI tests (1) ###
* boot:
- Statuses : 12 fail(s) 29 pass(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in Patchwork_18880 that come from known issues:
### CI changes ###
#### Issues hit ####
* boot (NEW):
- fi-apl-guc: [PASS][21] -> [FAIL][22] ([i915#1635] / [i915#348])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-apl-guc/boot.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-apl-guc/boot.html
- fi-bxt-dsi: [PASS][23] -> [FAIL][24] ([i915#1635])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-bxt-dsi/boot.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-bxt-dsi/boot.html
### IGT changes ###
#### Issues hit ####
* igt@gem_ringfill@basic-all:
- fi-tgl-y: [PASS][25] -> [DMESG-WARN][26] ([i915#402]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-tgl-y/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-tgl-y/igt@[email protected]
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-bsw-kefka: [PASS][27] -> [DMESG-WARN][28] ([i915#1982])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-bsw-kefka/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-bsw-kefka/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-byt-j1900: [PASS][29] -> [DMESG-WARN][30] ([i915#1982])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-byt-j1900/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-byt-j1900/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: [PASS][31] -> [DMESG-WARN][32] ([i915#1982])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-icl-u2/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@i915_pm_rpm@module-reload:
- fi-byt-j1900: [DMESG-WARN][33] ([i915#1982]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-byt-j1900/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-byt-j1900/igt@[email protected]
* igt@kms_busy@basic@flip:
- fi-kbl-soraka: [DMESG-WARN][35] ([i915#1982]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-kbl-soraka/igt@kms_busy@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-kbl-soraka/igt@kms_busy@[email protected]
- fi-tgl-y: [DMESG-WARN][37] ([i915#1982]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-tgl-y/igt@kms_busy@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-tgl-y/igt@kms_busy@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-kefka: [DMESG-WARN][39] ([i915#1982]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-bsw-kefka/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-bsw-kefka/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- fi-tgl-y: [DMESG-WARN][41] ([i915#402]) -> [PASS][42] +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-tgl-y/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-tgl-y/igt@[email protected]
#### Warnings ####
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-tgl-y: [DMESG-WARN][43] ([i915#1982] / [i915#2411]) -> [DMESG-WARN][44] ([i915#2411])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9305/fi-tgl-y/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/fi-tgl-y/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#348]: https://gitlab.freedesktop.org/drm/intel/issues/348
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
Participating hosts (47 -> 41)
------------------------------
Missing (6): fi-cml-u2 fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9305 -> Patchwork_18880
CI-20190529: 20190529
CI_DRM_9305: de2429aefa185f06afb2b69d9bef24d3479d310b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5846: 2d522ecdf26c346af22e0406e0243b2932197b34 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18880: f74e178a1a284a71e2ea63665a15b42b5f1ada7b @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f74e178a1a28 drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid(), v3. bf239f8a9820 drm/i915/dp: Add from_crtc_state to copy color blobs a312828af913 drm/i915: Pass intel_atomic_state instead of drm_atomic_state 7c6b8f47d385 drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split 968544a3c74a drm/i915/dp: Add a wrapper function around get_pipe_config 3abf2ed167c7 drm/i915: Move encoder->get_config to a new function 3642707f5f97 drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18880/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx