On Tue, Jul 14, 2026 at 11:02:04AM +0000, Shankar, Uma wrote: > > > > -----Original Message----- > > From: John Harrison <[email protected]> > > Sent: Tuesday, July 14, 2026 5:12 AM > > To: [email protected]; [email protected] > > Cc: [email protected]; Shankar, Uma <[email protected]>; Manna, > > Animesh <[email protected]>; Jani Nikula > > <[email protected]>; > > Vivi, Rodrigo <[email protected]> > > Subject: [PATCH v2] drm/i915/display: Fix too few bits in transcoder mask > > variables > > > > New transcoder enum values (for CMTG) were recently added which pushed the > > maximum transcoder mask beyond 8bits. The patch in question updated the info > > structure's u8 to u16 but not any of the functions that process transcoder > > masks. > > So fix those as well. > > > > v2: Fix more instances (found by Sashiko) > > Looks Good to me. Thanks John for the fix. > Reviewed-by: Uma Shankar <[email protected]>
Pushed to drm-intel-next. Thanks for the patch and review > > > Signed-off-by: John Harrison <[email protected]> > > Fixes: 789dda6429e0 ("drm/i915/cmtg: Add CMTG transcoder offset in struct > > _device_info") > > Cc: Uma Shankar <[email protected]> > > Cc: Animesh Manna <[email protected]> > > Cc: Jani Nikula <[email protected]> > > Cc: Rodrigo Vivi <[email protected]> > > Cc: [email protected] > > Cc: [email protected] > > --- > > drivers/gpu/drm/i915/display/intel_ddi.c | 6 ++--- > > drivers/gpu/drm/i915/display/intel_display.c | 22 +++++++++---------- > > .../drm/i915/display/intel_display_types.h | 2 +- > > drivers/gpu/drm/i915/display/intel_dp.c | 4 ++-- > > drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- > > .../drm/i915/display/intel_modeset_setup.c | 18 +++++++-------- > > 6 files changed, 27 insertions(+), 27 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > > b/drivers/gpu/drm/i915/display/intel_ddi.c > > index 2b7eb010511b..617106c68cb4 100644 > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > > @@ -4563,7 +4563,7 @@ static bool crtcs_port_sync_compatible(const struct > > intel_crtc_state *crtc_state > > m_n_equal(&crtc_state1->dp_m_n, &crtc_state2->dp_m_n); } > > > > -static u8 > > +static u16 > > intel_ddi_port_sync_transcoders(const struct intel_crtc_state > > *ref_crtc_state, > > int tile_group_id) > > { > > @@ -4572,7 +4572,7 @@ intel_ddi_port_sync_transcoders(const struct > > intel_crtc_state *ref_crtc_state, > > const struct drm_connector_state *conn_state; > > struct intel_atomic_state *state = > > to_intel_atomic_state(ref_crtc_state->uapi.state); > > - u8 transcoders = 0; > > + u16 transcoders = 0; > > int i; > > > > /* > > @@ -4616,7 +4616,7 @@ static int intel_ddi_compute_config_late(struct > > intel_atomic_state *state, { > > struct intel_display *display = to_intel_display(encoder); > > struct drm_connector *connector = conn_state->connector; > > - u8 port_sync_transcoders = 0; > > + u16 port_sync_transcoders = 0; > > int ret = 0; > > > > if (intel_crtc_has_dp_encoder(crtc_state)) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > > b/drivers/gpu/drm/i915/display/intel_display.c > > index 214454f419e9..38763a6802c5 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -3767,9 +3767,9 @@ static void enabled_joiner_pipes(struct intel_display > > *display, > > } > > } > > > > -static u8 hsw_panel_transcoders(struct intel_display *display) > > +static u16 hsw_panel_transcoders(struct intel_display *display) > > { > > - u8 panel_transcoder_mask = BIT(TRANSCODER_EDP); > > + u16 panel_transcoder_mask = BIT(TRANSCODER_EDP); > > > > if (DISPLAY_VER(display) >= 11) > > panel_transcoder_mask |= BIT(TRANSCODER_DSI_0) | > > BIT(TRANSCODER_DSI_1); @@ -3777,13 +3777,13 @@ static u8 > > hsw_panel_transcoders(struct intel_display *display) > > return panel_transcoder_mask; > > } > > > > -static u8 hsw_enabled_transcoders(struct intel_crtc *crtc) > > +static u16 hsw_enabled_transcoders(struct intel_crtc *crtc) > > { > > struct intel_display *display = to_intel_display(crtc); > > - u8 panel_transcoder_mask = hsw_panel_transcoders(display); > > + u16 panel_transcoder_mask = hsw_panel_transcoders(display); > > enum transcoder cpu_transcoder; > > u8 primary_pipe, secondary_pipes; > > - u8 enabled_transcoders = 0; > > + u16 enabled_transcoders = 0; > > > > /* > > * XXX: Do intel_display_power_get_if_enabled before reading this (for > > @@ -3844,18 +3844,18 @@ static u8 hsw_enabled_transcoders(struct intel_crtc > > *crtc) > > return enabled_transcoders; > > } > > > > -static bool has_edp_transcoders(u8 enabled_transcoders) > > +static bool has_edp_transcoders(u16 enabled_transcoders) > > { > > return enabled_transcoders & BIT(TRANSCODER_EDP); } > > > > -static bool has_dsi_transcoders(u8 enabled_transcoders) > > +static bool has_dsi_transcoders(u16 enabled_transcoders) > > { > > return enabled_transcoders & (BIT(TRANSCODER_DSI_0) | > > BIT(TRANSCODER_DSI_1)); > > } > > > > -static bool has_pipe_transcoders(u8 enabled_transcoders) > > +static bool has_pipe_transcoders(u16 enabled_transcoders) > > { > > return enabled_transcoders & ~(BIT(TRANSCODER_EDP) | > > BIT(TRANSCODER_DSI_0) | > > @@ -3863,7 +3863,7 @@ static bool has_pipe_transcoders(u8 > > enabled_transcoders) } > > > > static void assert_enabled_transcoders(struct intel_display *display, > > - u8 enabled_transcoders) > > + u16 enabled_transcoders) > > { > > /* Only one type of transcoder please */ > > drm_WARN_ON(display->drm, > > @@ -5880,7 +5880,7 @@ static int intel_atomic_check_crtcs(struct > > intel_atomic_state *state) } > > > > static bool intel_cpu_transcoders_need_modeset(struct intel_atomic_state > > *state, > > - u8 transcoders) > > + u16 transcoders) > > { > > const struct intel_crtc_state *new_crtc_state; > > struct intel_crtc *crtc; > > @@ -6516,7 +6516,7 @@ int intel_atomic_check(struct drm_device *dev, > > } > > > > if (is_trans_port_sync_mode(new_crtc_state)) { > > - u8 trans = new_crtc_state->sync_mode_slaves_mask; > > + u16 trans = new_crtc_state->sync_mode_slaves_mask; > > > > if (new_crtc_state->master_transcoder != > > INVALID_TRANSCODER) > > trans |= BIT(new_crtc_state->master_transcoder); > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h > > b/drivers/gpu/drm/i915/display/intel_display_types.h > > index c048da7d6fea..8bd213db5e7a 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > > @@ -1372,7 +1372,7 @@ struct intel_crtc_state { > > enum transcoder master_transcoder; > > > > /* Bitmask to indicate slaves attached */ > > - u8 sync_mode_slaves_mask; > > + u16 sync_mode_slaves_mask; > > > > /* Only valid on TGL+ */ > > enum transcoder mst_master_transcoder; diff --git > > a/drivers/gpu/drm/i915/display/intel_dp.c > > b/drivers/gpu/drm/i915/display/intel_dp.c > > index ade7e51e7590..799dca78767b 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > > @@ -6583,7 +6583,7 @@ static int intel_modeset_tile_group(struct > > intel_atomic_state *state, > > return ret; > > } > > > > -static int intel_modeset_affected_transcoders(struct intel_atomic_state > > *state, u8 > > transcoders) > > +static int intel_modeset_affected_transcoders(struct intel_atomic_state > > +*state, u16 transcoders) > > { > > struct intel_display *display = to_intel_display(state); > > struct intel_crtc *crtc; > > @@ -6631,7 +6631,7 @@ static int intel_modeset_synced_crtcs(struct > > intel_atomic_state *state, > > drm_atomic_get_old_connector_state(&state->base, &connector- > > >base); > > const struct intel_crtc_state *old_crtc_state; > > struct intel_crtc *crtc; > > - u8 transcoders; > > + u16 transcoders; > > > > crtc = to_intel_crtc(old_conn_state->crtc); > > if (!crtc) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c > > b/drivers/gpu/drm/i915/display/intel_dp_mst.c > > index ecc90e8faee1..507e2156d905 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > > @@ -776,7 +776,7 @@ intel_dp_mst_transcoder_mask(struct intel_atomic_state > > *state, > > struct intel_display *display = to_intel_display(state); > > const struct intel_digital_connector_state *conn_state; > > struct intel_connector *connector; > > - u8 transcoders = 0; > > + u16 transcoders = 0; > > int i; > > > > if (DISPLAY_VER(display) < 12) > > diff --git a/drivers/gpu/drm/i915/display/intel_modeset_setup.c > > b/drivers/gpu/drm/i915/display/intel_modeset_setup.c > > index e8730b5baf2a..e27a531e1aa2 100644 > > --- a/drivers/gpu/drm/i915/display/intel_modeset_setup.c > > +++ b/drivers/gpu/drm/i915/display/intel_modeset_setup.c > > @@ -186,11 +186,11 @@ static void > > intel_crtc_disable_noatomic_complete(struct intel_crtc *crtc) > > * Return all the pipes using a transcoder in @transcoder_mask. > > * For joiner configs return only the joiner primary. > > */ > > -static u8 get_transcoder_pipes(struct intel_display *display, > > - u8 transcoder_mask) > > +static u16 get_transcoder_pipes(struct intel_display *display, > > + u16 transcoder_mask) > > { > > struct intel_crtc *temp_crtc; > > - u8 pipes = 0; > > + u16 pipes = 0; > > > > for_each_intel_crtc(display, temp_crtc) { > > struct intel_crtc_state *temp_crtc_state = @@ -214,7 +214,7 @@ > > static u8 get_transcoder_pipes(struct intel_display *display, > > * For joiner configs return only the joiner primary pipes. > > */ > > static void get_portsync_pipes(struct intel_crtc *crtc, > > - u8 *master_pipe_mask, u8 *slave_pipes_mask) > > + u16 *master_pipe_mask, u16 *slave_pipes_mask) > > { > > struct intel_display *display = to_intel_display(crtc); > > struct intel_crtc_state *crtc_state = > > @@ -243,10 +243,10 @@ static void get_portsync_pipes(struct intel_crtc > > *crtc, > > *slave_pipes_mask = get_transcoder_pipes(display, master_crtc_state- > > >sync_mode_slaves_mask); > > } > > > > -static u8 get_joiner_secondary_pipes(struct intel_display *display, u8 > > primary_pipes_mask) > > +static u16 get_joiner_secondary_pipes(struct intel_display *display, > > +u16 primary_pipes_mask) > > { > > struct intel_crtc *primary_crtc; > > - u8 pipes = 0; > > + u16 pipes = 0; > > > > for_each_intel_crtc_in_pipe_mask(display, primary_crtc, > > primary_pipes_mask) { > > struct intel_crtc_state *primary_crtc_state = @@ -263,9 +263,9 > > @@ static void intel_crtc_disable_noatomic(struct intel_crtc *crtc, { > > struct intel_display *display = to_intel_display(crtc); > > struct intel_crtc *temp_crtc; > > - u8 portsync_master_mask; > > - u8 portsync_slaves_mask; > > - u8 joiner_secondaries_mask; > > + u16 portsync_master_mask; > > + u16 portsync_slaves_mask; > > + u16 joiner_secondaries_mask; > > > > /* TODO: Add support for MST */ > > get_portsync_pipes(crtc, &portsync_master_mask, > > &portsync_slaves_mask); > > -- > > 2.43.0 >
