From patchwork Wed Sep 3 13:38:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 4834751 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 64B4AC0338 for ; Wed, 3 Sep 2014 13:38:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CAD85201EF for ; Wed, 3 Sep 2014 13:38:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2E1C52021A for ; Wed, 3 Sep 2014 13:38:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 09B9989885; Wed, 3 Sep 2014 06:38:27 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yh0-f53.google.com (mail-yh0-f53.google.com [209.85.213.53]) by gabe.freedesktop.org (Postfix) with ESMTP id C8D2489177; Wed, 3 Sep 2014 06:38:25 -0700 (PDT) Received: by mail-yh0-f53.google.com with SMTP id a41so5240044yho.40 for ; Wed, 03 Sep 2014 06:38:25 -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:in-reply-to:references; bh=NOO2oIwqwSd5WKpKMDbPhe/fZzRWGFhZh0ycYKPttu8=; b=GR5vlXkntnvQS6qr7E/SUGPwT3IobN6q/Z1q2EF6PS8tWHcysT1rkOHNltXh/hfakV cgptmqT1B21ORjpkDDyAZ68N+FdM+4FwEl/DHmXUDSQryb7EPBJ0LV+rs8cRQiIhmJV7 Ne9UEvYkNbbvxotTdnYPi31Wye8nF4R8AIkSw/Bv0ZGZevfjAd9UH3k/anVZ3EbjZJkX zZD+RBSLiiYJCogFUqoLHtb2PKIvxayDjByLMU145qa4cDOfLuWOwjv4ldaEfd+T0d8S fjSPMEDPEvnNnt77X/t9zcUUC4XthRyxgUUdhcmQIbOsT82d3vVvzpw2DIIVNT/btRWZ 0Niw== X-Received: by 10.236.203.134 with SMTP id f6mr4135748yho.125.1409751505198; Wed, 03 Sep 2014 06:38:25 -0700 (PDT) Received: from localhost.localdomain ([179.110.36.38]) by mx.google.com with ESMTPSA id y42sm7199346yhy.55.2014.09.03.06.38.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Sep 2014 06:38:24 -0700 (PDT) From: Gustavo Padovan To: intel-gfx@lists.freedesktop.org Subject: [PATCH] drm/i915: init sprites with univeral plane init function Date: Wed, 3 Sep 2014 10:38:20 -0300 Message-Id: <1409751500-27907-1-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <20140903103648.GK15520@phenom.ffwll.local> References: <20140903103648.GK15520@phenom.ffwll.local> 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 Signed-off-by: Gustavo Padovan --- 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;