drm/omap: fix primary-plane's possible_crtcs

We set the possible_crtc for all planes to "(1 << priv->num_crtcs) - 1",
which is fine as the HW planes can be used fro all crtcs. However, when
we're doing that, we are still incrementing 'num_crtcs', and we'll end
up with bad possible_crtcs, preventing the use of the primary planes.

This patch passes a possible_crtcs mask to plane init function so that
we get correct possible_crtc.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 9c43cb481e62..82b2c23d6769 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -356,9 +356,9 @@ static const uint32_t error_irqs[] = {
 
 /* initialize plane */
 struct drm_plane *omap_plane_init(struct drm_device *dev,
-                int id, enum drm_plane_type type)
+                int id, enum drm_plane_type type,
+                u32 possible_crtcs)
 {
-        struct omap_drm_private *priv = dev->dev_private;
         struct drm_plane *plane;
         struct omap_plane *omap_plane;
         int ret;
@@ -381,7 +381,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
         omap_plane->error_irq.irq = omap_plane_error_irq;
         omap_irq_register(dev, &omap_plane->error_irq);
 
-        ret = drm_universal_plane_init(dev, plane, (1 << priv->num_crtcs) - 1,
+        ret = drm_universal_plane_init(dev, plane, possible_crtcs,
                                        &omap_plane_funcs, omap_plane->formats,
                                        omap_plane->nformats, type, NULL);
         if (ret < 0)