From patchwork Fri Sep 8 19:24:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9944925 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 8BCBC604D4 for ; Fri, 8 Sep 2017 19:24:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79364288AA for ; Fri, 8 Sep 2017 19:24:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E13A288AE; Fri, 8 Sep 2017 19:24:44 +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 2FBFD288AA for ; Fri, 8 Sep 2017 19:24:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DDCAE6EC08; Fri, 8 Sep 2017 19:24:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4AB7A6EC0B for ; Fri, 8 Sep 2017 19:24:41 +0000 (UTC) Received: by mail-qt0-f195.google.com with SMTP id p55so2109279qtc.2 for ; Fri, 08 Sep 2017 12:24:41 -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=lPk7/6owFYWzxHnxEpOuhMAZocjW6Fg0UcoLZu9VACY=; b=fUjwsL3YRHRRsU3iFgRtRHZ4s/uB9rP647PA0FKOfOZ9WurZYTQUH+Kih/Bb0/n9Sm YRF5kbvr6TtKqpYBVDmfJ7pMtO+lOI24SGh6wnzMbw6M1fwNcR2Z2NBgWvide5QMUAja MObFr2z2HMywPARfXwR8eND8P8M4lK4h6YkyVuu+UDsd0ILvXogfPeUTxEN3mBeKq8pZ jqPWiu+hCB97P7gkk5rWfK9dTQfiryPorPIa9jKjPIRXSZehPceaSWRpwWQAH+cG9hyF PePr9dnevBAOukfKeFdNxvBG4PilJGcU+O6fIGFMTMWj2SSMuT63d7yD+RHbt52crQcQ Boww== X-Gm-Message-State: AHPjjUjNJDlv+ppTaSAH63YgBGcWL9Zh0Uf12DH2WiWioykTyB6MBuaa LvpJjYx9HZNWYpC/tj8= X-Google-Smtp-Source: AOwi7QCkqLrc9Ww66RoM3jgHLV6VCIGsS+nBqU1RS9S5gFmFrYPSyYvIdfeOoACe6QG9hUWDuliVvA== X-Received: by 10.200.37.149 with SMTP id e21mr5672733qte.269.1504898680269; Fri, 08 Sep 2017 12:24:40 -0700 (PDT) Received: from localhost.localdomain ([187.35.193.7]) by smtp.gmail.com with ESMTPSA id f69sm1712471qke.27.2017.09.08.12.24.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Sep 2017 12:24:39 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [-PATCH v5 4/5] drm/msm: remove mdp5_cursor_plane_funcs Date: Fri, 8 Sep 2017 16:24:18 -0300 Message-Id: <20170908192419.21172-4-gustavo@padovan.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170908192419.21172-1-gustavo@padovan.org> References: <20170908192419.21172-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 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, 4 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c index 83200bbf91f8..1eee8c730665 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c @@ -245,18 +245,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, - .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) { @@ -1108,16 +1096,10 @@ struct drm_plane *mdp5_plane_init(struct drm_device *dev, mdp5_plane->nformats = mdp_get_formats(mdp5_plane->formats, ARRAY_SIZE(mdp5_plane->formats), false); - if (type == DRM_PLANE_TYPE_CURSOR) - ret = drm_universal_plane_init(dev, plane, 0xff, - &mdp5_cursor_plane_funcs, - mdp5_plane->formats, mdp5_plane->nformats, - NULL, type, NULL); - else - ret = drm_universal_plane_init(dev, plane, 0xff, - &mdp5_plane_funcs, - mdp5_plane->formats, mdp5_plane->nformats, - NULL, type, NULL); + ret = drm_universal_plane_init(dev, plane, 0xff, &mdp5_plane_funcs, + mdp5_plane->formats, + mdp5_plane->nformats, + NULL, type, NULL); if (ret) goto fail;