drm/i915: Populate possible_crtcs correctly

Don't advertize non-exisiting crtcs in the encoder possible_crtcs
bitmask.

Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190708162048.4286-9-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index d99c59e97568e8a1116a893b48a9bd76f9cf2d81..20ec8a1dc5e163945ed769951db6dee81c1a4dd2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -15257,6 +15257,20 @@ static int intel_encoder_clones(struct intel_encoder *encoder)
        return index_mask;
 }
 
+static u32 intel_encoder_possible_crtcs(struct intel_encoder *encoder)
+{
+       struct drm_device *dev = encoder->base.dev;
+       struct intel_crtc *crtc;
+       u32 possible_crtcs = 0;
+
+       for_each_intel_crtc(dev, crtc) {
+               if (encoder->crtc_mask & BIT(crtc->pipe))
+                       possible_crtcs |= drm_crtc_mask(&crtc->base);
+       }
+
+       return possible_crtcs;
+}
+
 static bool ilk_has_edp_a(struct drm_i915_private *dev_priv)
 {
        if (!IS_MOBILE(dev_priv))
@@ -15557,7 +15571,8 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
        intel_psr_init(dev_priv);
 
        for_each_intel_encoder(&dev_priv->drm, encoder) {
-               encoder->base.possible_crtcs = encoder->crtc_mask;
+               encoder->base.possible_crtcs =
+                       intel_encoder_possible_crtcs(encoder);
                encoder->base.possible_clones =
                        intel_encoder_clones(encoder);
        }