Unverified Commit c406ad5e authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: Notify the firmware when DRM is in charge 



Once the call to drm_fb_helper_remove_conflicting_framebuffers() has
been made, simplefb has been unregistered and the KMS driver is entirely
in charge of the display.

Thus, we can notify the firmware it can free whatever resource it was
using to maintain simplefb functional.

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20211215095117.176435-5-maxime@cerno.tech
parent a7e6f3d8

drivers/gpu/drm/vc4/vc4_drv.c

+22 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
#include <drm/drm_fb_helper.h>

#include <drm/drm_vblank.h>



#include <soc/bcm2835/raspberrypi-firmware.h>



#include "uapi/drm/vc4_drm.h"



#include "vc4_drv.h"
@@ -215,6 +217,7 @@ static void vc4_match_add_drivers(struct device *dev, 
static int vc4_drm_bind(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	struct rpi_firmware *firmware = NULL;

	struct drm_device *drm;

	struct vc4_dev *vc4;

	struct device_node *node;
@@ -251,10 +254,29 @@ static int vc4_drm_bind(struct device *dev) 
	if (ret)

		return ret;



	node = of_find_compatible_node(NULL, NULL, "raspberrypi,bcm2835-firmware");

	if (node) {

		firmware = rpi_firmware_get(node);

		of_node_put(node);



		if (!firmware)

			return -EPROBE_DEFER;

	}



	ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver);

	if (ret)

		return ret;



	if (firmware) {

		ret = rpi_firmware_property(firmware,

					    RPI_FIRMWARE_NOTIFY_DISPLAY_DONE,

					    NULL, 0);

		if (ret)

			drm_warn(drm, "Couldn't stop firmware display driver: %d\n", ret);



		rpi_firmware_put(firmware);

	}



	ret = component_bind_all(dev, drm);

	if (ret)

		return ret;