On Thu, 19 Mar 2026, Ville Syrjala <[email protected]> wrote: > From: Ville Syrjälä <[email protected]> > > We don't need is_planar in either the actual watermarks or the > wm_params structure used during the wm computation. Get rid > of both. > > Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_display_types.h | 1 - > drivers/gpu/drm/i915/display/skl_watermark.c | 6 +----- > 2 files changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h > b/drivers/gpu/drm/i915/display/intel_display_types.h > index d3a9ace4c9d1..93b8b2f91484 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -851,7 +851,6 @@ struct skl_plane_wm { > struct skl_wm_level wm0; > struct skl_wm_level trans_wm; > } sagv; > - bool is_planar; > }; > > struct skl_pipe_wm { > diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c > b/drivers/gpu/drm/i915/display/skl_watermark.c > index b1f9546b8cda..0f99a3264f05 100644 > --- a/drivers/gpu/drm/i915/display/skl_watermark.c > +++ b/drivers/gpu/drm/i915/display/skl_watermark.c > @@ -63,7 +63,6 @@ static void skl_sagv_disable(struct intel_display *display); > struct skl_wm_params { > bool x_tiled, y_tiled; > bool rc_surface; > - bool is_planar; > u32 width; > u8 cpp; > u32 plane_pixel_rate; > @@ -1675,10 +1674,9 @@ skl_compute_wm_params(const struct intel_crtc_state > *crtc_state, > wp->y_tiled = modifier != I915_FORMAT_MOD_X_TILED && > intel_fb_is_tiled_modifier(modifier); > wp->rc_surface = intel_fb_is_ccs_modifier(modifier); > - wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier); > > wp->width = width; > - if (color_plane == 1 && wp->is_planar) > + if (color_plane == 1 && intel_format_info_is_yuv_semiplanar(format, > modifier)) > wp->width /= 2; > > wp->cpp = format->cpp[color_plane]; > @@ -2073,8 +2071,6 @@ static int skl_build_plane_wm_uv(struct > intel_crtc_state *crtc_state, > struct skl_wm_params wm_params; > int ret; > > - wm->is_planar = true; > - > /* uv plane watermarks must also be validated for NV12/Planar */ > ret = skl_compute_plane_wm_params(crtc_state, plane_state, > &wm_params, 1); -- Jani Nikula, Intel
