[PATCH 10/13] fbdev: allow apertures == NULL in remove_conflicting_framebuffers()

[Michał Mirosław]

Interpret (otherwise-invalid) NULL apertures argument to mean all-memory
range. This will allow to remove several duplicates of this code from
drivers in following patches.

Signed-off-by: Michał Mirosław <mirq-li...@rere.qmqm.pl>
---
 drivers/video/fbdev/core/fbmem.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 5ea980e5d3b7..927e016487e9 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1780,11 +1780,25 @@ int remove_conflicting_framebuffers(struct 
apertures_struct *a,
                                    const char *name, bool primary)
 {
        int ret;
+       bool do_free = false;
+
+       if (!a) {
+               a = alloc_apertures(1);
+               if (!a)
+                       return -ENOMEM;
+
+               a->ranges[0].base = 0;
+               a->ranges[0].size = ~0;
+               do_free = true;
+       }
 
        mutex_lock(&registration_lock);
        ret = do_remove_conflicting_framebuffers(a, name, primary);
        mutex_unlock(&registration_lock);
 
+       if (do_free)
+               kfree(a);
+
        return ret;
 }
 EXPORT_SYMBOL(remove_conflicting_framebuffers);
-- 
2.11.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel