drm/gma500: Sanitize possible_clones

I doubt the DP+DP and SDVO+SDVO cloning works for this driver.
i915 at least doesn't do those. Truthfully there could be some very
specific circumstances where some of them would do doable, but
genereally it's too much pain to deal with so we've chose not to
bother. Let's use the same approach for gma500.

Also the LVDS+LVDS and DSI+DSI cases probably don't really exist as
there is one of each at most.

This does mean we'll now leave possible_clones at 0 for these encoder
types whereas previosuly we included the encoder itself in the bitmask.
But that's fine as the core now treaks 0 as a special case and adds
the encoder itself into the final bitmask reported to userspace.

Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200211162208.16224-3-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 1d8f67e4795a685f2d720074c0c126e6a8492833..23a78d7553827862d512368cc372c2b88a24b238 100644 (file)
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -577,31 +577,31 @@ static void psb_setup_outputs(struct drm_device *dev)
                        break;
                case INTEL_OUTPUT_SDVO:
                        crtc_mask = dev_priv->ops->sdvo_mask;
-                       clone_mask = (1 << INTEL_OUTPUT_SDVO);
+                       clone_mask = 0;
                        break;
                case INTEL_OUTPUT_LVDS:
-                       crtc_mask = dev_priv->ops->lvds_mask;
-                       clone_mask = (1 << INTEL_OUTPUT_LVDS);
+                       crtc_mask = dev_priv->ops->lvds_mask;
+                       clone_mask = 0;
                        break;
                case INTEL_OUTPUT_MIPI:
                        crtc_mask = (1 << 0);
-                       clone_mask = (1 << INTEL_OUTPUT_MIPI);
+                       clone_mask = 0;
                        break;
                case INTEL_OUTPUT_MIPI2:
                        crtc_mask = (1 << 2);
-                       clone_mask = (1 << INTEL_OUTPUT_MIPI2);
+                       clone_mask = 0;
                        break;
                case INTEL_OUTPUT_HDMI:
-                       crtc_mask = dev_priv->ops->hdmi_mask;
+                       crtc_mask = dev_priv->ops->hdmi_mask;
                        clone_mask = (1 << INTEL_OUTPUT_HDMI);
                        break;
                case INTEL_OUTPUT_DISPLAYPORT:
                        crtc_mask = (1 << 0) | (1 << 1);
-                       clone_mask = (1 << INTEL_OUTPUT_DISPLAYPORT);
+                       clone_mask = 0;
                        break;
                case INTEL_OUTPUT_EDP:
                        crtc_mask = (1 << 1);
-                       clone_mask = (1 << INTEL_OUTPUT_EDP);
+                       clone_mask = 0;
                }
                encoder->possible_crtcs = crtc_mask;
                encoder->possible_clones =

diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
index d4c65f26892219209fa9eb4beb5cd3bfecda342a..187817e0c004384c98b1202e09e4ff5917ea9c1b 100644 (file)
--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
@@ -1006,10 +1006,10 @@ struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev,
        /*set possible crtcs and clones*/
        if (dsi_connector->pipe) {
                encoder->possible_crtcs = (1 << 2);
-               encoder->possible_clones = (1 << 1);
+               encoder->possible_clones = 0;
        } else {
                encoder->possible_crtcs = (1 << 0);
-               encoder->possible_clones = (1 << 0);
+               encoder->possible_clones = 0;
        }
 
        dsi_connector->base.encoder = &dpi_output->base.base;