]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/i915: init sprites with univeral plane init function
authorDerek Foreman <derek.foreman@collabora.co.uk>
Wed, 3 Sep 2014 13:38:20 +0000 (10:38 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 3 Sep 2014 13:43:47 +0000 (15:43 +0200)
Really just for completeness - old init function ends up making the plane
exactly the same way due to the way the enums are set up.

Signed-off-by: Derek Foreman <derek.foreman@collabora.co.uk>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_sprite.c

index cf596cdca8e07bd0a658484bb87a369a3d4c1e06..07a74ef589bd00636896510d245d6e149a49d653 100644 (file)
@@ -1378,10 +1378,10 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
        intel_plane->plane = plane;
        intel_plane->rotation = BIT(DRM_ROTATE_0);
        possible_crtcs = (1 << pipe);
-       ret = drm_plane_init(dev, &intel_plane->base, possible_crtcs,
-                            &intel_plane_funcs,
-                            plane_formats, num_plane_formats,
-                            false);
+       ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs,
+                                      &intel_plane_funcs,
+                                      plane_formats, num_plane_formats,
+                                      DRM_PLANE_TYPE_OVERLAY);
        if (ret) {
                kfree(intel_plane);
                goto out;