drm/i915/display: Consider ultrajoiner for computing maxdotclock

Use the check for ultrajoiner while computing maxdotclock.

v2: Add Check for HAS_UNCOMPRESSED_JOINER. (Ville)
v3: Remove extraneous newline. (Ville)

Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240930163549.416410-13-ankit.k.nautiyal@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 40ad3fdaab108704264f0ae854259714308b9b13..74311bb9d2908b99484a2557393e349360d6de06 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -8186,8 +8186,9 @@ static int max_dotclock(struct drm_i915_private *i915)
 {
        int max_dotclock = i915->display.cdclk.max_dotclk_freq;
 
-       /* icl+ might use joiner */
-       if (HAS_BIGJOINER(i915))
+       if (HAS_ULTRAJOINER(i915))
+               max_dotclock *= 4;
+       else if (HAS_UNCOMPRESSED_JOINER(i915) || HAS_BIGJOINER(i915))
                max_dotclock *= 2;
 
        return max_dotclock;