3 files changed, 19 insertions, 6 deletions

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 41c7212081b8..2fbee61d632d 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -3395,19 +3395,28 @@ EXPORT_SYMBOL(drm_property_create_enum);
 struct drm_property *drm_property_create_bitmask(struct drm_device *dev,
                                          int flags, const char *name,
                                          const struct drm_prop_enum_list *props,
-                                         int num_values)
+                                         int num_props,
+                                         uint64_t supported_bits)
 {
         struct drm_property *property;
-        int i, ret;
+        int i, ret, index = 0;
+        int num_values = hweight64(supported_bits);
 
         flags |= DRM_MODE_PROP_BITMASK;
 
         property = drm_property_create(dev, flags, name, num_values);
         if (!property)
                 return NULL;
+        for (i = 0; i < num_props; i++) {
+                if (!(supported_bits & (1ULL << props[i].type)))
+                        continue;
 
-        for (i = 0; i < num_values; i++) {
-                ret = drm_property_add_enum(property, i,
+                if (WARN_ON(index >= num_values)) {
+                        drm_property_destroy(dev, property);
+                        return NULL;
+                }
+
+                ret = drm_property_add_enum(property, index++,
                                       props[i].type,
                                       props[i].name);
                 if (ret) {
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 3cf31ee59aac..aff06e7a4e5f 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -317,7 +317,10 @@ void omap_plane_install_properties(struct drm_plane *plane,
                                         { DRM_REFLECT_Y,  "reflect-y" },
                         };
                         prop = drm_property_create_bitmask(dev, 0, "rotation",
-                                        props, ARRAY_SIZE(props));
+                                        props, ARRAY_SIZE(props),
+                                        BIT(DRM_ROTATE_0) | BIT(DRM_ROTATE_90) |
+                                        BIT(DRM_ROTATE_180) | BIT(DRM_ROTATE_270) |
+                                        BIT(DRM_REFLECT_X) | BIT(DRM_REFLECT_Y));
                         if (prop == NULL)
                                 return;
                         priv->rotation_prop = prop;
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index bfc7235a9c0e..cb4850a2b0c1 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -1006,7 +1006,8 @@ extern struct drm_property *drm_property_create_enum(struct drm_device *dev, int
 struct drm_property *drm_property_create_bitmask(struct drm_device *dev,
                                          int flags, const char *name,
                                          const struct drm_prop_enum_list *props,
-                                         int num_values);
+                                         int num_props,
+                                         uint64_t supported_bits);
 struct drm_property *drm_property_create_range(struct drm_device *dev, int flags,
                                          const char *name,
                                          uint64_t min, uint64_t max);