From patchwork Thu Jun 15 02:33:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9787859 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 5E8AE602C9 for ; Thu, 15 Jun 2017 02:33:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F21C280B0 for ; Thu, 15 Jun 2017 02:33:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42D37283DA; Thu, 15 Jun 2017 02:33:45 +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 DE0FA280B0 for ; Thu, 15 Jun 2017 02:33:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CE8596E6A0; Thu, 15 Jun 2017 02:33:26 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by gabe.freedesktop.org (Postfix) with ESMTPS id 513B76E6A0; Thu, 15 Jun 2017 02:33:25 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id j186so218198pge.1; Wed, 14 Jun 2017 19:33:25 -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=ep1GPaL9sBtQbL0Z5+RletlHTA2hdgJwBlonQBVxGp8=; b=KYBG3QVMVuNuYVF5KEMTMK7C3gOTLGmB/+9KKLcXzxycOtDPFUwIQCmkYty2ZByohE OFIqsj3oySEsYFBbBCWiHESSW1V9vihMR0SbDXYFfMS71dyc00WCDYM+J5YNuXmd+VvN TMzsxVu667itAMsWeK2Q63hmF51xtzFVLiKUsasF73kHbHHYwxlm0mgin+jn0qd24+13 J+nn82dyU3tzrRvX6cMwW2CkxXLflUBf+mHHIWUNJghMJeoQ0/SWXhhK9rVGR5SMXU1x ckBSgu09zk7J6q8UsBq2wfKjSqA4nXPuWnoUuNzOfIvQMuE+8J1EHdSxw2GxlQOaJFkH ulQQ== X-Gm-Message-State: AKS2vOxe0QEgUJC2Zchqp1rWcm5Tyvaxf7+x6qzEaK89pTpSqbQwNiV5 IEbUBA5NxRSzZssvQQI= X-Received: by 10.84.238.136 with SMTP id v8mr3456938plk.249.1497494004522; Wed, 14 Jun 2017 19:33:24 -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.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 19:33:23 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Date: Thu, 15 Jun 2017 11:33:04 +0900 Message-Id: <20170615023305.17410-6-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, Archit Taneja Subject: [Intel-gfx] [PATCH v2 5/6] drm/msm: remove mdp5_cursor_plane_funcs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan After converting legacy cursor updates to atomic async commits mdp5_cursor_plane_funcs just duplicates mdp5_plane_funcs now. Cc: Rob Clark Cc: Archit Taneja Signed-off-by: Gustavo Padovan Tested-by: Archit Taneja --- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c index bb5ee03..e6bf21d 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c @@ -247,19 +247,6 @@ static const struct drm_plane_funcs mdp5_plane_funcs = { .atomic_print_state = mdp5_plane_atomic_print_state, }; -static const struct drm_plane_funcs mdp5_cursor_plane_funcs = { - .update_plane = drm_atomic_helper_update_plane, - .disable_plane = drm_atomic_helper_disable_plane, - .destroy = mdp5_plane_destroy, - .set_property = drm_atomic_helper_plane_set_property, - .atomic_set_property = mdp5_plane_atomic_set_property, - .atomic_get_property = mdp5_plane_atomic_get_property, - .reset = mdp5_plane_reset, - .atomic_duplicate_state = mdp5_plane_duplicate_state, - .atomic_destroy_state = mdp5_plane_destroy_state, - .atomic_print_state = mdp5_plane_atomic_print_state, -}; - static int mdp5_plane_prepare_fb(struct drm_plane *plane, struct drm_plane_state *new_state) { @@ -1111,16 +1098,9 @@ struct drm_plane *mdp5_plane_init(struct drm_device *dev, spin_lock_init(&mdp5_plane->pipe_lock); - if (type == DRM_PLANE_TYPE_CURSOR) - ret = drm_universal_plane_init(dev, plane, 0xff, - &mdp5_cursor_plane_funcs, - mdp5_plane->formats, mdp5_plane->nformats, - type, NULL); - else - ret = drm_universal_plane_init(dev, plane, 0xff, - &mdp5_plane_funcs, - mdp5_plane->formats, mdp5_plane->nformats, - type, NULL); + ret = drm_universal_plane_init(dev, plane, 0xff, &mdp5_plane_funcs, + mdp5_plane->formats, + mdp5_plane->nformats, type, NULL); if (ret) goto fail;