drm/virtio: kms: use drm managed resources

Allocate driver structures with drm managed resource allocators in order
to cleanup/simplify the drm driver .release callback.

Signed-off-by: Danilo Krummrich <dakr@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20220714130028.2127858-3-dakr@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c
index 0d1e3eb61bee2b3bf3793718c2c57906fc518404..27b7f14dae89a167d5cdc824888eb0c1caeab14b 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_kms.c
+++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
@@ -28,6 +28,7 @@
 #include <linux/virtio_ring.h>
 
 #include <drm/drm_file.h>
+#include <drm/drm_managed.h>
 
 #include "virtgpu_drv.h"
 
@@ -66,10 +67,11 @@ static void virtio_gpu_get_capsets(struct virtio_gpu_device *vgdev,
 {
        int i, ret;
        bool invalid_capset_id = false;
+       struct drm_device *drm = vgdev->ddev;
 
-       vgdev->capsets = kcalloc(num_capsets,
-                                sizeof(struct virtio_gpu_drv_capset),
-                                GFP_KERNEL);
+       vgdev->capsets = drmm_kcalloc(drm, num_capsets,
+                                     sizeof(struct virtio_gpu_drv_capset),
+                                     GFP_KERNEL);
        if (!vgdev->capsets) {
                DRM_ERROR("failed to allocate cap sets\n");
                return;
@@ -94,7 +96,7 @@ static void virtio_gpu_get_capsets(struct virtio_gpu_device *vgdev,
 
                if (ret == 0 || invalid_capset_id) {
                        spin_lock(&vgdev->display_info_lock);
-                       kfree(vgdev->capsets);
+                       drmm_kfree(drm, vgdev->capsets);
                        vgdev->capsets = NULL;
                        spin_unlock(&vgdev->display_info_lock);
                        return;
@@ -126,7 +128,7 @@ int virtio_gpu_init(struct virtio_device *vdev, struct drm_device *dev)
        if (!virtio_has_feature(vdev, VIRTIO_F_VERSION_1))
                return -ENODEV;
 
-       vgdev = kzalloc(sizeof(struct virtio_gpu_device), GFP_KERNEL);
+       vgdev = drmm_kzalloc(dev, sizeof(struct virtio_gpu_device), GFP_KERNEL);
        if (!vgdev)
                return -ENOMEM;
 
@@ -256,7 +258,6 @@ err_vbufs:
        vgdev->vdev->config->del_vqs(vgdev->vdev);
 err_vqs:
        dev->dev_private = NULL;
-       kfree(vgdev);
        return ret;
 }
 
@@ -295,9 +296,6 @@ void virtio_gpu_release(struct drm_device *dev)
 
        if (vgdev->has_host_visible)
                drm_mm_takedown(&vgdev->host_visible_mm);
-
-       kfree(vgdev->capsets);
-       kfree(vgdev);
 }
 
 int virtio_gpu_driver_open(struct drm_device *dev, struct drm_file *file)