Add a helper to check if platform supports joiner. Use it before readout
for joiner stuff and to calculate the maxdotclock supported.
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx>
---
drivers/gpu/drm/i915/display/intel_display.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index b4ec9bf12aa7..486bade9e927 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -3536,14 +3536,23 @@ static bool transcoder_ddi_func_is_enabled(struct drm_i915_private *dev_priv,
return tmp & TRANS_DDI_FUNC_ENABLE;
}
+static bool intel_display_can_use_joiner(struct intel_display *display)
+{
+ return (DISPLAY_VER(display) >= 11);
+}
+
static void enabled_joiner_pipes(struct drm_i915_private *dev_priv,
u8 *primary_pipes, u8 *secondary_pipes)
{
+ struct intel_display *display = to_intel_display(&dev_priv->drm);
struct intel_crtc *crtc;
*primary_pipes = 0;
*secondary_pipes = 0;
+ if (!intel_display_can_use_joiner(display))
+ return;
+
for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc,
joiner_pipes(dev_priv)) {
enum intel_display_power_domain power_domain;
@@ -7961,10 +7970,11 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)
static int max_dotclock(struct drm_i915_private *i915)
{
+ struct intel_display *display = to_intel_display(&i915->drm);
int max_dotclock = i915->display.cdclk.max_dotclk_freq;
/* icl+ might use joiner */
- if (DISPLAY_VER(i915) >= 11)
+ if (intel_display_can_use_joiner(display))
max_dotclock *= 2;
return max_dotclock;
--
2.45.2
