OSDN Git Service

drm/i915: Add rotation property for sprites
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 5 Aug 2014 05:56:55 +0000 (11:26 +0530)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 8 Aug 2014 15:43:53 +0000 (17:43 +0200)
Sprite planes support 180 degree rotation. The lower layers are now in
place, so hook in the standard rotation property to expose the feature
to the users.

v2: Moving rotation_property to mode_config

Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_sprite.c

index 6118262..0bdb00b 100644 (file)
@@ -1218,6 +1218,30 @@ out_unlock:
        return ret;
 }
 
+static int intel_plane_set_property(struct drm_plane *plane,
+                                   struct drm_property *prop,
+                                   uint64_t val)
+{
+       struct drm_device *dev = plane->dev;
+       struct intel_plane *intel_plane = to_intel_plane(plane);
+       uint64_t old_val;
+       int ret = -ENOENT;
+
+       if (prop == dev->mode_config.rotation_property) {
+               /* exactly one rotation angle please */
+               if (hweight32(val & 0xf) != 1)
+                       return -EINVAL;
+
+               old_val = intel_plane->rotation;
+               intel_plane->rotation = val;
+               ret = intel_plane_restore(plane);
+               if (ret)
+                       intel_plane->rotation = old_val;
+       }
+
+       return ret;
+}
+
 int intel_plane_restore(struct drm_plane *plane)
 {
        struct intel_plane *intel_plane = to_intel_plane(plane);
@@ -1244,6 +1268,7 @@ static const struct drm_plane_funcs intel_plane_funcs = {
        .update_plane = intel_update_plane,
        .disable_plane = intel_disable_plane,
        .destroy = intel_destroy_plane,
+       .set_property = intel_plane_set_property,
 };
 
 static uint32_t ilk_plane_formats[] = {
@@ -1354,8 +1379,22 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
                             &intel_plane_funcs,
                             plane_formats, num_plane_formats,
                             false);
-       if (ret)
+       if (ret) {
                kfree(intel_plane);
+               goto out;
+       }
+
+       if (!dev->mode_config.rotation_property)
+               dev->mode_config.rotation_property =
+                       drm_mode_create_rotation_property(dev,
+                                                         BIT(DRM_ROTATE_0) |
+                                                         BIT(DRM_ROTATE_180));
+
+       if (dev->mode_config.rotation_property)
+               drm_object_attach_property(&intel_plane->base.base,
+                                          dev->mode_config.rotation_property,
+                                          intel_plane->rotation);
 
+ out:
        return ret;
 }