On Mon, Jun 20, 2022 at 12:05:42PM +0300, Jani Nikula wrote:
> On Fri, 17 Jun 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> >
> > We have a couple of places that want to make distinction between
> > double buffered M/N registers vs. the split M1/N1+M2/N2 registers.
> > Add a helper for that.
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Mhh. So why a function in intel_display.c instead of a macro in
> i915_drv.h? Both are kind of cluttered, but at least in i915_drv.h it
> would be among others.
Doesn't feel quite right to me to put low level details like this
into the i915 feature stuff. I'd rather keep it next to the
implementation so I have all the relevant details in one place.
For higher level stuff and features named in bspec the HAS_FOO()
stuff feels more appropriate to me.
But maybe that's just me.
>
> I do think we should have a separate file for display feature check
> macros, and move most if not all of the display related HAS_*() stuff
> there from i915_drv.h.
>
> So technically this does what it says on the box, and in that sense,
>
> Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>
> but I don't much like the example and precedence this function sets.
>
>
> > ---
> > drivers/gpu/drm/i915/display/intel_display.c | 7 ++++++-
> > drivers/gpu/drm/i915/display/intel_display.h | 1 +
> > drivers/gpu/drm/i915/display/intel_dp.c | 3 +--
> > 3 files changed, 8 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> > index b24784c4522d..5559688047b3 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -2798,6 +2798,11 @@ static int intel_crtc_compute_config(struct intel_atomic_state *state,
> > return 0;
> > }
> >
> > +bool has_double_buffered_m_n(struct drm_i915_private *i915)
> > +{
> > + return DISPLAY_VER(i915) >= 9 || IS_BROADWELL(i915);
> > +}
> > +
> > static void
> > intel_reduce_m_n_ratio(u32 *num, u32 *den)
> > {
> > @@ -5900,7 +5905,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,
> > PIPE_CONF_CHECK_I(lane_count);
> > PIPE_CONF_CHECK_X(lane_lat_optim_mask);
> >
> > - if (DISPLAY_VER(dev_priv) >= 9 || IS_BROADWELL(dev_priv)) {
> > + if (has_double_buffered_m_n(dev_priv)) {
> > PIPE_CONF_CHECK_M_N_ALT(dp_m_n, dp_m2_n2);
> > } else {
> > PIPE_CONF_CHECK_M_N(dp_m_n);
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> > index 2feb8ae5d5d4..44c88aadfc30 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.h
> > +++ b/drivers/gpu/drm/i915/display/intel_display.h
> > @@ -543,6 +543,7 @@ int intel_atomic_add_affected_planes(struct intel_atomic_state *state,
> > struct intel_crtc *crtc);
> > u8 intel_calc_active_pipes(struct intel_atomic_state *state,
> > u8 active_pipes);
> > +bool has_double_buffered_m_n(struct drm_i915_private *i915);
> > void intel_link_compute_m_n(u16 bpp, int nlanes,
> > int pixel_clock, int link_clock,
> > struct intel_link_m_n *m_n,
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> > index 2fac76bcf06d..75645508080a 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> > @@ -1842,8 +1842,7 @@ intel_dp_compute_hdr_metadata_infoframe_sdp(struct intel_dp *intel_dp,
> > static bool cpu_transcoder_has_drrs(struct drm_i915_private *i915,
> > enum transcoder cpu_transcoder)
> > {
> > - /* M1/N1 is double buffered */
> > - if (DISPLAY_VER(i915) >= 9 || IS_BROADWELL(i915))
> > + if (has_double_buffered_m_n(i915))
> > return true;
> >
> > return intel_cpu_transcoder_has_m2_n2(i915, cpu_transcoder);
>
> --
> Jani Nikula, Intel Open Source Graphics Center
--
Ville Syrjälä
Intel
