diff options
author | Maxime Ripard <maxime@cerno.tech> | 2021-12-15 12:51:16 +0300 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2022-01-11 15:16:11 +0300 |
commit | a7e6f3d8a41e6b396bf06ad8f7ea5bca46cb2101 (patch) | |
tree | a00e1665b67c160517fb91f31398bd57a877850d | |
parent | d62b9bee52dc887f9bf7d13cac120b7caf75079e (diff) | |
download | linux-a7e6f3d8a41e6b396bf06ad8f7ea5bca46cb2101.tar.xz |
drm/vc4: Remove conflicting framebuffers before callind bind_all
The bind hooks will modify their controller registers, so simplefb is
going to be unusable anyway. Let's avoid any transient state where it
could still be in the system but no longer functionnal.
Acked-by: Nicolas Saenz Julienne <nsaenz@kernel.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20211215095117.176435-4-maxime@cerno.tech
-rw-r--r-- | drivers/gpu/drm/vc4/vc4_drv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index d3cae84a4c4e..86c61ee120b7 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -251,15 +251,15 @@ static int vc4_drm_bind(struct device *dev) if (ret) return ret; - ret = component_bind_all(dev, drm); + ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver); if (ret) return ret; - ret = vc4_plane_create_additional_planes(drm); + ret = component_bind_all(dev, drm); if (ret) - goto unbind_all; + return ret; - ret = drm_aperture_remove_framebuffers(false, &vc4_drm_driver); + ret = vc4_plane_create_additional_planes(drm); if (ret) goto unbind_all; |