From: Suraj Kandpal <suraj.kand...@intel.com>

With 6k resolution support for a single crtc being added
bigjoiner will only come into picture when hdisplay > 6144

Signed-off-by: Suraj Kandpal <suraj.kand...@intel.com>
Signed-off-by: Matt Atwood <matthew.s.atw...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c 
b/drivers/gpu/drm/i915/display/intel_dp.c
index be21e2743801..0093bd43c712 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1314,14 +1314,16 @@ bool intel_dp_needs_joiner(struct intel_dp *intel_dp,
                           int num_joined_pipes)
 {
        struct drm_i915_private *i915 = dp_to_i915(intel_dp);
+       int hdisplay_limit;
 
        if (!intel_dp_has_joiner(intel_dp))
                return false;
 
+       hdisplay_limit = DISPLAY_VER(i915) >= 30 ? 6144 : 5120;
        num_joined_pipes /= 2;
 
        return clock > num_joined_pipes * i915->display.cdclk.max_dotclk_freq ||
-              hdisplay > num_joined_pipes * 5120;
+              hdisplay > num_joined_pipes * hdisplay_limit;
 }
 
 int intel_dp_num_joined_pipes(struct intel_dp *intel_dp,
-- 
2.45.0

Reply via email to