intel-xe.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org,
	suraj.kandpal@intel.com
Subject: Re: [PATCH 11/15] drm/i915/dp: Modify compressed bpp limitations for ultrajoiner
Date: Fri, 27 Sep 2024 01:36:48 +0300	[thread overview]
Message-ID: <ZvXiAGhTmWTpf43v@intel.com> (raw)
In-Reply-To: <20240926072638.3689367-12-ankit.k.nautiyal@intel.com>

On Thu, Sep 26, 2024 at 12:56:34PM +0530, Ankit Nautiyal wrote:
> Add compressed bpp limitations for ultrajoiner.
> 
> v2: Fix the case for 1 pipe. (Ankit)
> 
> Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_dp.c | 27 +++++++++++++++++++------
>  1 file changed, 21 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index f2a2541c1091..a0afb4991334 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -865,24 +865,39 @@ u32 get_max_compressed_bpp_with_joiner(struct drm_i915_private *i915,
>  				       int num_joined_pipes)
>  {
>  	u32 max_bpp_small_joiner_ram;
> +	u32 max_bpp_bigjoiner;
> +	u32 max_bpp;
>  
>  	/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */
>  	max_bpp_small_joiner_ram = small_joiner_ram_size_bits(i915) / mode_hdisplay;
>  
> -	if (num_joined_pipes == 2) {
> +	if (num_joined_pipes == 1)
> +		return max_bpp_small_joiner_ram;

Hmm. This seems to assume that small joiner will be
enabled. I can't immediately see anything that would
guarantee that is the case. But I suppose it's a safe
assumption in that we can then freely choose whether to
use small joiner or not based on other constraints.

> +
> +	if (num_joined_pipes > 1) {
>  		int bigjoiner_interface_bits = DISPLAY_VER(i915) >= 14 ? 36 : 24;
>  		/* With bigjoiner multiple dsc engines are used in parallel so PPC is 2 */
>  		int ppc = 2;
> -		u32 max_bpp_bigjoiner =
> -			i915->display.cdclk.max_cdclk_freq * ppc * bigjoiner_interface_bits /
> +		int num_bigjoiners = num_joined_pipes / 2;
> +
> +		max_bpp_bigjoiner =
> +			i915->display.cdclk.max_cdclk_freq * ppc * bigjoiner_interface_bits *

The the '/' seems to have turned into a '*'.

>  			intel_dp_mode_to_fec_clock(mode_clock);
>  
> -		max_bpp_small_joiner_ram *= 2;
> +		max_bpp_bigjoiner *= num_bigjoiners;
> +
> +		max_bpp_small_joiner_ram *= num_joined_pipes;

I get the feeling we're not handling the MSO overlap properly in
this code. But that's not directly related to this patch I guess.

I think we need to split this function up into its
constituent parts. Right now it's mixing it all into
a big mush that's very hard to follow. Once that is
done this function should just collapse into:
 max_bpp = min(max_bpp, smalljoiner_ram_max_bpp())
 max_bpp = min(max_bpp, bigjoiner_bw_max_bpp())
 max_bpp = min(max_bpp, ultrajoiner_ram_max_bpp())

We should also extract functions for bigjoiner_interface_bits()
and ultrajoiner_ram_size_bits() so that we don't have to be
distracted by the actual numbers.

> +	}
> +
> +	max_bpp = min(max_bpp_small_joiner_ram, max_bpp_bigjoiner);
> +
> +	if (num_joined_pipes == 4) {
> +		u32 max_bpp_ultrajoiner_ram = (4 * 72 * 512) / mode_hdisplay;
>  
> -		return min(max_bpp_small_joiner_ram, max_bpp_bigjoiner);
> +		max_bpp = min(max_bpp, max_bpp_ultrajoiner_ram);
>  	}
>  
> -	return max_bpp_small_joiner_ram;
> +	return max_bpp;
>  }
>  
>  u16 intel_dp_dsc_get_max_compressed_bpp(struct drm_i915_private *i915,
> -- 
> 2.45.2

-- 
Ville Syrjälä
Intel

  reply	other threads:[~2024-09-26 22:36 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-26  7:26 [PATCH 00/15] Ultrajoiner basic functionality series Ankit Nautiyal
2024-09-26  7:26 ` [PATCH 01/15] drm/i915/display_device: Add Check HAS_DSC for bigjoiner Ankit Nautiyal
2024-09-26  7:26 ` [PATCH 02/15] drm/i915/display_debugfs: Allow force joiner only if supported Ankit Nautiyal
2024-09-26 11:14   ` Ville Syrjälä
2024-09-26 13:07     ` Nautiyal, Ankit K
2024-09-26 13:21       ` Ville Syrjälä
2024-09-26  7:26 ` [PATCH 03/15] drm/i915/display: Modify debugfs for joiner to force n pipes Ankit Nautiyal
2024-09-26  7:26 ` [PATCH 04/15] drm/i915/dp: Add helper to compute num pipes required Ankit Nautiyal
2024-09-26  7:26 ` [PATCH 05/15] drm/i915: Split current joiner hw state readout Ankit Nautiyal
2024-09-26  7:26 ` [PATCH 06/15] drm/i915: Add bigjoiner and uncompressed joiner hw readout sanity checks Ankit Nautiyal
2024-09-26  7:26 ` [PATCH 07/15] drm/i915/display: Add macro HAS_ULTRAJOINER() Ankit Nautiyal
2024-09-26  7:26 ` [PATCH 08/15] drm/i915/display: Refactor enable_joiner_pipes Ankit Nautiyal
2024-09-26 11:19   ` Ville Syrjälä
2024-09-26 13:15     ` Nautiyal, Ankit K
2024-09-26 13:28       ` Ville Syrjälä
2024-09-26  7:26 ` [PATCH 09/15] drm/i915: Implement hw state readout and checks for ultrajoiner Ankit Nautiyal
2024-09-26 11:21   ` Ville Syrjälä
2024-09-26  7:26 ` [PATCH 10/15] drm/i915/display/vdsc: Add ultrajoiner support with DSC Ankit Nautiyal
2024-09-26  7:26 ` [PATCH 11/15] drm/i915/dp: Modify compressed bpp limitations for ultrajoiner Ankit Nautiyal
2024-09-26 22:36   ` Ville Syrjälä [this message]
2024-09-26  7:26 ` [PATCH 12/15] drm/i915/dp: Simplify helper to get slice count with joiner Ankit Nautiyal
2024-09-26 11:28   ` Ville Syrjälä
2024-09-26  7:26 ` [PATCH 13/15] drm/i915: Compute config and mode valid changes for ultrajoiner Ankit Nautiyal
2024-09-26  7:26 ` [PATCH 14/15] drm/i915/display: Consider ultrajoiner for computing maxdotclock Ankit Nautiyal
2024-09-26  7:26 ` [PATCH 15/15] drm/i915/intel_dp: Add support for forcing ultrajoiner Ankit Nautiyal
2024-09-26 17:44 ` ✓ CI.Patch_applied: success for Ultrajoiner basic functionality series (rev4) Patchwork
2024-09-26 17:44 ` ✗ CI.checkpatch: warning " Patchwork
2024-09-26 17:46 ` ✓ CI.KUnit: success " Patchwork
2024-09-26 17:57 ` ✓ CI.Build: " Patchwork
2024-09-26 17:59 ` ✓ CI.Hooks: " Patchwork
2024-09-26 18:01 ` ✗ CI.checksparse: warning " Patchwork
2024-09-26 18:19 ` ✓ CI.BAT: success " Patchwork
2024-09-27 17:23 ` ✗ CI.FULL: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZvXiAGhTmWTpf43v@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=ankit.k.nautiyal@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=suraj.kandpal@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).