[PATCH 09/28] drm/meson: Use video aperture helpers

[Neil Armstrong]

On 30/09/2024 15:03, Thomas Zimmermann wrote:
> DRM's aperture functions have long been implemented as helpers
> under drivers/video/ for use with fbdev. Avoid the DRM wrappers by
> calling the video functions directly.
> 
> Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
> Cc: Neil Armstrong <neil.armstrong at linaro.org>
> Cc: Kevin Hilman <khilman at baylibre.com>
> Cc: Jerome Brunet <jbrunet at baylibre.com>
> Cc: Martin Blumenstingl <martin.blumenstingl at googlemail.com>
> ---
>   drivers/gpu/drm/meson/meson_drv.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
> index 2f76f48da38d..bbb662d2f184 100644
> --- a/drivers/gpu/drm/meson/meson_drv.c
> +++ b/drivers/gpu/drm/meson/meson_drv.c
> @@ -8,6 +8,7 @@
>    *     Jasper St. Pierre <jstpierre at mecheye.net>
>    */
>   
> +#include <linux/aperture.h>
>   #include <linux/component.h>
>   #include <linux/module.h>
>   #include <linux/of_graph.h>
> @@ -15,7 +16,6 @@
>   #include <linux/platform_device.h>
>   #include <linux/soc/amlogic/meson-canvas.h>
>   
> -#include <drm/drm_aperture.h>
>   #include <drm/drm_atomic_helper.h>
>   #include <drm/drm_client_setup.h>
>   #include <drm/drm_drv.h>
> @@ -279,7 +279,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
>   	 * Remove early framebuffers (ie. simplefb). The framebuffer can be
>   	 * located anywhere in RAM
>   	 */
> -	ret = drm_aperture_remove_framebuffers(&meson_driver);
> +	ret = aperture_remove_all_conflicting_devices(meson_driver.name);
>   	if (ret)
>   		goto free_canvas_vd1_2;
>   

Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>