[Intel-gfx] [PATCH v11 04/12] drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid(), v3.
Ville Syrjälä
ville.syrjala at linux.intel.com
Fri Oct 23 18:44:00 UTC 2020
On Fri, Oct 23, 2020 at 11:30:08AM -0700, Navare, Manasi wrote:
> On Fri, Oct 23, 2020 at 08:32:00PM +0300, Ville Syrjälä wrote:
> > On Wed, Oct 21, 2020 at 10:42:15PM -0700, Manasi Navare wrote:
> > > From: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> > >
> > > Small changes to intel_dp_mode_valid(), allow listing modes that
> > > can only be supported in the bigjoiner configuration, which is
> > > not supported yet.
> > >
> > > eDP does not support bigjoiner, so do not expose bigjoiner only
> > > modes on the eDP port.
> > >
> > > 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)
> > >
> > > Signed-off-by: Manasi Navare <manasi.d.navare at intel.com>
> > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> > > ---
> > > 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 | 106 +++++++++++++++----
> > > 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 +-
> > > 6 files changed, 96 insertions(+), 24 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> > > index 9b4fcc734122..1c2d67ae361d 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > > @@ -17751,7 +17751,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;
> > >
> > > @@ -17768,7 +17769,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;
> > > diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> > > index 1b946209e06b..4f8dee9dfb4d 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_display.h
> > > +++ b/drivers/gpu/drm/i915/display/intel_display.h
> > > @@ -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);
> > >
> > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> > > index 2c29e7f5281b..d123e5a508c1 100644
> > > --- a/drivers/gpu/drm/i915/display/intel_dp.c
> > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> > > @@ -254,6 +254,29 @@ intel_dp_max_data_rate(int max_link_clock, int max_lanes)
> > > return max_link_clock * max_lanes;
> > > }
> > >
> > > +static bool intel_dp_can_bigjoiner(struct intel_dp *intel_dp)
> > > +{
> > > + struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> > > + struct intel_encoder *encoder = &intel_dig_port->base;
> > > + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> > > +
> > > + return INTEL_GEN(dev_priv) >= 12 ||
> > > + (INTEL_GEN(dev_priv) == 11 &&
> > > + encoder->port != PORT_A);
> > > +}
> > > +
> > > +static int intel_dp_max_dotclock(struct intel_dp *intel_dp, bool allow_bigjoiner)
> > > +{
> > > + struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> > > + struct intel_encoder *encoder = &intel_dig_port->base;
> > > + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> > > +
> > > + if (allow_bigjoiner && intel_dp_can_bigjoiner(intel_dp))
> > > + return 2 * dev_priv->max_dotclk_freq;
> > > +
> > > + return dev_priv->max_dotclk_freq;
> > > +}
> > > +
> > > static int cnl_max_source_rate(struct intel_dp *intel_dp)
> > > {
> > > struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
> > > @@ -519,7 +542,8 @@ small_joiner_ram_size_bits(struct drm_i915_private *i915)
> > >
> > > static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,
> > > u32 link_clock, u32 lane_count,
> > > - u32 mode_clock, u32 mode_hdisplay)
> > > + u32 mode_clock, u32 mode_hdisplay,
> > > + bool bigjoiner)
> > > {
> > > u32 bits_per_pixel, max_bpp_small_joiner_ram;
> > > int i;
> > > @@ -537,6 +561,10 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,
> > > /* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */
> > > max_bpp_small_joiner_ram = small_joiner_ram_size_bits(i915) /
> > > mode_hdisplay;
> > > +
> > > + if (bigjoiner)
> > > + max_bpp_small_joiner_ram *= 2;
> > > +
> > > drm_dbg_kms(&i915->drm, "Max small joiner bpp: %u\n",
> > > max_bpp_small_joiner_ram);
> > >
> > > @@ -546,6 +574,15 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,
> > > */
> > > bits_per_pixel = min(bits_per_pixel, max_bpp_small_joiner_ram);
> > >
> > > + if (bigjoiner) {
> > > + u32 max_bpp_bigjoiner =
> > > + i915->max_cdclk_freq * 48 /
> > > + intel_dp_mode_to_fec_clock(mode_clock);
> > > +
> > > + DRM_DEBUG_KMS("Max big joiner bpp: %u\n", max_bpp_bigjoiner);
> > > + bits_per_pixel = min(bits_per_pixel, max_bpp_bigjoiner);
> > > + }
> > > +
> > > /* Error out if the max bpp is less than smallest allowed valid bpp */
> > > if (bits_per_pixel < valid_dsc_bpp[0]) {
> > > drm_dbg_kms(&i915->drm, "Unsupported BPP %u, min %u\n",
> > > @@ -568,7 +605,8 @@ static u16 intel_dp_dsc_get_output_bpp(struct drm_i915_private *i915,
> > > }
> > >
> > > static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,
> > > - int mode_clock, int mode_hdisplay)
> > > + int mode_clock, int mode_hdisplay,
> > > + bool bigjoiner)
> > > {
> > > struct drm_i915_private *i915 = dp_to_i915(intel_dp);
> > > u8 min_slice_count, i;
> > > @@ -595,12 +633,20 @@ static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,
> > >
> > > /* Find the closest match to the valid slice count values */
> > > for (i = 0; i < ARRAY_SIZE(valid_dsc_slicecount); i++) {
> > > - if (valid_dsc_slicecount[i] >
> > > - drm_dp_dsc_sink_max_slice_count(intel_dp->dsc_dpcd,
> > > - false))
> > > + u8 test_slice_count = bigjoiner ?
> > > + 2 * valid_dsc_slicecount[i] :
> > > + valid_dsc_slicecount[i];
> > > +
> > > + if (test_slice_count >
> > > + drm_dp_dsc_sink_max_slice_count(intel_dp->dsc_dpcd, false))
> > > break;
> > > - if (min_slice_count <= valid_dsc_slicecount[i])
> > > - return valid_dsc_slicecount[i];
> > > +
> > > + /* big joiner needs small joiner to be enabled */
> > > + if (bigjoiner && test_slice_count < 4)
> > > + continue;
> > > +
> > > + if (min_slice_count <= test_slice_count)
> > > + return test_slice_count;
> > > }
> > >
> > > drm_dbg_kms(&i915->drm, "Unsupported Slice Count %d\n",
> > > @@ -684,10 +730,6 @@ intel_dp_mode_valid_downstream(struct intel_connector *connector,
> > > const struct drm_display_info *info = &connector->base.display_info;
> > > int tmds_clock;
> > >
> > > - if (intel_dp->dfp.max_dotclock &&
> > > - target_clock > intel_dp->dfp.max_dotclock)
> > > - return MODE_CLOCK_HIGH;
> > > -
> > > /* Assume 8bpc for the DP++/HDMI/DVI TMDS clock check */
> > > tmds_clock = target_clock;
> > > if (drm_mode_is_420_only(info, mode))
> > > @@ -717,6 +759,7 @@ intel_dp_mode_valid(struct drm_connector *connector,
> > > u16 dsc_max_output_bpp = 0;
> > > u8 dsc_slice_count = 0;
> > > enum drm_mode_status status;
> > > + bool dsc = false, bigjoiner = false;
> > >
> > > if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
> > > return MODE_NO_DBLESCAN;
> > > @@ -724,6 +767,8 @@ intel_dp_mode_valid(struct drm_connector *connector,
> > > if (mode->flags & DRM_MODE_FLAG_DBLCLK)
> > > return MODE_H_ILLEGAL;
> > >
> > > + max_dotclk = intel_dp_max_dotclock(intel_dp, false);
> > > +
> > > if (intel_dp_is_edp(intel_dp) && fixed_mode) {
> > > if (mode->hdisplay > fixed_mode->hdisplay)
> > > return MODE_PANEL;
> > > @@ -737,6 +782,18 @@ intel_dp_mode_valid(struct drm_connector *connector,
> > > if (mode->clock < 10000)
> > > return MODE_CLOCK_LOW;
> > >
> > > + if (target_clock > max_dotclk) {
> > > + if (intel_dp_is_edp(intel_dp))
> > > + return MODE_CLOCK_HIGH;
> >
> > Not sure why we check for edp?
>
> We dont support bigjoiner on edp so on edp thsi would be a mode_clock_high
Something to do with dsc calculations, or why exactly?
If there's an actual reason then just put the check into
intel_can_bigjoiner(). I would accompany it with a comment
explaining why it is needed.
--
Ville Syrjälä
Intel
More information about the Intel-gfx
mailing list