From patchwork Tue Sep 2 19:23:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 4827851 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 49013C0338 for ; Tue, 2 Sep 2014 19:23:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8A2C82017D for ; Tue, 2 Sep 2014 19:23:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B0937201CD for ; Tue, 2 Sep 2014 19:23:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EF6906E3A5; Tue, 2 Sep 2014 12:23:53 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yk0-f174.google.com (mail-yk0-f174.google.com [209.85.160.174]) by gabe.freedesktop.org (Postfix) with ESMTP id 746A76E2B6; Tue, 2 Sep 2014 12:23:52 -0700 (PDT) Received: by mail-yk0-f174.google.com with SMTP id 10so4367839ykt.5 for ; Tue, 02 Sep 2014 12:23:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id; bh=n1e72eCeW9UoCxc8SLH2/PabHrTb1mZyFbGLiWwAPKI=; b=cJcdpldr2BVoiU383Iq//+Adv1sIAhofhTio5PYmcq2HX3YOjg2dVCe5qtP19Jg2P0 psSg3pPXxG2cRI1kCX+9W9VZ74Jj4eedfo1j5RTUUsuPp7cr4mW5aJ3IlFXx/bDRx8bX xKhBkFj11WPrTuU0oOl+9aCZrobcnltO1El91sQnrX24ZbMMInOBpAllLoNif8XG2O5P PDoy6TScAuyXH06VTuyF6RBXrRphsNIo2W98Rqi2eRRqSh0cP6jhghlZYMYsg+ZRxFao 6l+CdosChGOCpwrbdhrqfUU6JTsVZ2p/4A3yDeLAJSOFyCSz84vzcfSHFv250zGMIQKR aNPg== X-Received: by 10.236.228.161 with SMTP id f31mr54409549yhq.44.1409685831805; Tue, 02 Sep 2014 12:23:51 -0700 (PDT) Received: from localhost.localdomain (200-158-3-16.dsl.telesp.net.br. [200.158.3.16]) by mx.google.com with ESMTPSA id d36sm6100071yho.20.2014.09.02.12.23.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Sep 2014 12:23:50 -0700 (PDT) From: Gustavo Padovan To: intel-gfx@lists.freedesktop.org Subject: [PATCH -v2 1/4] drm/i915: init sprites with univeral plane init function Date: Tue, 2 Sep 2014 16:23:44 -0300 Message-Id: <1409685827-29067-1-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 1.9.3 Cc: Derek Foreman , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Derek Foreman 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 Reviewed-by: Ville Syrjälä --- 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, + DRM_PLANE_TYPE_OVERLAY); if (ret) { kfree(intel_plane); goto out;