On Wed, Sep 03, 2014 at 10:38:20AM -0300, Gustavo Padovan wrote:
From: Derek Foreman derek.foreman@collabora.co.uk
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
Queued for -next, thanks for the patch. -Daniel
drivers/gpu/drm/i915/intel_sprite.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 0bdb00b..4cbe286 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1375,10 +1375,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,
if (ret) { kfree(intel_plane); goto out;DRM_PLANE_TYPE_OVERLAY);
-- 1.9.3