mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
|
From 27c04928300510f13438df4a120f671df6b03321 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
Date: Fri, 25 Jun 2021 17:01:33 +0200
|
||
|
|
Subject: [PATCH 476/634] 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.
|
||
|
|
|
||
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/vc4/vc4_drv.c | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
|
||
|
|
index baa419bc5199..556bf17a6573 100644
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.c
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
|
||
|
|
@@ -273,15 +273,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;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.33.1
|
||
|
|
|