On Wed, 26 Jun 2024, Stanislav Lisovskiy <stanislav.lisovskiy@xxxxxxxxx> wrote: > diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h > index b0cf6ca70952..bac81b7ab764 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.h > +++ b/drivers/gpu/drm/i915/display/intel_display.h > @@ -423,10 +423,14 @@ 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); > bool is_trans_port_sync_master(const struct intel_crtc_state *state); > u8 intel_crtc_joined_pipe_mask(const struct intel_crtc_state *crtc_state); > -bool intel_crtc_is_joiner_secondary(const struct intel_crtc_state *crtc_state); > bool intel_crtc_is_joiner_primary(const struct intel_crtc_state *crtc_state); > +bool intel_crtc_is_joiner_secondary(const struct intel_crtc_state *crtc_state); > +bool intel_crtc_is_bigjoiner_primary(const struct intel_crtc_state *crtc_state); > +bool intel_crtc_is_bigjoiner_secondary(const struct intel_crtc_state *crtc_state); > +bool intel_crtc_is_ultrajoiner(const struct intel_crtc_state *crtc_state); > +bool intel_crtc_is_ultrajoiner_primary(const struct intel_crtc_state *crtc_state); > u8 intel_crtc_joiner_secondary_pipes(const struct intel_crtc_state *crtc_state); > -struct intel_crtc *intel_primary_crtc(const struct intel_crtc_state *crtc_state); > +struct intel_crtc *intel_joiner_primary_crtc(const struct intel_crtc_state *crtc_state); > bool intel_crtc_get_pipe_config(struct intel_crtc_state *crtc_state); > bool intel_pipe_config_compare(const struct intel_crtc_state *current_config, > const struct intel_crtc_state *pipe_config, Makes you wonder why most of the joiner stuff has ended up in intel_display.[ch]. Maybe we should have a dedicated file for the stream splitter/joiner, with the related things (uncompressed joiner, etc.) moved there from intel_vdsc.c, leaving that purely for compression. BR, Jani. -- Jani Nikula, Intel