From patchwork Wed Jun 28 20:54:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9815509 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ADAA060365 for ; Wed, 28 Jun 2017 20:55:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1BF72013D for ; Wed, 28 Jun 2017 20:55:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96CD222701; Wed, 28 Jun 2017 20:55:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 423EC2013D for ; Wed, 28 Jun 2017 20:55:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 62D026E5D1; Wed, 28 Jun 2017 20:55:13 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by gabe.freedesktop.org (Postfix) with ESMTPS id 767286E5C9; Wed, 28 Jun 2017 20:55:11 +0000 (UTC) Received: by mail-qk0-f196.google.com with SMTP id r62so9250679qkf.3; Wed, 28 Jun 2017 13:55:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PlD6J16M6zpGb/e6e4YCT48OKxGl1RMpoogzGnoxcRM=; b=TvULeaMzwk8fxsszXZqqtTn123B2ROMGqAWANcouFsIACeMkSY+gA8jlSgBt6Kf/rq ILdqyn/xWWuF1cF4zU+W7dzjGi80d5EkwGHtr+l30wATzMO57o+kDp5n4bwB6Y8fjyI3 6Gt9nP9l16a1d8yIfP6mXOP58OWXXZHh/dZXDBGA498b6rBnnrMpGRZpEglsIuSKwQvJ NwNuV4+4c6kC+bJbwCyLefqdmWzyeHRlRtIVMc9Uz+KVUG0zs5luFC/FKlWhM8Y4PVpB QHOp+hdyixxPq+rlfym0Fyra2S1QzUkeInD+NAt+L2pUOlrO+AQMyEh8FyvE1wis2AcS vkdA== X-Gm-Message-State: AKS2vOzdHO5Tf+7a2zRt5aJWiJgqJNdfnOwRUQ2uHBHTyPU5BAjUtTU7 7RQJupWjaX9xX5naukg= X-Received: by 10.55.26.104 with SMTP id a101mr15577576qka.202.1498683310585; Wed, 28 Jun 2017 13:55:10 -0700 (PDT) Received: from localhost.localdomain ([177.9.58.168]) by smtp.gmail.com with ESMTPSA id j65sm2343188qkf.38.2017.06.28.13.55.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 13:55:10 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 3/6] drm/i915: remove intel_cursor_plane_funcs Date: Wed, 28 Jun 2017 17:54:57 -0300 Message-Id: <20170628205500.8015-4-gustavo@padovan.org> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170628205500.8015-1-gustavo@padovan.org> References: <20170628205500.8015-1-gustavo@padovan.org> Cc: Gustavo Padovan , intel-gfx@lists.freedesktop.org, Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan After converting legacy cursor updates to atomic async commits intel_cursor_plane_funcs just duplicates intel_plane_funcs now. Cc: Daniel Vetter Signed-off-by: Gustavo Padovan --- drivers/gpu/drm/i915/intel_display.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 736301d..36f96271a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13412,17 +13412,6 @@ const struct drm_plane_funcs intel_plane_funcs = { .atomic_destroy_state = intel_plane_destroy_state, }; -static const struct drm_plane_funcs intel_cursor_plane_funcs = { - .update_plane = drm_atomic_helper_update_plane, - .disable_plane = drm_atomic_helper_disable_plane, - .destroy = intel_plane_destroy, - .set_property = drm_atomic_helper_plane_set_property, - .atomic_get_property = intel_plane_atomic_get_property, - .atomic_set_property = intel_plane_atomic_set_property, - .atomic_duplicate_state = intel_plane_duplicate_state, - .atomic_destroy_state = intel_plane_destroy_state, -}; - static struct intel_plane * intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) { @@ -13669,7 +13658,7 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) cursor->disable_plane = intel_disable_cursor_plane; ret = drm_universal_plane_init(&dev_priv->drm, &cursor->base, - 0, &intel_cursor_plane_funcs, + 0, &intel_plane_funcs, intel_cursor_formats, ARRAY_SIZE(intel_cursor_formats), DRM_PLANE_TYPE_CURSOR,