drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes
Subsystems (3)
PATCH v4 1/6 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 v4 2/6 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);
@@ -18835,7 +18841,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 v4 3/6 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.
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 | 42 +++++----- .../drm/i915/display/intel_display_types.h | 11 ++- drivers/gpu/drm/i915/intel_pm.c | 76 +++++++++---------- 3 files changed, 72 insertions(+), 57 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +25 -17
@@ -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,7 +8247,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->hw.adjusted_mode; +const struct drm_display_mode *pipe_mode = &pipe_config->hw.pipe_mode;int clock_limit = dev_priv->max_dotclk_freq;if (INTEL_GEN (dev_priv) <4 ) {
@@ -8256,16 +8258,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 +8310,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);
@@ -12827,15 +12829,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 ); }
@@ -13465,8 +13467,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); }
@@ -13663,6 +13666,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 ; }
@@ -18920,6 +18926,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)*/ crtc_state->inherited = true; + crtc_state->hw.pipe_mode = crtc_state->hw.adjusted_mode; +intel_crtc_compute_pixel_rate (crtc_state);intel_crtc_update_active_timings (crtc_state);
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 v4 4/6 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.
--- drivers/gpu/drm/i915/display/intel_display.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +7 -7
@@ -12671,7 +12671,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) {
@@ -12680,7 +12680,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 ;
@@ -13531,10 +13531,10 @@ intel_crtc_prepare_cleared_state(struct intel_crtc_state *crtc_state) }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;
@@ -13576,7 +13576,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);
@@ -13614,7 +13614,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);
@@ -15238,7 +15238,7 @@ static int intel_atomic_check(struct drm_device *dev,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 v4 5/6 drm/i915/dp: Prep for bigjoiner atomic check
In reply to Manasi NavareNo functional changes here. Just pass intel_atomic_state along with crtc_state to certain atomic_check functions. This will lay the foundation for adding bigjoiner master/slave states in atomic check.
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 | 21 ++++++++++++-------- 3 files changed, 20 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic.c +5 -4
@@ -270,14 +270,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 +13 -8
@@ -13456,13 +13456,17 @@ 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); +const struct intel_crtc_state *from_crtc_state = crtc_state; + +intel_crtc_copy_color_blobs (crtc_state, from_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;
@@ -13470,7 +13474,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)
@@ -13493,7 +13497,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);
@@ -13525,7 +13530,7 @@ 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 ; }
@@ -15226,12 +15231,12 @@ 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;
Signature · 6 lines
2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 6/6 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.
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 | 77 ++++++++++++++++---- 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, 72 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +3 -2
@@ -17770,7 +17770,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;
@@ -17787,7 +17788,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
@@ -497,7 +497,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 +63 -14
153 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
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [v4,1/6] drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: series starting with [v4,1/6] drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes
URL : https://patchwork.freedesktop.org/series/83212/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip e90405311347 drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes af64e9b4b2ce drm/i915: Move encoder->get_config to a new function bbcf8eebd514 drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split -:155: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #155: FILE: drivers/gpu/drm/i915/display/intel_display.c:13470: + crtc_state->hw.pipe_mode = crtc_state->hw.adjusted_mode = crtc_state->uapi.adjusted_mode;
total: 0 errors, 0 warnings, 1 checks, 368 lines checked 63eb504c1b4f drm/i915: Pass intel_atomic_state instead of drm_atomic_state 84acf3bfc8fc drm/i915/dp: Prep for bigjoiner atomic check 163d8871d913 drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid(), v3.
_______________________________________________
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 [v4,1/6] drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: series starting with [v4,1/6] drm/i915/dp: Some reshuffling in mode_valid as prep for bigjoiner modes
URL : https://patchwork.freedesktop.org/series/83212/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9221 -> Patchwork_18809
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18809 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_18809, 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_18809/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18809:
### IGT changes ###
#### Possible regressions ####
* igt@kms_force_connector_basic@force-load-detect:
- fi-hsw-4770: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-hsw-4770/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-hsw-4770/igt@[email protected]
- fi-elk-e7500: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-elk-e7500/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-elk-e7500/igt@[email protected]
- fi-ivb-3770: [PASS][5] -> [FAIL][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-ivb-3770/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-ivb-3770/igt@[email protected]
- fi-byt-j1900: [PASS][7] -> [FAIL][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-byt-j1900/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-byt-j1900/igt@[email protected]
- fi-ilk-650: [PASS][9] -> [FAIL][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-ilk-650/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-ilk-650/igt@[email protected]
- fi-snb-2520m: [PASS][11] -> [FAIL][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-snb-2520m/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-snb-2520m/igt@[email protected]
- fi-bwr-2160: [PASS][13] -> [INCOMPLETE][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-bwr-2160/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-bwr-2160/igt@[email protected]
- fi-snb-2600: [PASS][15] -> [FAIL][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-snb-2600/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-snb-2600/igt@[email protected]
* igt@runner@aborted:
- fi-pnv-d510: NOTRUN -> [FAIL][17]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-pnv-d510/igt@[email protected]
- fi-gdg-551: NOTRUN -> [FAIL][18]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-gdg-551/igt@[email protected]
- fi-bwr-2160: NOTRUN -> [FAIL][19]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-bwr-2160/igt@[email protected]
New tests
---------
New tests have been introduced between CI_DRM_9221 and Patchwork_18809:
### New CI tests (1) ###
* boot:
- Statuses : 40 pass(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in Patchwork_18809 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@core_hotunplug@unbind-rebind:
- fi-skl-lmem: [PASS][20] -> [DMESG-WARN][21] ([i915#2605])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-skl-lmem/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-skl-lmem/igt@[email protected]
* igt@i915_module_load@reload:
- fi-icl-y: [PASS][22] -> [DMESG-WARN][23] ([i915#1982])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-icl-y/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-icl-y/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-icl-u2: [PASS][24] -> [DMESG-WARN][25] ([i915#1982])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-icl-u2/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-icl-u2/igt@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@d-edp1:
- fi-tgl-y: [PASS][26] -> [DMESG-WARN][27] ([i915#1982]) +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-tgl-y/igt@kms_flip@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-tgl-y/igt@kms_flip@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-pnv-d510: [PASS][28] -> [INCOMPLETE][29] ([i915#299])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-pnv-d510/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-pnv-d510/igt@[email protected]
- fi-gdg-551: [PASS][30] -> [INCOMPLETE][31] ([i915#172])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-gdg-551/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-gdg-551/igt@[email protected]
* igt@prime_vgem@basic-gtt:
- fi-tgl-y: [PASS][32] -> [DMESG-WARN][33] ([i915#402]) +1 similar issue
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-tgl-y/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-tgl-y/igt@[email protected]
* igt@vgem_basic@unload:
- fi-skl-guc: [PASS][34] -> [DMESG-WARN][35] ([i915#2203])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-skl-guc/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-skl-guc/igt@[email protected]
#### Possible fixes ####
* igt@debugfs_test@read_all_entries:
- fi-tgl-y: [DMESG-WARN][36] ([i915#1982]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-tgl-y/igt@debugfs_test@read_all_entries.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-tgl-y/igt@debugfs_test@read_all_entries.html
* igt@i915_module_load@reload:
- fi-byt-j1900: [DMESG-WARN][38] ([i915#1982]) -> [PASS][39] +2 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-byt-j1900/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-byt-j1900/igt@[email protected]
- fi-tgl-u2: [DMESG-WARN][40] ([i915#1982] / [k.org#205379]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-tgl-u2/igt@[email protected]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-tgl-u2/igt@[email protected]
* igt@i915_selftest@live@gt_heartbeat:
- fi-kbl-soraka: [DMESG-FAIL][42] ([i915#541]) -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-kbl-soraka/igt@i915_selftest@live@gt_heartbeat.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-kbl-soraka/igt@i915_selftest@live@gt_heartbeat.html
* igt@kms_busy@basic@flip:
- {fi-tgl-dsi}: [DMESG-WARN][44] ([i915#1982]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-tgl-dsi/igt@kms_busy@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-tgl-dsi/igt@kms_busy@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- fi-icl-u2: [DMESG-WARN][46] ([i915#1982]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-icl-u2/igt@[email protected]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-icl-u2/igt@[email protected]
* igt@vgem_basic@dmabuf-fence:
- fi-tgl-y: [DMESG-WARN][48] ([i915#402]) -> [PASS][49] +1 similar issue
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-tgl-y/igt@[email protected]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/fi-tgl-y/igt@[email protected]
#### Warnings ####
* igt@i915_pm_rpm@basic-rte:
- fi-tgl-y: [DMESG-WARN][50] ([i915#2411]) -> [DMESG-WARN][51] ([i915#1982] / [i915#2411])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9221/fi-tgl-y/igt@[email protected]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18809/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#172]: https://gitlab.freedesktop.org/drm/intel/issues/172
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2605]: https://gitlab.freedesktop.org/drm/intel/issues/2605
[i915#299]: https://gitlab.freedesktop.org/drm/intel/issues/299
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#541]: https://gitlab.freedesktop.org/drm/intel/issues/541
[k.org#205379]: https://bugzilla.kernel.org/show_bug.cgi?id=205379
Participating hosts (43 -> 40)
------------------------------
Missing (3): fi-blb-e6850 fi-bsw-cyan fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9221 -> Patchwork_18809
CI-20190529: 20190529
CI_DRM_9221: d1859ff72eefa224fe11a5c3e8e1eef567d6ec93 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5828: db972bdaab8ada43b742bc9621bb0fc9d56a6fc6 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18809: 163d8871d913fc1454bc35690f3e6201d87c85d9 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
163d8871d913 drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid(), v3. 84acf3bfc8fc drm/i915/dp: Prep for bigjoiner atomic check63eb504c1b4f drm/i915: Pass intel_atomic_state instead of drm_atomic_state bbcf8eebd514 drm/i915: Add hw.pipe_mode to allow bigjoiner pipe/transcoder split af64e9b4b2ce drm/i915: Move encoder->get_config to a new function e90405311347 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_18809/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx