From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D98BC433DB for ; Wed, 10 Feb 2021 13:10:26 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B93FB64E7C for ; Wed, 10 Feb 2021 13:10:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B93FB64E7C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=eAxa3/8imZyDvuB94QZCmEnvekPxTLRzpZiiaQKnPoI=; b=u+Wd9tO2SvOI135W+d4RV8HCk mI5AuRVSjFz0FXjIKmIH3cTbKqg/PYCYm0VoqWkiqaMUpK82uTHLdX4Gk2fzQdrcHXaX0ZKFpTE9e Pxt1zOBjc0wsx9BYDhyopv5NMdADr13nLYCxAG84rPM/MCiuGl+yhTLvtY9MMMb47d35z2dayMO6J 4fue2ftvcLI9FoOfhgKvw10R+xuIw5h5cxK9C7j7oc6SXFzotROnB3ssk1O8chjAqCn0uvtaWXwze glGjhhvs0m2TXVqrArgZGTYBhfGaZGTl+9FioSJSUgV47QlNz0IWM6SBaSsCCRHhjalbrdDGvqxfA aOoUcEOzw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9pG5-0006sC-5q; Wed, 10 Feb 2021 13:10:17 +0000 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9pFx-0006qD-Jy for linux-rockchip@lists.infradead.org; Wed, 10 Feb 2021 13:10:12 +0000 Received: by mail-wr1-x42a.google.com with SMTP id v14so2458833wro.7 for ; Wed, 10 Feb 2021 05:10:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=iWpF49uMU14UosAzlqwiuNqcUbJ2msT4pOMhzEXf42o=; b=TLQvDMdyJuQv+bg7lbkgLu31DaHBHWcxJzQfRZM/sNSAX4Wgt3e2671SIMoZ7Cp/SL /2z0y40cdUfQ46Vhb+t42L/I7zOIXoZdcHNwL5LXvGtQW0k1NphtWVn8TGoei+li9qH5 RiNWOCBswIVy8fUmyMQwnuEY9a/95aRqK/gwM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=iWpF49uMU14UosAzlqwiuNqcUbJ2msT4pOMhzEXf42o=; b=KXFBUY6bIqj8Hoj7fYLqH+SvT/VGo4F0vO39AFmLXc04tw8jJmeTE8Rc3beRQmOShA NwOSJ4XB33giMlvQabgNcO74u8Q32gp9nSfZmDM3lzHyRT1KhCGCJRdMW2Yf8tHWsPTw Pw45TaSypPU1JliueLgNeVwAKz/G2w/QDylHg7XEThl1Ba/mX0/SqLLIFbdse27eAUMa FcQl5Koer0js7u4bLo3Z0ijf47jNYM/UHleufCnj6B5Z+CMnimS8Qc09IT9Xcq3nfcOI vZvnsGaFVZmuAGER4X5NRJ4PXWT6gUPqrw1XYfkVHtUlVb8ou6WZYBFVP/RhW+p/dpbY vz3A== X-Gm-Message-State: AOAM532P+PexvHeZUf23ISKXOU8mmycNHLscARSFmNs8yI3FZaIOKUk3 J58R44+mX2Yg5BOIRjIWxBPJVQ== X-Google-Smtp-Source: ABdhPJyNgqJYNeBvHSDQfJEPR/ElqAAJrZui/zdUGShb+Dh4yiyexx3HbrJG83Bc1v/R4mCjOn1lPg== X-Received: by 2002:a5d:6684:: with SMTP id l4mr3669530wru.111.1612962606385; Wed, 10 Feb 2021 05:10:06 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id 16sm2309657wmi.43.2021.02.10.05.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Feb 2021 05:10:05 -0800 (PST) Date: Wed, 10 Feb 2021 14:10:03 +0100 From: Daniel Vetter To: Thomas Zimmermann Subject: Re: [PATCH] drm/gem: Move drm_gem_fb_prepare_fb() to GEM atomic helpers Message-ID: References: <20210209102913.6372-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210209102913.6372-1-tzimmermann@suse.de> X-Operating-System: Linux phenom 5.7.0-1-amd64 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210210_081009_777812_E9F92F12 X-CRM114-Status: GOOD ( 29.10 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linaro-mm-sig@lists.linaro.org, linux-aspeed@lists.ozlabs.org, airlied@linux.ie, linux-arm-msm@vger.kernel.org, maarten.lankhorst@linux.intel.com, linux-mips@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-mediatek@lists.infradead.org, mripard@kernel.org, daniel@ffwll.ch, xen-devel@lists.xenproject.org, linux-tegra@vger.kernel.org, linux-amlogic@lists.infradead.org, freedreno@lists.freedesktop.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org On Tue, Feb 09, 2021 at 11:29:13AM +0100, Thomas Zimmermann wrote: > The function drm_gem_fb_prepare_fb() is a helper for atomic modesetting, > but currently located next to framebuffer helpers. Move it to GEM atomic > helpers, rename it slightly and adopt the drivers. Same for the rsp > simple-pipe helper. > = > Compile-tested with x86-64, aarch64 and arm. The patch is fairly large, > but there are no functional changes. > = > Signed-off-by: Thomas Zimmermann If we bikeshed this, I think should also throw in the _helper_ somewhere? But really I don't have an opinion on this. -Daniel > --- > drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 4 +- > drivers/gpu/drm/drm_gem_atomic_helper.c | 69 +++++++++++++++++++- > drivers/gpu/drm/drm_gem_framebuffer_helper.c | 63 ------------------ > drivers/gpu/drm/drm_gem_vram_helper.c | 4 +- > drivers/gpu/drm/imx/dcss/dcss-plane.c | 4 +- > drivers/gpu/drm/imx/ipuv3-plane.c | 4 +- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 3 +- > drivers/gpu/drm/ingenic/ingenic-ipu.c | 4 +- > drivers/gpu/drm/mcde/mcde_display.c | 4 +- > drivers/gpu/drm/mediatek/mtk_drm_plane.c | 6 +- > drivers/gpu/drm/meson/meson_overlay.c | 8 +-- > drivers/gpu/drm/meson/meson_plane.c | 4 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 4 +- > drivers/gpu/drm/msm/msm_atomic.c | 4 +- > drivers/gpu/drm/mxsfb/mxsfb_kms.c | 6 +- > drivers/gpu/drm/pl111/pl111_display.c | 4 +- > drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 4 +- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +- > drivers/gpu/drm/stm/ltdc.c | 4 +- > drivers/gpu/drm/sun4i/sun4i_layer.c | 4 +- > drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 4 +- > drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 4 +- > drivers/gpu/drm/tegra/plane.c | 4 +- > drivers/gpu/drm/tidss/tidss_plane.c | 4 +- > drivers/gpu/drm/tiny/hx8357d.c | 4 +- > drivers/gpu/drm/tiny/ili9225.c | 4 +- > drivers/gpu/drm/tiny/ili9341.c | 4 +- > drivers/gpu/drm/tiny/ili9486.c | 4 +- > drivers/gpu/drm/tiny/mi0283qt.c | 4 +- > drivers/gpu/drm/tiny/repaper.c | 3 +- > drivers/gpu/drm/tiny/st7586.c | 4 +- > drivers/gpu/drm/tiny/st7735r.c | 4 +- > drivers/gpu/drm/tve200/tve200_display.c | 4 +- > drivers/gpu/drm/vc4/vc4_plane.c | 4 +- > drivers/gpu/drm/vkms/vkms_plane.c | 3 +- > drivers/gpu/drm/xen/xen_drm_front_kms.c | 3 +- > include/drm/drm_gem_atomic_helper.h | 8 +++ > include/drm/drm_gem_framebuffer_helper.h | 6 +- > include/drm/drm_modeset_helper_vtables.h | 2 +- > include/drm/drm_plane.h | 4 +- > include/drm/drm_simple_kms_helper.h | 2 +- > 41 files changed, 152 insertions(+), 141 deletions(-) > = > diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c b/drivers/gpu/drm/a= speed/aspeed_gfx_crtc.c > index e54686c31a90..d8f214e0be82 100644 > --- a/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c > +++ b/drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c > @@ -9,8 +9,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > @@ -219,7 +219,7 @@ static const struct drm_simple_display_pipe_funcs asp= eed_gfx_funcs =3D { > .enable =3D aspeed_gfx_pipe_enable, > .disable =3D aspeed_gfx_pipe_disable, > .update =3D aspeed_gfx_pipe_update, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > .enable_vblank =3D aspeed_gfx_enable_vblank, > .disable_vblank =3D aspeed_gfx_disable_vblank, > }; > diff --git a/drivers/gpu/drm/drm_gem_atomic_helper.c b/drivers/gpu/drm/dr= m_gem_atomic_helper.c > index e27762cef360..c656b40656bf 100644 > --- a/drivers/gpu/drm/drm_gem_atomic_helper.c > +++ b/drivers/gpu/drm/drm_gem_atomic_helper.c > @@ -1,6 +1,10 @@ > // SPDX-License-Identifier: GPL-2.0-or-later > = > +#include > + > #include > +#include > +#include > #include > #include > #include > @@ -12,10 +16,69 @@ > * > * The GEM atomic helpers library implements generic atomic-commit > * functions for drivers that use GEM objects. Currently, it provides > - * plane state and framebuffer BO mappings for planes with shadow > - * buffers. > + * synchronization helpers, and plane state and framebuffer BO mappings > + * for planes with shadow buffers. > + */ > + > +/* > + * Plane Helpers > */ > = > +/** > + * drm_gem_prepare_fb() - Prepare a GEM backed framebuffer > + * @plane: Plane > + * @state: Plane state the fence will be attached to > + * > + * This function extracts the exclusive fence from &drm_gem_object.resv = and > + * attaches it to plane state for the atomic helper to wait on. This is > + * necessary to correctly implement implicit synchronization for any buf= fers > + * shared as a struct &dma_buf. This function can be used as the > + * &drm_plane_helper_funcs.prepare_fb callback. > + * > + * There is no need for &drm_plane_helper_funcs.cleanup_fb hook for simp= le > + * GEM based framebuffer drivers which have their buffers always pinned = in > + * memory. > + * > + * See drm_atomic_set_fence_for_plane() for a discussion of implicit and > + * explicit fencing in atomic modeset updates. > + */ > +int drm_gem_prepare_fb(struct drm_plane *plane, struct drm_plane_state *= state) > +{ > + struct drm_gem_object *obj; > + struct dma_fence *fence; > + > + if (!state->fb) > + return 0; > + > + obj =3D drm_gem_fb_get_obj(state->fb, 0); > + fence =3D dma_resv_get_excl_rcu(obj->resv); > + drm_atomic_set_fence_for_plane(state, fence); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(drm_gem_prepare_fb); > + > +/** > + * drm_gem_simple_display_pipe_prepare_fb - prepare_fb helper for &drm_s= imple_display_pipe > + * @pipe: Simple display pipe > + * @plane_state: Plane state > + * > + * This function uses drm_gem_prepare_fb() to extract the exclusive fence > + * from &drm_gem_object.resv and attaches it to plane state for the atom= ic > + * helper to wait on. This is necessary to correctly implement implicit > + * synchronization for any buffers shared as a struct &dma_buf. Drivers = can use > + * this as their &drm_simple_display_pipe_funcs.prepare_fb callback. > + * > + * See drm_atomic_set_fence_for_plane() for a discussion of implicit and > + * explicit fencing in atomic modeset updates. > + */ > +int drm_gem_simple_display_pipe_prepare_fb(struct drm_simple_display_pip= e *pipe, > + struct drm_plane_state *plane_state) > +{ > + return drm_gem_prepare_fb(&pipe->plane, plane_state); > +} > +EXPORT_SYMBOL(drm_gem_simple_display_pipe_prepare_fb); > + > /* > * Shadow-buffered Planes > */ > @@ -74,7 +137,7 @@ static int drm_gem_prepare_shadow_fb(struct drm_plane = *plane, struct drm_plane_s > if (!fb) > return 0; > = > - ret =3D drm_gem_fb_prepare_fb(plane, plane_state); > + ret =3D drm_gem_prepare_fb(plane, plane_state); > if (ret) > return ret; > = > diff --git a/drivers/gpu/drm/drm_gem_framebuffer_helper.c b/drivers/gpu/d= rm/drm_gem_framebuffer_helper.c > index 109d11fb4cd4..5ed2067cebb6 100644 > --- a/drivers/gpu/drm/drm_gem_framebuffer_helper.c > +++ b/drivers/gpu/drm/drm_gem_framebuffer_helper.c > @@ -5,13 +5,8 @@ > * Copyright (C) 2017 Noralf Tr=F8nnes > */ > = > -#include > -#include > -#include > #include > = > -#include > -#include > #include > #include > #include > @@ -19,7 +14,6 @@ > #include > #include > #include > -#include > = > #define AFBC_HEADER_SIZE 16 > #define AFBC_TH_LAYOUT_ALIGNMENT 8 > @@ -432,60 +426,3 @@ int drm_gem_fb_afbc_init(struct drm_device *dev, > return 0; > } > EXPORT_SYMBOL_GPL(drm_gem_fb_afbc_init); > - > -/** > - * drm_gem_fb_prepare_fb() - Prepare a GEM backed framebuffer > - * @plane: Plane > - * @state: Plane state the fence will be attached to > - * > - * This function extracts the exclusive fence from &drm_gem_object.resv = and > - * attaches it to plane state for the atomic helper to wait on. This is > - * necessary to correctly implement implicit synchronization for any buf= fers > - * shared as a struct &dma_buf. This function can be used as the > - * &drm_plane_helper_funcs.prepare_fb callback. > - * > - * There is no need for &drm_plane_helper_funcs.cleanup_fb hook for simp= le > - * gem based framebuffer drivers which have their buffers always pinned = in > - * memory. > - * > - * See drm_atomic_set_fence_for_plane() for a discussion of implicit and > - * explicit fencing in atomic modeset updates. > - */ > -int drm_gem_fb_prepare_fb(struct drm_plane *plane, > - struct drm_plane_state *state) > -{ > - struct drm_gem_object *obj; > - struct dma_fence *fence; > - > - if (!state->fb) > - return 0; > - > - obj =3D drm_gem_fb_get_obj(state->fb, 0); > - fence =3D dma_resv_get_excl_rcu(obj->resv); > - drm_atomic_set_fence_for_plane(state, fence); > - > - return 0; > -} > -EXPORT_SYMBOL_GPL(drm_gem_fb_prepare_fb); > - > -/** > - * drm_gem_fb_simple_display_pipe_prepare_fb - prepare_fb helper for > - * &drm_simple_display_pipe > - * @pipe: Simple display pipe > - * @plane_state: Plane state > - * > - * This function uses drm_gem_fb_prepare_fb() to extract the exclusive f= ence > - * from &drm_gem_object.resv and attaches it to plane state for the atom= ic > - * helper to wait on. This is necessary to correctly implement implicit > - * synchronization for any buffers shared as a struct &dma_buf. Drivers = can use > - * this as their &drm_simple_display_pipe_funcs.prepare_fb callback. > - * > - * See drm_atomic_set_fence_for_plane() for a discussion of implicit and > - * explicit fencing in atomic modeset updates. > - */ > -int drm_gem_fb_simple_display_pipe_prepare_fb(struct drm_simple_display_= pipe *pipe, > - struct drm_plane_state *plane_state) > -{ > - return drm_gem_fb_prepare_fb(&pipe->plane, plane_state); > -} > -EXPORT_SYMBOL(drm_gem_fb_simple_display_pipe_prepare_fb); > diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_= gem_vram_helper.c > index 48d4b59d3145..2071ec637df8 100644 > --- a/drivers/gpu/drm/drm_gem_vram_helper.c > +++ b/drivers/gpu/drm/drm_gem_vram_helper.c > @@ -8,7 +8,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -720,7 +720,7 @@ drm_gem_vram_plane_helper_prepare_fb(struct drm_plane= *plane, > goto err_drm_gem_vram_unpin; > } > = > - ret =3D drm_gem_fb_prepare_fb(plane, new_state); > + ret =3D drm_gem_prepare_fb(plane, new_state); > if (ret) > goto err_drm_gem_vram_unpin; > = > diff --git a/drivers/gpu/drm/imx/dcss/dcss-plane.c b/drivers/gpu/drm/imx/= dcss/dcss-plane.c > index 03ba88f7f995..092e98fe0cfd 100644 > --- a/drivers/gpu/drm/imx/dcss/dcss-plane.c > +++ b/drivers/gpu/drm/imx/dcss/dcss-plane.c > @@ -6,7 +6,7 @@ > #include > #include > #include > -#include > +#include > #include > = > #include "dcss-dev.h" > @@ -355,7 +355,7 @@ static void dcss_plane_atomic_disable(struct drm_plan= e *plane, > } > = > static const struct drm_plane_helper_funcs dcss_plane_helper_funcs =3D { > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > .atomic_check =3D dcss_plane_atomic_check, > .atomic_update =3D dcss_plane_atomic_update, > .atomic_disable =3D dcss_plane_atomic_disable, > diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv= 3-plane.c > index 075508051b5f..0b6d81c4fa77 100644 > --- a/drivers/gpu/drm/imx/ipuv3-plane.c > +++ b/drivers/gpu/drm/imx/ipuv3-plane.c > @@ -9,8 +9,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > = > @@ -704,7 +704,7 @@ static void ipu_plane_atomic_update(struct drm_plane = *plane, > } > = > static const struct drm_plane_helper_funcs ipu_plane_helper_funcs =3D { > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > .atomic_check =3D ipu_plane_atomic_check, > .atomic_disable =3D ipu_plane_atomic_disable, > .atomic_update =3D ipu_plane_atomic_update, > diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/= ingenic/ingenic-drm-drv.c > index 7bb31fbee29d..1ca02de60895 100644 > --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > @@ -28,6 +28,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -780,7 +781,7 @@ static const struct drm_plane_helper_funcs ingenic_dr= m_plane_helper_funcs =3D { > .atomic_update =3D ingenic_drm_plane_atomic_update, > .atomic_check =3D ingenic_drm_plane_atomic_check, > .atomic_disable =3D ingenic_drm_plane_atomic_disable, > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > }; > = > static const struct drm_crtc_helper_funcs ingenic_drm_crtc_helper_funcs = =3D { > diff --git a/drivers/gpu/drm/ingenic/ingenic-ipu.c b/drivers/gpu/drm/inge= nic/ingenic-ipu.c > index e52777ef85fd..1b9b5de6b67c 100644 > --- a/drivers/gpu/drm/ingenic/ingenic-ipu.c > +++ b/drivers/gpu/drm/ingenic/ingenic-ipu.c > @@ -23,7 +23,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > @@ -608,7 +608,7 @@ static const struct drm_plane_helper_funcs ingenic_ip= u_plane_helper_funcs =3D { > .atomic_update =3D ingenic_ipu_plane_atomic_update, > .atomic_check =3D ingenic_ipu_plane_atomic_check, > .atomic_disable =3D ingenic_ipu_plane_atomic_disable, > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > }; > = > static int > diff --git a/drivers/gpu/drm/mcde/mcde_display.c b/drivers/gpu/drm/mcde/m= cde_display.c > index 7c2e0b865441..dde16ef9650a 100644 > --- a/drivers/gpu/drm/mcde/mcde_display.c > +++ b/drivers/gpu/drm/mcde/mcde_display.c > @@ -13,8 +13,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > @@ -1481,7 +1481,7 @@ static struct drm_simple_display_pipe_funcs mcde_di= splay_funcs =3D { > .update =3D mcde_display_update, > .enable_vblank =3D mcde_display_enable_vblank, > .disable_vblank =3D mcde_display_disable_vblank, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > }; > = > int mcde_display_init(struct drm_device *drm) > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/m= ediatek/mtk_drm_plane.c > index 92141a19681b..64f7873e9867 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c > @@ -6,10 +6,10 @@ > = > #include > #include > -#include > #include > +#include > +#include > #include > -#include > = > #include "mtk_drm_crtc.h" > #include "mtk_drm_ddp_comp.h" > @@ -216,7 +216,7 @@ static void mtk_plane_atomic_update(struct drm_plane = *plane, > } > = > static const struct drm_plane_helper_funcs mtk_plane_helper_funcs =3D { > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > .atomic_check =3D mtk_plane_atomic_check, > .atomic_update =3D mtk_plane_atomic_update, > .atomic_disable =3D mtk_plane_atomic_disable, > diff --git a/drivers/gpu/drm/meson/meson_overlay.c b/drivers/gpu/drm/meso= n/meson_overlay.c > index 1ffbbecafa22..0ee2132a990f 100644 > --- a/drivers/gpu/drm/meson/meson_overlay.c > +++ b/drivers/gpu/drm/meson/meson_overlay.c > @@ -10,11 +10,11 @@ > #include > #include > #include > +#include > #include > -#include > +#include > #include > -#include > -#include > +#include > = > #include "meson_overlay.h" > #include "meson_registers.h" > @@ -742,7 +742,7 @@ static const struct drm_plane_helper_funcs meson_over= lay_helper_funcs =3D { > .atomic_check =3D meson_overlay_atomic_check, > .atomic_disable =3D meson_overlay_atomic_disable, > .atomic_update =3D meson_overlay_atomic_update, > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > }; > = > static bool meson_overlay_format_mod_supported(struct drm_plane *plane, > diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/= meson_plane.c > index 35338ed18209..24d64c9675ff 100644 > --- a/drivers/gpu/drm/meson/meson_plane.c > +++ b/drivers/gpu/drm/meson/meson_plane.c > @@ -16,8 +16,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > = > #include "meson_plane.h" > @@ -417,7 +417,7 @@ static const struct drm_plane_helper_funcs meson_plan= e_helper_funcs =3D { > .atomic_check =3D meson_plane_atomic_check, > .atomic_disable =3D meson_plane_atomic_disable, > .atomic_update =3D meson_plane_atomic_update, > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > }; > = > static bool meson_plane_format_mod_supported(struct drm_plane *plane, > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_plane.c > index bc0231a50132..3e9f9f3dd679 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c > @@ -13,7 +13,7 @@ > #include > #include > #include > -#include > +#include > = > #include "msm_drv.h" > #include "dpu_kms.h" > @@ -892,7 +892,7 @@ static int dpu_plane_prepare_fb(struct drm_plane *pla= ne, > * we can use msm_atomic_prepare_fb() instead of doing the > * implicit fence and fb prepare by hand here. > */ > - drm_gem_fb_prepare_fb(plane, new_state); > + drm_gem_prepare_fb(plane, new_state); > = > if (pstate->aspace) { > ret =3D msm_framebuffer_prepare(new_state->fb, > diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_a= tomic.c > index 6a326761dc4a..03a113eb6571 100644 > --- a/drivers/gpu/drm/msm/msm_atomic.c > +++ b/drivers/gpu/drm/msm/msm_atomic.c > @@ -5,7 +5,7 @@ > */ > = > #include > -#include > +#include > #include > = > #include "msm_atomic_trace.h" > @@ -22,7 +22,7 @@ int msm_atomic_prepare_fb(struct drm_plane *plane, > if (!new_state->fb) > return 0; > = > - drm_gem_fb_prepare_fb(plane, new_state); > + drm_gem_prepare_fb(plane, new_state); > = > return msm_framebuffer_prepare(new_state->fb, kms->aspace); > } > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mx= sfb_kms.c > index 3e1bb0aefb87..33188dea886d 100644 > --- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c > +++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > @@ -21,8 +21,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > @@ -495,13 +495,13 @@ static bool mxsfb_format_mod_supported(struct drm_p= lane *plane, > } > = > static const struct drm_plane_helper_funcs mxsfb_plane_primary_helper_fu= ncs =3D { > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > .atomic_check =3D mxsfb_plane_atomic_check, > .atomic_update =3D mxsfb_plane_primary_atomic_update, > }; > = > static const struct drm_plane_helper_funcs mxsfb_plane_overlay_helper_fu= ncs =3D { > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > .atomic_check =3D mxsfb_plane_atomic_check, > .atomic_update =3D mxsfb_plane_overlay_atomic_update, > }; > diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl11= 1/pl111_display.c > index 69c02e7c82b7..6fd7f13f1aca 100644 > --- a/drivers/gpu/drm/pl111/pl111_display.c > +++ b/drivers/gpu/drm/pl111/pl111_display.c > @@ -17,8 +17,8 @@ > = > #include > #include > +#include > #include > -#include > #include > = > #include "pl111_drm.h" > @@ -440,7 +440,7 @@ static struct drm_simple_display_pipe_funcs pl111_dis= play_funcs =3D { > .enable =3D pl111_display_enable, > .disable =3D pl111_display_disable, > .update =3D pl111_display_update, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > }; > = > static int pl111_clk_div_choose_div(struct clk_hw *hw, unsigned long rat= e, > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar= -du/rcar_du_vsp.c > index 53221d8473c1..964fdaee7c7d 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c > @@ -11,8 +11,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > @@ -236,7 +236,7 @@ static int rcar_du_vsp_plane_prepare_fb(struct drm_pl= ane *plane, > if (ret < 0) > return ret; > = > - return drm_gem_fb_prepare_fb(plane, state); > + return drm_gem_prepare_fb(plane, state); > } > = > void rcar_du_vsp_unmap_fb(struct rcar_du_vsp *vsp, struct drm_framebuffe= r *fb, > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/dr= m/rockchip/rockchip_drm_vop.c > index 8d15cabdcb02..45577de18b49 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -23,6 +23,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1096,7 +1097,7 @@ static const struct drm_plane_helper_funcs plane_he= lper_funcs =3D { > .atomic_disable =3D vop_plane_atomic_disable, > .atomic_async_check =3D vop_plane_atomic_async_check, > .atomic_async_update =3D vop_plane_atomic_async_update, > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > }; > = > static const struct drm_plane_funcs vop_plane_funcs =3D { > diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c > index 7812094f93d6..73522c6ba3eb 100644 > --- a/drivers/gpu/drm/stm/ltdc.c > +++ b/drivers/gpu/drm/stm/ltdc.c > @@ -26,8 +26,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > @@ -911,7 +911,7 @@ static const struct drm_plane_funcs ltdc_plane_funcs = =3D { > }; > = > static const struct drm_plane_helper_funcs ltdc_plane_helper_funcs =3D { > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > .atomic_check =3D ltdc_plane_atomic_check, > .atomic_update =3D ltdc_plane_atomic_update, > .atomic_disable =3D ltdc_plane_atomic_disable, > diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.c b/drivers/gpu/drm/sun4i/= sun4i_layer.c > index acfbfd4463a1..68da94b7c35d 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_layer.c > +++ b/drivers/gpu/drm/sun4i/sun4i_layer.c > @@ -7,7 +7,7 @@ > */ > = > #include > -#include > +#include > #include > = > #include "sun4i_backend.h" > @@ -122,7 +122,7 @@ static bool sun4i_layer_format_mod_supported(struct d= rm_plane *plane, > } > = > static const struct drm_plane_helper_funcs sun4i_backend_layer_helper_fu= ncs =3D { > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > .atomic_disable =3D sun4i_backend_layer_atomic_disable, > .atomic_update =3D sun4i_backend_layer_atomic_update, > }; > diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun= 4i/sun8i_ui_layer.c > index 816ad4ce8996..95654c153279 100644 > --- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c > +++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c > @@ -14,8 +14,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > = > @@ -299,7 +299,7 @@ static void sun8i_ui_layer_atomic_update(struct drm_p= lane *plane, > } > = > static const struct drm_plane_helper_funcs sun8i_ui_layer_helper_funcs = =3D { > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > .atomic_check =3D sun8i_ui_layer_atomic_check, > .atomic_disable =3D sun8i_ui_layer_atomic_disable, > .atomic_update =3D sun8i_ui_layer_atomic_update, > diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun= 4i/sun8i_vi_layer.c > index 8cc294a9969d..4005884dbce4 100644 > --- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c > +++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c > @@ -7,8 +7,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > = > @@ -402,7 +402,7 @@ static void sun8i_vi_layer_atomic_update(struct drm_p= lane *plane, > } > = > static const struct drm_plane_helper_funcs sun8i_vi_layer_helper_funcs = =3D { > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > .atomic_check =3D sun8i_vi_layer_atomic_check, > .atomic_disable =3D sun8i_vi_layer_atomic_disable, > .atomic_update =3D sun8i_vi_layer_atomic_update, > diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c > index 539d14935728..ec86a8d060aa 100644 > --- a/drivers/gpu/drm/tegra/plane.c > +++ b/drivers/gpu/drm/tegra/plane.c > @@ -8,7 +8,7 @@ > #include > #include > #include > -#include > +#include > #include > = > #include "dc.h" > @@ -198,7 +198,7 @@ int tegra_plane_prepare_fb(struct drm_plane *plane, > if (!state->fb) > return 0; > = > - drm_gem_fb_prepare_fb(plane, state); > + drm_gem_prepare_fb(plane, state); > = > return tegra_dc_pin(dc, to_tegra_plane_state(state)); > } > diff --git a/drivers/gpu/drm/tidss/tidss_plane.c b/drivers/gpu/drm/tidss/= tidss_plane.c > index 35067ae674ea..d39baa66e876 100644 > --- a/drivers/gpu/drm/tidss/tidss_plane.c > +++ b/drivers/gpu/drm/tidss/tidss_plane.c > @@ -10,7 +10,7 @@ > #include > #include > #include > -#include > +#include > = > #include "tidss_crtc.h" > #include "tidss_dispc.h" > @@ -151,7 +151,7 @@ static void drm_plane_destroy(struct drm_plane *plane) > } > = > static const struct drm_plane_helper_funcs tidss_plane_helper_funcs =3D { > - .prepare_fb =3D drm_gem_fb_prepare_fb, > + .prepare_fb =3D drm_gem_prepare_fb, > .atomic_check =3D tidss_plane_atomic_check, > .atomic_update =3D tidss_plane_atomic_update, > .atomic_disable =3D tidss_plane_atomic_disable, > diff --git a/drivers/gpu/drm/tiny/hx8357d.c b/drivers/gpu/drm/tiny/hx8357= d.c > index c6525cd02bc2..3e2c2868a363 100644 > --- a/drivers/gpu/drm/tiny/hx8357d.c > +++ b/drivers/gpu/drm/tiny/hx8357d.c > @@ -19,8 +19,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > @@ -184,7 +184,7 @@ static const struct drm_simple_display_pipe_funcs hx8= 357d_pipe_funcs =3D { > .enable =3D yx240qv29_enable, > .disable =3D mipi_dbi_pipe_disable, > .update =3D mipi_dbi_pipe_update, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > }; > = > static const struct drm_display_mode yx350hv15_mode =3D { > diff --git a/drivers/gpu/drm/tiny/ili9225.c b/drivers/gpu/drm/tiny/ili922= 5.c > index 8e98962db5a2..6b87df19eec1 100644 > --- a/drivers/gpu/drm/tiny/ili9225.c > +++ b/drivers/gpu/drm/tiny/ili9225.c > @@ -22,8 +22,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > @@ -328,7 +328,7 @@ static const struct drm_simple_display_pipe_funcs ili= 9225_pipe_funcs =3D { > .enable =3D ili9225_pipe_enable, > .disable =3D ili9225_pipe_disable, > .update =3D ili9225_pipe_update, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > }; > = > static const struct drm_display_mode ili9225_mode =3D { > diff --git a/drivers/gpu/drm/tiny/ili9341.c b/drivers/gpu/drm/tiny/ili934= 1.c > index 6ce97f0698eb..a97f3f70e4a6 100644 > --- a/drivers/gpu/drm/tiny/ili9341.c > +++ b/drivers/gpu/drm/tiny/ili9341.c > @@ -18,8 +18,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > @@ -140,7 +140,7 @@ static const struct drm_simple_display_pipe_funcs ili= 9341_pipe_funcs =3D { > .enable =3D yx240qv29_enable, > .disable =3D mipi_dbi_pipe_disable, > .update =3D mipi_dbi_pipe_update, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > }; > = > static const struct drm_display_mode yx240qv29_mode =3D { > diff --git a/drivers/gpu/drm/tiny/ili9486.c b/drivers/gpu/drm/tiny/ili948= 6.c > index d7ce40eb166a..6422a7f67079 100644 > --- a/drivers/gpu/drm/tiny/ili9486.c > +++ b/drivers/gpu/drm/tiny/ili9486.c > @@ -17,8 +17,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > @@ -153,7 +153,7 @@ static const struct drm_simple_display_pipe_funcs wav= eshare_pipe_funcs =3D { > .enable =3D waveshare_enable, > .disable =3D mipi_dbi_pipe_disable, > .update =3D mipi_dbi_pipe_update, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > }; > = > static const struct drm_display_mode waveshare_mode =3D { > diff --git a/drivers/gpu/drm/tiny/mi0283qt.c b/drivers/gpu/drm/tiny/mi028= 3qt.c > index ff77f983f803..dc76fe53aa72 100644 > --- a/drivers/gpu/drm/tiny/mi0283qt.c > +++ b/drivers/gpu/drm/tiny/mi0283qt.c > @@ -16,8 +16,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > @@ -144,7 +144,7 @@ static const struct drm_simple_display_pipe_funcs mi0= 283qt_pipe_funcs =3D { > .enable =3D mi0283qt_enable, > .disable =3D mipi_dbi_pipe_disable, > .update =3D mipi_dbi_pipe_update, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > }; > = > static const struct drm_display_mode mi0283qt_mode =3D { > diff --git a/drivers/gpu/drm/tiny/repaper.c b/drivers/gpu/drm/tiny/repape= r.c > index 11c602fc9897..2cee07a2e00b 100644 > --- a/drivers/gpu/drm/tiny/repaper.c > +++ b/drivers/gpu/drm/tiny/repaper.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -860,7 +861,7 @@ static const struct drm_simple_display_pipe_funcs rep= aper_pipe_funcs =3D { > .enable =3D repaper_pipe_enable, > .disable =3D repaper_pipe_disable, > .update =3D repaper_pipe_update, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > }; > = > static int repaper_connector_get_modes(struct drm_connector *connector) > diff --git a/drivers/gpu/drm/tiny/st7586.c b/drivers/gpu/drm/tiny/st7586.c > index ff5cf60f4bd7..7d216fe9267f 100644 > --- a/drivers/gpu/drm/tiny/st7586.c > +++ b/drivers/gpu/drm/tiny/st7586.c > @@ -19,8 +19,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > @@ -268,7 +268,7 @@ static const struct drm_simple_display_pipe_funcs st7= 586_pipe_funcs =3D { > .enable =3D st7586_pipe_enable, > .disable =3D st7586_pipe_disable, > .update =3D st7586_pipe_update, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > }; > = > static const struct drm_display_mode st7586_mode =3D { > diff --git a/drivers/gpu/drm/tiny/st7735r.c b/drivers/gpu/drm/tiny/st7735= r.c > index faaba0a033ea..df8872d62cdd 100644 > --- a/drivers/gpu/drm/tiny/st7735r.c > +++ b/drivers/gpu/drm/tiny/st7735r.c > @@ -19,8 +19,8 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > = > @@ -136,7 +136,7 @@ static const struct drm_simple_display_pipe_funcs st7= 735r_pipe_funcs =3D { > .enable =3D st7735r_pipe_enable, > .disable =3D mipi_dbi_pipe_disable, > .update =3D mipi_dbi_pipe_update, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > }; > = > static const struct st7735r_cfg jd_t18003_t01_cfg =3D { > diff --git a/drivers/gpu/drm/tve200/tve200_display.c b/drivers/gpu/drm/tv= e200/tve200_display.c > index cb0e837d3dba..50e1fb71869f 100644 > --- a/drivers/gpu/drm/tve200/tve200_display.c > +++ b/drivers/gpu/drm/tve200/tve200_display.c > @@ -17,8 +17,8 @@ > = > #include > #include > +#include > #include > -#include > #include > #include > = > @@ -316,7 +316,7 @@ static const struct drm_simple_display_pipe_funcs tve= 200_display_funcs =3D { > .enable =3D tve200_display_enable, > .disable =3D tve200_display_disable, > .update =3D tve200_display_update, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > .enable_vblank =3D tve200_display_enable_vblank, > .disable_vblank =3D tve200_display_disable_vblank, > }; > diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_pl= ane.c > index 7322169c0682..a65e980078f3 100644 > --- a/drivers/gpu/drm/vc4/vc4_plane.c > +++ b/drivers/gpu/drm/vc4/vc4_plane.c > @@ -20,7 +20,7 @@ > #include > #include > #include > -#include > +#include > #include > = > #include "uapi/drm/vc4_drm.h" > @@ -1250,7 +1250,7 @@ static int vc4_prepare_fb(struct drm_plane *plane, > = > bo =3D to_vc4_bo(&drm_fb_cma_get_gem_obj(state->fb, 0)->base); > = > - drm_gem_fb_prepare_fb(plane, state); > + drm_gem_prepare_fb(plane, state); > = > if (plane->state->fb =3D=3D state->fb) > return 0; > diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkm= s_plane.c > index 0824327cc860..e3fd8cd1f3f1 100644 > --- a/drivers/gpu/drm/vkms/vkms_plane.c > +++ b/drivers/gpu/drm/vkms/vkms_plane.c > @@ -5,6 +5,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -159,7 +160,7 @@ static int vkms_prepare_fb(struct drm_plane *plane, > if (ret) > DRM_ERROR("vmap failed: %d\n", ret); > = > - return drm_gem_fb_prepare_fb(plane, state); > + return drm_gem_prepare_fb(plane, state); > } > = > static void vkms_cleanup_fb(struct drm_plane *plane, > diff --git a/drivers/gpu/drm/xen/xen_drm_front_kms.c b/drivers/gpu/drm/xe= n/xen_drm_front_kms.c > index ef11b1e4de39..371202ebe900 100644 > --- a/drivers/gpu/drm/xen/xen_drm_front_kms.c > +++ b/drivers/gpu/drm/xen/xen_drm_front_kms.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -301,7 +302,7 @@ static const struct drm_simple_display_pipe_funcs dis= play_funcs =3D { > .mode_valid =3D display_mode_valid, > .enable =3D display_enable, > .disable =3D display_disable, > - .prepare_fb =3D drm_gem_fb_simple_display_pipe_prepare_fb, > + .prepare_fb =3D drm_gem_simple_display_pipe_prepare_fb, > .check =3D display_check, > .update =3D display_update, > }; > diff --git a/include/drm/drm_gem_atomic_helper.h b/include/drm/drm_gem_at= omic_helper.h > index 08b96ccea325..91e73d23fea8 100644 > --- a/include/drm/drm_gem_atomic_helper.h > +++ b/include/drm/drm_gem_atomic_helper.h > @@ -9,6 +9,14 @@ > = > struct drm_simple_display_pipe; > = > +/* > + * Plane Helpers > + */ > + > +int drm_gem_prepare_fb(struct drm_plane *plane, struct drm_plane_state *= state); > +int drm_gem_simple_display_pipe_prepare_fb(struct drm_simple_display_pip= e *pipe, > + struct drm_plane_state *plane_state); > + > /* > * Helpers for planes with shadow buffers > */ > diff --git a/include/drm/drm_gem_framebuffer_helper.h b/include/drm/drm_g= em_framebuffer_helper.h > index 6b013154911d..495d174d9989 100644 > --- a/include/drm/drm_gem_framebuffer_helper.h > +++ b/include/drm/drm_gem_framebuffer_helper.h > @@ -9,9 +9,11 @@ struct drm_framebuffer; > struct drm_framebuffer_funcs; > struct drm_gem_object; > struct drm_mode_fb_cmd2; > +#if 0 > struct drm_plane; > struct drm_plane_state; > struct drm_simple_display_pipe; > +#endif > = > #define AFBC_VENDOR_AND_TYPE_MASK GENMASK_ULL(63, 52) > = > @@ -44,8 +46,4 @@ int drm_gem_fb_afbc_init(struct drm_device *dev, > const struct drm_mode_fb_cmd2 *mode_cmd, > struct drm_afbc_framebuffer *afbc_fb); > = > -int drm_gem_fb_prepare_fb(struct drm_plane *plane, > - struct drm_plane_state *state); > -int drm_gem_fb_simple_display_pipe_prepare_fb(struct drm_simple_display_= pipe *pipe, > - struct drm_plane_state *plane_state); > #endif > diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_m= odeset_helper_vtables.h > index eb706342861d..8d41d3734153 100644 > --- a/include/drm/drm_modeset_helper_vtables.h > +++ b/include/drm/drm_modeset_helper_vtables.h > @@ -1179,7 +1179,7 @@ struct drm_plane_helper_funcs { > * members in the plane structure. > * > * Drivers which always have their buffers pinned should use > - * drm_gem_fb_prepare_fb() for this hook. > + * drm_gem_prepare_fb() for this hook. > * > * The helpers will call @cleanup_fb with matching arguments for every > * successful call to this hook. > diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h > index 95ab14a4336a..be08b6b1fde0 100644 > --- a/include/drm/drm_plane.h > +++ b/include/drm/drm_plane.h > @@ -79,8 +79,8 @@ struct drm_plane_state { > * preserved. > * > * Drivers should store any implicit fence in this from their > - * &drm_plane_helper_funcs.prepare_fb callback. See drm_gem_fb_prepare_= fb() > - * and drm_gem_fb_simple_display_pipe_prepare_fb() for suitable helpers. > + * &drm_plane_helper_funcs.prepare_fb callback. See drm_gem_prepare_fb() > + * and drm_gem_simple_display_pipe_prepare_fb() for suitable helpers. > */ > struct dma_fence *fence; > = > diff --git a/include/drm/drm_simple_kms_helper.h b/include/drm/drm_simple= _kms_helper.h > index 40b34573249f..ef9944e9c5fc 100644 > --- a/include/drm/drm_simple_kms_helper.h > +++ b/include/drm/drm_simple_kms_helper.h > @@ -117,7 +117,7 @@ struct drm_simple_display_pipe_funcs { > * more details. > * > * Drivers which always have their buffers pinned should use > - * drm_gem_fb_simple_display_pipe_prepare_fb() for this hook. > + * drm_gem_simple_display_pipe_prepare_fb() for this hook. > */ > int (*prepare_fb)(struct drm_simple_display_pipe *pipe, > struct drm_plane_state *plane_state); > -- = > 2.30.0 > = -- = Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip