Re: [PATCH 03/14] drm/i915/display: Use joined pipes in intel_mode_valid_max_plane_size

[Nautiyal, Ankit K]

On 9/6/2024 8:22 PM, Ville Syrjälä wrote:

On Fri, Sep 06, 2024 at 06:27:56PM +0530, Ankit Nautiyal wrote:

In preparation of ultrajoiner, use number of joined pipes in the
intel_mode_valid_max_plane_size helper, instead of joiner flag.

Signed-off-by: Ankit Nautiyal <ankit.k.nauti...@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kand...@intel.com>
---
  drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
  drivers/gpu/drm/i915/display/intel_display.h | 3 ++-
  drivers/gpu/drm/i915/display/intel_dp.c      | 2 +-
  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, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 82492ee6c2e6..257e479310c2 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -8088,7 +8088,7 @@ enum drm_mode_status 
intel_cpu_transcoder_mode_valid(struct drm_i915_private *de
  enum drm_mode_status
  intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,
                                const struct drm_display_mode *mode,
-                               bool joiner)
+                               enum intel_joiner_pipe_count joined_pipes)

Make that 'int num_joined_pipes' everywhere and I think the results
will be far less confusing.

Got it will, as mentioned earlier, will get rid of this enum.

  {
        int plane_width_max, plane_height_max;

@@ -8105,7 +8105,7 @@ intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,

         * too big for that.
         */
        if (DISPLAY_VER(dev_priv) >= 11) {
-               plane_width_max = 5120 << joiner;
+               plane_width_max = 5120 << joined_pipes / 2;

5120 * num_joined_pipes

Will simplify this, as suggested.

Thanks & Regards,

Ankit

                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 3b90c5190d65..c0f8bb7e5095 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -31,6 +31,7 @@
  #include "intel_display_limits.h"

enum drm_scaling_filter;

+enum intel_joiner_pipe_count;
  struct dpll;
  struct drm_atomic_state;
  struct drm_connector;
@@ -415,7 +416,7 @@ u32 intel_plane_fb_max_stride(struct drm_i915_private 
*dev_priv,
  enum drm_mode_status
  intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,
                                const struct drm_display_mode *mode,
-                               bool joiner);
+                               enum intel_joiner_pipe_count joined_pipes);
  enum drm_mode_status
  intel_cpu_transcoder_mode_valid(struct drm_i915_private *i915,
                                const struct drm_display_mode *mode);
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c 
b/drivers/gpu/drm/i915/display/intel_dp.c
index f95b62a026b6..71f33470f7a8 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1402,7 +1402,7 @@ intel_dp_mode_valid(struct drm_connector *_connector,
        if (status != MODE_OK)
                return status;

- return intel_mode_valid_max_plane_size(dev_priv, mode, joiner);

+       return intel_mode_valid_max_plane_size(dev_priv, mode, joined_pipes);
  }

bool intel_dp_source_supports_tps3(struct drm_i915_private *i915)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c 
b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index d3ff22f53fd5..9aae14a2ed15 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -1525,7 +1525,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector 
*connector,
                return 0;
        }

- *status = intel_mode_valid_max_plane_size(dev_priv, mode, joiner);

+       *status = intel_mode_valid_max_plane_size(dev_priv, mode, joined_pipes);
        return 0;
  }

diff --git a/drivers/gpu/drm/i915/display/intel_dsi.c b/drivers/gpu/drm/i915/display/intel_dsi.c

index bd5888ce4852..92b3aa25366a 100644
--- a/drivers/gpu/drm/i915/display/intel_dsi.c
+++ b/drivers/gpu/drm/i915/display/intel_dsi.c
@@ -76,7 +76,7 @@ enum drm_mode_status intel_dsi_mode_valid(struct 
drm_connector *connector,
        if (fixed_mode->clock > max_dotclk)
                return MODE_CLOCK_HIGH;

- return intel_mode_valid_max_plane_size(dev_priv, mode, false);

+       return intel_mode_valid_max_plane_size(dev_priv, mode, 
INTEL_NONE_JOINER_PIPES);
  }

struct intel_dsi_host *intel_dsi_host_init(struct intel_dsi *intel_dsi,

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c 
b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 869fa00f7ef2..21b72a0bddea 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -2057,7 +2057,7 @@ intel_hdmi_mode_valid(struct drm_connector *connector,
                        return status;
        }

- return intel_mode_valid_max_plane_size(dev_priv, mode, false);

+       return intel_mode_valid_max_plane_size(dev_priv, mode, 
INTEL_NONE_JOINER_PIPES);
  }

bool intel_hdmi_bpc_possible(const struct intel_crtc_state *crtc_state,

--
2.45.2