From patchwork Thu Aug 28 17:40:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 4805891 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 53CBF9F3EE for ; Thu, 28 Aug 2014 17:40:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C254220145 for ; Thu, 28 Aug 2014 17:40:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CCDCF2010F for ; Thu, 28 Aug 2014 17:40:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1C7FD6E06C; Thu, 28 Aug 2014 10:40:20 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yh0-f41.google.com (mail-yh0-f41.google.com [209.85.213.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 21EE66E06C; Thu, 28 Aug 2014 10:40:19 -0700 (PDT) Received: by mail-yh0-f41.google.com with SMTP id 29so733729yhl.14 for ; Thu, 28 Aug 2014 10:40:18 -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=Wp65fCD3P6iUOpPJN6kpt5LK8iBDCZo1trPZxBWytWNlk22zWT0v+ZCHdtqC4R3Ta/ YigSObxXyatrq8rH5MsQsuo3gF0QKJgFEm+fP9t6vl8GAirO/o7WiOJW3nhNQSMzmLRa tDmtVp32+Ek3ShZXXFBNbctt5zav9gc8jWdCvYUAkT84RMYlxzPeFwJOkjTH7L5nROnG R6BB7G+h75NZ2D/JTKZ6GRkObtfbGlnzEkOifRmyF1qyl+2pxGVoBO+Og34x8OkMGLNX 2vtCAnaqJEW3kwkxsSZzd0ZZfiZEySkCHxidSszzVvBp6jJmMBqPGY9iCAUUNb88HxwC x3bA== X-Received: by 10.236.30.105 with SMTP id j69mr6811551yha.19.1409247618405; Thu, 28 Aug 2014 10:40:18 -0700 (PDT) Received: from localhost.localdomain ([187.10.18.246]) by mx.google.com with ESMTPSA id a14sm2020073yho.33.2014.08.28.10.40.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Aug 2014 10:40:17 -0700 (PDT) From: Gustavo Padovan To: intel-gfx@lists.freedesktop.org Subject: [PATCH 1/9] drm/i915: init sprites with univeral plane init function Date: Thu, 28 Aug 2014 14:40:05 -0300 Message-Id: <1409247613-14232-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=-4.2 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 --- 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;