From patchwork Wed Sep 14 12:54:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 9331373 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 0E5E760231 for ; Wed, 14 Sep 2016 12:58:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F351D29D32 for ; Wed, 14 Sep 2016 12:58:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7A7E29DCD; Wed, 14 Sep 2016 12:58:24 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A30A029D32 for ; Wed, 14 Sep 2016 12:58:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bk9lf-0008Sc-Vv; Wed, 14 Sep 2016 12:58:24 +0000 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bk9iw-0006vE-Mw for linux-rockchip@lists.infradead.org; Wed, 14 Sep 2016 12:55:35 +0000 Received: by mail-pa0-x231.google.com with SMTP id id6so5299779pad.3 for ; Wed, 14 Sep 2016 05:55:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Y+AWD9clMk4iW5qPEx37GnV4ccRRkOUfvpLbhbaZ8O8=; b=fB8UcIQ1mjQcrG0qbDgQzpIFVwXG8/bV/kO4CeLEbxN+2AHtgG2ebqp6EX9RpDi+oU f2uO8DdAvHGpcoHlVkJA59ruoXBxtUR8RzktKcUMqXFJb4jXfrOfTiLEhgK2m/TRFN1n DV210SvBFTD75bYysTiaKgT+J+08XoogrXFyQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Y+AWD9clMk4iW5qPEx37GnV4ccRRkOUfvpLbhbaZ8O8=; b=Fz8YpVDLazjRaOKgDqBRWCAafEnTAo3K3uuOizmKUKXRdjK3QhWtVbEcRDb8+CH745 C5QcU8gfdfagbCDn9wYjy3Y2XLkMOUTR+81VCBzDHGYlR7zSeq/RY15SlmOZLOMvO6D5 R6C8fKyg3LgxC+76oo3DS7Pvpa3sUmKmiX1DIyRU+11pBxjNAxWUB4fqEu5e/TNX5n7c IR2HUfs4cXrreVQLbcx7dd2FbWM1mwdxXozOO8KITJFJTTviPYTzV1hmPedfsojMlrJP YeW/hCQF/4ACkTBdBlBTdwk0Y9RgG4gPzOXiAW9RtdZk2VS5pJlZL91FS+rIvlYAn08Z UlTg== X-Gm-Message-State: AE9vXwNeD+zS+9xkdVFubyCR0tQlZbMtYY645d5tazfJcPC0KV7ej6+AyL6JH+0JWXDXQVKO X-Received: by 10.66.138.74 with SMTP id qo10mr4182001pab.135.1473857713114; Wed, 14 Sep 2016 05:55:13 -0700 (PDT) Received: from basement.tok.corp.google.com ([100.103.3.207]) by smtp.gmail.com with ESMTPSA id t7sm5601309paz.21.2016.09.14.05.55.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Sep 2016 05:55:12 -0700 (PDT) From: Tomasz Figa To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/8] drm/rockchip: Get rid of some unnecessary code Date: Wed, 14 Sep 2016 21:54:55 +0900 Message-Id: <1473857701-9250-3-git-send-email-tfiga@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1473857701-9250-1-git-send-email-tfiga@chromium.org> References: <1473857701-9250-1-git-send-email-tfiga@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160914_055534_831238_DFB0D385 X-CRM114-Status: UNSURE ( 8.61 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , David Airlie , linux-kernel@vger.kernel.org, Daniel Kurtz , Tomasz Figa , linux-rockchip@lists.infradead.org, Sean Paul , linux-arm-kernel@lists.infradead.org, Mark Yao MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Current code implements prepare_fb and cleanup_fb callbacks only to grab/release fb references, which is already done by atomic framework when creating/destryoing plane state. Let's remove these unused bits. Signed-off-by: Tomasz Figa --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 7e811cf..68988c6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -641,22 +641,6 @@ static void vop_plane_destroy(struct drm_plane *plane) drm_plane_cleanup(plane); } -static int vop_plane_prepare_fb(struct drm_plane *plane, - struct drm_plane_state *new_state) -{ - if (plane->state->fb) - drm_framebuffer_reference(plane->state->fb); - - return 0; -} - -static void vop_plane_cleanup_fb(struct drm_plane *plane, - struct drm_plane_state *old_state) -{ - if (old_state->fb) - drm_framebuffer_unreference(old_state->fb); -} - static int vop_plane_atomic_check(struct drm_plane *plane, struct drm_plane_state *state) { @@ -849,8 +833,6 @@ static void vop_plane_atomic_update(struct drm_plane *plane, } static const struct drm_plane_helper_funcs plane_helper_funcs = { - .prepare_fb = vop_plane_prepare_fb, - .cleanup_fb = vop_plane_cleanup_fb, .atomic_check = vop_plane_atomic_check, .atomic_update = vop_plane_atomic_update, .atomic_disable = vop_plane_atomic_disable,