From patchwork Fri May 12 19:10:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9724801 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 88EDE601E7 for ; Fri, 12 May 2017 19:11:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 80F0028831 for ; Fri, 12 May 2017 19:11:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75A992886D; Fri, 12 May 2017 19:11:19 +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 0A0B228831 for ; Fri, 12 May 2017 19:11:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4EFEA6E710; Fri, 12 May 2017 19:11:14 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8D4566E70F for ; Fri, 12 May 2017 19:11:12 +0000 (UTC) Received: by mail-qk0-f194.google.com with SMTP id k74so9042652qke.2 for ; Fri, 12 May 2017 12:11:12 -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=OLS9zuAUAQggrMipcE8+0aOhsm9nCDD02GbNdbksy7Y=; b=EEQkDxFg4E8a8kAJUZoTs+oPTffLfPsUBi204xA+5wvAoHdpXknJylV6THpRS/I7jR 7a7zHuS2Y368xA+gmsJ9BaaFQuedDMYiUmE/fcKNbCVo/iXTwH2tPd/doRYPQ9YCmTsu o7rC7kfFqXuyCp6QvnzzjQY/HWMRwmelUHsIfg/WuJ3lZn6f0GOvAHGXUzcRH1GTWQ0c 3UNYhwbnDtw4IuA+AmAYluFpf8GLnD2DGZukdHF9+46MZo7NDEjtjxtE5FZTJjXdn2FW T2yWLFh/lUqdBG1tojJBjCmHwXjk1t8jZ66/D+LRBejGuwlBloiL8tfsJDfiWvU2RTqw EZ0Q== X-Gm-Message-State: AODbwcDcKH5BVj6sVR6ARKBnTbi3AZafovWG+IHHxuTLv6WmYGwn/EVT XaxGQA+j5oiVnQ== X-Received: by 10.55.108.68 with SMTP id h65mr5616290qkc.302.1494616271681; Fri, 12 May 2017 12:11:11 -0700 (PDT) Received: from localhost.localdomain ([177.17.166.160]) by smtp.gmail.com with ESMTPSA id g32sm2930406qtc.19.2017.05.12.12.11.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 May 2017 12:11:11 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [RFC v3 6/8] drm/msm: remove mdp5_cursor_plane_funcs Date: Fri, 12 May 2017 16:10:52 -0300 Message-Id: <20170512191054.10074-7-gustavo@padovan.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170512191054.10074-1-gustavo@padovan.org> References: <20170512191054.10074-1-gustavo@padovan.org> Cc: Gustavo Padovan 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 mdp5_cursor_plane_funcs just duplicates mdp5_plane_funcs now. Cc: Rob Clark 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 07106c1..794ca07 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;