From patchwork Thu Jun 15 02:33:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9787851 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 EF193602C9 for ; Thu, 15 Jun 2017 02:33:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFA7E280B0 for ; Thu, 15 Jun 2017 02:33:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D48A5283DA; Thu, 15 Jun 2017 02:33:28 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 8C22B280B0 for ; Thu, 15 Jun 2017 02:33:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3EA046E694; Thu, 15 Jun 2017 02:33:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id CCAC36E68B; Thu, 15 Jun 2017 02:33:20 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id s66so219093pfs.2; Wed, 14 Jun 2017 19:33:20 -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=xcq05FsBvMlvZg/gbx6FSOVFki2AstWIuyzqgN4jsh0=; b=unDWIkngZgCILZhmsJS5uKyg/bwCIAcmKsle79L6ofi25eaxnypliNg/YggXQYdj1L uXa38wXW5loz0DBnkj62EUIa06R1SyfmO1NXDoHYCD+F+D6xsc9DoNTmV4J2skdFpkvK RFyeIoEUZR/JDmkSQyrv0lTsIQoKtUchNWaUCmhghVr3ftHv1FhmbLmUnnR6QDq5sti4 QMXUUIZ/chqCRXC6/dP/lJ8v+5McdqIA/ElJKqjGD8Ilsp/39ahS7LOVihrtYF48hvPc sI59rD068SmJO2RAPDcsb3HlX2SL1kQRbZIQjnDVjlGk/axmjd47maQT/+rboMyjkS71 n/qQ== X-Gm-Message-State: AKS2vOwrUHioexrv4oWmEC+vIKrvUWFxBjPj0fLE1jSVJMREzzcY+Pa0 hs8r4y3IhWzzHHPOik0= X-Received: by 10.84.197.69 with SMTP id m63mr3567219pld.50.1497494000285; Wed, 14 Jun 2017 19:33:20 -0700 (PDT) Received: from jade.nodan1.kt.home.ne.jp (202-72-64-244.koalanet.ne.jp. [202.72.64.244]) by smtp.gmail.com with ESMTPSA id n15sm2152338pgs.61.2017.06.14.19.33.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 19:33:19 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 3/6] drm/i915: remove intel_cursor_plane_funcs Date: Thu, 15 Jun 2017 11:33:02 +0900 Message-Id: <20170615023305.17410-4-gustavo@padovan.org> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170615023305.17410-1-gustavo@padovan.org> References: <20170615023305.17410-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 bc24fc4..315c6e4 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,