From patchwork Thu Apr 5 15:44:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10324811 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 7675B6032A for ; Thu, 5 Apr 2018 15:45:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67264292C7 for ; Thu, 5 Apr 2018 15:45:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BE51292CA; Thu, 5 Apr 2018 15:45:12 +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 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 41B21292C8 for ; Thu, 5 Apr 2018 15:45:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E81B46E776; Thu, 5 Apr 2018 15:45:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id F18386E772 for ; Thu, 5 Apr 2018 15:45:02 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id f125so8394738wme.4 for ; Thu, 05 Apr 2018 08:45:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=he98CVPGelColC3KQIjqRuo3edrSaSwKlNs5qYB7NYs=; b=IGJZ3Bl5W8fxoSAona+YNF1h2JCfDFcv2Isj0xTdPIwFM6nfqWkyMGCWrukJ4BPeYi VQlOcOxLLvhfrVH2pLNhMB4id0ggd+ILky3iuU8ublj130YNgtnIl0xH/XxVER0DaIcl qu4HoeDnoupZxuqN1aJH2sSVMmEJ051V2S8DA= 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=he98CVPGelColC3KQIjqRuo3edrSaSwKlNs5qYB7NYs=; b=IqJF24YTnWIT/VRK4F2F3flFJWruykdkSkqAvXu6mSyLU9opKx5cpKAgDST9mF1xhQ B3xdZSU54pba9ovHHmBS3tT+1Bh93uuyDzAaiob103yrk6H+u4vOfNlKk9Z4EL/pshde u5h9knAhYwUONrjLH0TiN2GU3yMm+QjZE7Lrr5LNigLnI9SMztOgmFC9CmJj1sQLgjug NNcuKa+H3yjwfXkz/fYPhfSR4pa5BGj2uNsmhoANUyFaBXww+0omYv79qlGYK3w2fBCW cCDpdAKBmbd2kEyFcOhZuJ5d6W6rcaTLPGpOCJBiTJpGXxkdMGF26PXY/7MRuV/JAPeg o88g== X-Gm-Message-State: ALQs6tDUcv520Ks4wAzSeigurUHMCO7Sdm5svZQw25mwSSA566p9Vcv2 soiFHcZjoQWSOu7O80sQcRpNztQT X-Google-Smtp-Source: AIpwx4/Jb+dmGkwjy/KVEvsy9JOuQRj63m/zMKYQXELO+wAVt6Nos6RAFzPTc2MoSUSQ/+jScihdJg== X-Received: by 10.80.144.119 with SMTP id z52mr3412804edz.79.1522943101296; Thu, 05 Apr 2018 08:45:01 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id i48sm4970247ede.39.2018.04.05.08.44.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Apr 2018 08:45:00 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 4/9] drm/pl111: Use simple_display_pipe prepare_fb helper Date: Thu, 5 Apr 2018 17:44:44 +0200 Message-Id: <20180405154449.23038-5-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180405154449.23038-1-daniel.vetter@ffwll.ch> References: <20180405154449.23038-1-daniel.vetter@ffwll.ch> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Daniel Vetter MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Daniel Vetter Cc: Eric Anholt --- drivers/gpu/drm/pl111/pl111_display.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl111/pl111_display.c index 1fee578e05b0..19b0d006a54a 100644 --- a/drivers/gpu/drm/pl111/pl111_display.c +++ b/drivers/gpu/drm/pl111/pl111_display.c @@ -377,19 +377,13 @@ static void pl111_display_disable_vblank(struct drm_simple_display_pipe *pipe) writel(0, priv->regs + priv->ienb); } -static int pl111_display_prepare_fb(struct drm_simple_display_pipe *pipe, - struct drm_plane_state *plane_state) -{ - return drm_gem_fb_prepare_fb(&pipe->plane, plane_state); -} - static struct drm_simple_display_pipe_funcs pl111_display_funcs = { .mode_valid = pl111_mode_valid, .check = pl111_display_check, .enable = pl111_display_enable, .disable = pl111_display_disable, .update = pl111_display_update, - .prepare_fb = pl111_display_prepare_fb, + .prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb, }; static int pl111_clk_div_choose_div(struct clk_hw *hw, unsigned long rate,