]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
drm/nouveau/kms/nv04: use vzalloc for nv04_display
authorIlia Mirkin <imirkin@alum.mit.edu>
Sun, 7 Mar 2021 17:48:53 +0000 (12:48 -0500)
committerPaolo Pisati <paolo.pisati@canonical.com>
Fri, 28 Jan 2022 10:03:09 +0000 (11:03 +0100)
BugLink: https://bugs.launchpad.net/bugs/1959376
commit bd6e07e72f37f34535bec7eebc807e5fcfe37b43 upstream.

The struct is giant, and triggers an order-7 allocation (512K). There is
no reason for this to be kmalloc-type memory, so switch to vmalloc. This
should help loading nouveau on low-memory and/or long-running systems.

Reported-by: Nathan E. Egge <unlord@xiph.org>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: stable@vger.kernel.org
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Link: https://gitlab.freedesktop.org/drm/nouveau/-/merge_requests/10
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/gpu/drm/nouveau/dispnv04/disp.c

index 7739f46470d3e1215402e541f55194d6764d34a9..99fee4d8cd3187dc0549f412ff384926f82a10b6 100644 (file)
@@ -205,7 +205,7 @@ nv04_display_destroy(struct drm_device *dev)
        nvif_notify_dtor(&disp->flip);
 
        nouveau_display(dev)->priv = NULL;
-       kfree(disp);
+       vfree(disp);
 
        nvif_object_unmap(&drm->client.device.object);
 }
@@ -223,7 +223,7 @@ nv04_display_create(struct drm_device *dev)
        struct nv04_display *disp;
        int i, ret;
 
-       disp = kzalloc(sizeof(*disp), GFP_KERNEL);
+       disp = vzalloc(sizeof(*disp));
        if (!disp)
                return -ENOMEM;