From patchwork Mon Apr 10 00:24:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9671841 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 74C41601EA for ; Mon, 10 Apr 2017 00:25:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6548327F89 for ; Mon, 10 Apr 2017 00:25:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 593FC27FA8; Mon, 10 Apr 2017 00:25:01 +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=ham 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 1F88B27EED for ; Mon, 10 Apr 2017 00:25:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D8C706E0DA; Mon, 10 Apr 2017 00:24:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0793F6E0CA for ; Mon, 10 Apr 2017 00:24:57 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id x75so7008991wma.1 for ; Sun, 09 Apr 2017 17:24:56 -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=ntI5SAOrBTR9PIg5HMW8ASWTz5l746JYieVpRO2H7Bg=; b=glV/2qe2lG0kw2sr0qkpZfBrMiBNpiu4kexdXegz669B2I7N0vVpPJNH1HsntiY9iA Nhsl69shW88Hv9YuZH67hdIhE9VlRuJ8g019kIPHYtxG3Dl88cIkGHOWckuwjB76dpKj CZLZ0XdfVJQnqfyXNKpNrqJtV0mE/6bKQZ2r3xnzSdl0oddayoFsZr6kGyT/qzRLirEK S0zm0kfeI6cdY1HyUl10yqYQrbbYgRT19oIGKnmj7TEds+Ttgw8pGmRPE7yx+7ggn5FO pWgzcGfYwhrY4eq6zUYe7NnuuvBYQiWesByXgHc5pXAfKDMmatTgbH9aRMCy+Cgx4nNs G+8Q== X-Gm-Message-State: AN3rC/4uUEalLcB78hjNvO/aQnGzi+B5MjYXAOYmShW8NpYjM9ife6fW iRRut3r9Iai62gmmSSI= X-Received: by 10.28.198.65 with SMTP id w62mr3660102wmf.80.1491783895425; Sun, 09 Apr 2017 17:24:55 -0700 (PDT) Received: from localhost.localdomain ([79.143.138.42]) by smtp.gmail.com with ESMTPSA id w10sm8015818wmw.14.2017.04.09.17.24.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Apr 2017 17:24:54 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [RFC 4/7] drm/i915: remove intel_cursor_plane_funcs Date: Mon, 10 Apr 2017 02:24:45 +0200 Message-Id: <20170410002448.12460-5-gustavo@padovan.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170410002448.12460-1-gustavo@padovan.org> References: <20170410002448.12460-1-gustavo@padovan.org> Cc: Gustavo Padovan , 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 c854c87..26d20e5 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13379,17 +13379,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) { @@ -13636,7 +13625,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,