drm: add release callbacks to qemu drivers.
Subsystems (5)
Gerd Hoffmann
maintainercover drm: add release callbacks to qemu drivers.
Gerd Hoffmann (3):
drm/cirrus: add drm_driver.release callback.
drm/virtio: add drm_driver.release callback.
drm/qxl: add drm_driver.release callback.
Gurchetan Singh (1):
drm/bochs: add drm_driver.release callback.
drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/bochs/bochs_drv.c | 9 +++++++-- drivers/gpu/drm/cirrus/cirrus.c | 17 ++++++++++++----- drivers/gpu/drm/qxl/qxl_drv.c | 21 ++++++++++++++------- drivers/gpu/drm/qxl/qxl_kms.c | 8 ++++---- drivers/gpu/drm/virtio/virtgpu_drv.c | 4 ++++ drivers/gpu/drm/virtio/virtgpu_kms.c | 5 +++++ drivers/gpu/drm/virtio/virtgpu_vq.c | 8 ++++++-- 8 files changed, 53 insertions(+), 20 deletions(-)
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH 1/4 drm/bochs: add drm_driver.release callback.
From: Gurchetan Singh <[email protected]>
Move bochs_unload call from bochs_remove() to the new bochs_release() callback. Also call drm_dev_unregister() first in bochs_remove().
--- drivers/gpu/drm/bochs/bochs_drv.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/bochs/bochs_drv.c +7 -2
@@ -60,6 +60,11 @@ static int bochs_load(struct drm_device *dev)DEFINE_DRM_GEM_FOPS (bochs_fops); +static void bochs_release (struct drm_device *dev) +{ +bochs_unload (dev); +} +static struct drm_driver bochs_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &bochs_fops,
@@ -69,6 +74,7 @@ static struct drm_driver bochs_driver = { .major = 1, .minor = 0, DRM_GEM_VRAM_DRIVER, + .release = bochs_release, };/* ---------------------------------------------------------------------- */
@@ -148,9 +154,8 @@ static void bochs_pci_remove(struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); -drm_atomic_helper_shutdown (dev);drm_dev_unregister (dev); -bochs_unload (dev); +drm_atomic_helper_shutdown (dev);drm_dev_put (dev); }
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 1/4 drm/bochs: add drm_driver.release callback.
In reply to Gerd HoffmannFrom: Gurchetan Singh <[email protected]>
Move bochs_unload call from bochs_remove() to the new bochs_release() callback. Also call drm_dev_unregister() first in bochs_remove().
--- drivers/gpu/drm/bochs/bochs_drv.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/bochs/bochs_drv.c +7 -2
@@ -60,6 +60,11 @@ static int bochs_load(struct drm_device *dev)DEFINE_DRM_GEM_FOPS (bochs_fops); +static void bochs_release (struct drm_device *dev) +{ +bochs_unload (dev); +} +static struct drm_driver bochs_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &bochs_fops,
@@ -69,6 +74,7 @@ static struct drm_driver bochs_driver = { .major = 1, .minor = 0, DRM_GEM_VRAM_DRIVER, + .release = bochs_release, };/* ---------------------------------------------------------------------- */
@@ -148,9 +154,8 @@ static void bochs_pci_remove(struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); -drm_atomic_helper_shutdown (dev);drm_dev_unregister (dev); -bochs_unload (dev); +drm_atomic_helper_shutdown (dev);drm_dev_put (dev); }
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 2/4 drm/cirrus: add drm_driver.release callback.
In reply to Gerd HoffmannMove final cleanups from cirrus_pci_remove() to the new callback. Add drm_atomic_helper_shutdown() call to cirrus_pci_remove().
--- drivers/gpu/drm/cirrus/cirrus.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/gpu/drm/cirrus/cirrus.c +12 -5
@@ -510,6 +510,16 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus)/* ------------------------------------------------------------------ */ +static void cirrus_release (struct drm_device *dev) +{ +struct cirrus_device *cirrus = dev->dev_private; + +drm_mode_config_cleanup (dev); +iounmap (cirrus->mmio); +iounmap (cirrus->vram); +kfree (cirrus); +} +DEFINE_DRM_GEM_FOPS (cirrus_fops);static struct drm_driver cirrus_driver = {
@@ -523,6 +533,7 @@ static struct drm_driver cirrus_driver = { .fops = &cirrus_fops,DRM_GEM_SHMEM_DRIVER_OPS , + .release = cirrus_release, }; static int cirrus_pci_probe(struct pci_dev *pdev,
@@ -604,14 +615,10 @@ static int cirrus_pci_probe(struct pci_dev *pdev,static void cirrus_pci_remove (struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); -struct cirrus_device *cirrus = dev->dev_private;drm_dev_unregister (dev); -drm_mode_config_cleanup (dev); -iounmap (cirrus->mmio); -iounmap (cirrus->vram); +drm_atomic_helper_shutdown (dev);drm_dev_put (dev); -kfree (cirrus);pci_release_regions (pdev); }
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 2/4 drm/cirrus: add drm_driver.release callback.
In reply to Gerd HoffmannMove final cleanups from cirrus_pci_remove() to the new callback. Add drm_atomic_helper_shutdown() call to cirrus_pci_remove().
--- drivers/gpu/drm/cirrus/cirrus.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/gpu/drm/cirrus/cirrus.c +12 -5
@@ -510,6 +510,16 @@ static void cirrus_mode_config_init(struct cirrus_device *cirrus)/* ------------------------------------------------------------------ */ +static void cirrus_release (struct drm_device *dev) +{ +struct cirrus_device *cirrus = dev->dev_private; + +drm_mode_config_cleanup (dev); +iounmap (cirrus->mmio); +iounmap (cirrus->vram); +kfree (cirrus); +} +DEFINE_DRM_GEM_FOPS (cirrus_fops);static struct drm_driver cirrus_driver = {
@@ -523,6 +533,7 @@ static struct drm_driver cirrus_driver = { .fops = &cirrus_fops,DRM_GEM_SHMEM_DRIVER_OPS , + .release = cirrus_release, }; static int cirrus_pci_probe(struct pci_dev *pdev,
@@ -604,14 +615,10 @@ static int cirrus_pci_probe(struct pci_dev *pdev,static void cirrus_pci_remove (struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); -struct cirrus_device *cirrus = dev->dev_private;drm_dev_unregister (dev); -drm_mode_config_cleanup (dev); -iounmap (cirrus->mmio); -iounmap (cirrus->vram); +drm_atomic_helper_shutdown (dev);drm_dev_put (dev); -kfree (cirrus);pci_release_regions (pdev); }
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 3/4 drm/virtio: add drm_driver.release callback.
In reply to Gerd HoffmannSplit virtio_gpu_deinit(), move the drm shutdown and release to virtio_gpu_release(). Also free vbufs in case we can't queue them.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/virtio/virtgpu_drv.c | 4 ++++ drivers/gpu/drm/virtio/virtgpu_kms.c | 5 +++++ drivers/gpu/drm/virtio/virtgpu_vq.c | 8 ++++++-- 4 files changed, 16 insertions(+), 2 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +1 -0
@@ -216,6 +216,7 @@ extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS];/* virtio_kms.c */ int virtio_gpu_init (struct drm_device *dev);void virtio_gpu_deinit (struct drm_device *dev); +void virtio_gpu_release (struct drm_device *dev);int virtio_gpu_driver_open (struct drm_device *dev,struct drm_file *file);void virtio_gpu_driver_postclose (struct drm_device *dev,struct drm_file *file);
drivers/gpu/drm/virtio/virtgpu_drv.c +4 -0
@@ -31,6 +31,7 @@#include <linux/pci.h> #include <drm/drm.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> #include <drm/drm_file.h>
@@ -136,6 +137,7 @@ static void virtio_gpu_remove(struct virtio_device *vdev)struct drm_device *dev = vdev->priv;drm_dev_unregister (dev); +drm_atomic_helper_shutdown (dev);virtio_gpu_deinit (dev);drm_dev_put (dev); }
@@ -214,4 +216,6 @@ static struct drm_driver driver = { .major = DRIVER_MAJOR, .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, + + .release = virtio_gpu_release, };
drivers/gpu/drm/virtio/virtgpu_kms.c +5 -0
@@ -237,6 +237,11 @@ void virtio_gpu_deinit(struct drm_device *dev)flush_work (&vgdev->config_changed_work); vgdev->vdev->config->reset (vgdev->vdev); vgdev->vdev->config->del_vqs (vgdev->vdev); +} + +void virtio_gpu_release (struct drm_device *dev) +{ +struct virtio_gpu_device *vgdev = dev->dev_private;virtio_gpu_modeset_fini (vgdev);virtio_gpu_free_vbufs (vgdev);
drivers/gpu/drm/virtio/virtgpu_vq.c +6 -2
@@ -319,8 +319,10 @@ static bool virtio_gpu_queue_ctrl_buffer_locked(struct virtio_gpu_device *vgdev,bool notify = false;int ret; -if (!vgdev->vqs_ready) +if (!vgdev->vqs_ready) { +free_vbuf (vgdev, vbuf);return notify; + }sg_init_one (&vcmd, vbuf->buf, vbuf->size); sgs[outcnt + incnt] = &vcmd;
@@ -447,8 +449,10 @@ static void virtio_gpu_queue_cursor(struct virtio_gpu_device *vgdev,int ret;int outcnt; -if (!vgdev->vqs_ready) +if (!vgdev->vqs_ready) { +free_vbuf (vgdev, vbuf);return ; + }sg_init_one (&ccmd, vbuf->buf, vbuf->size); sgs[0 ] = &ccmd;
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 3/4 drm/virtio: add drm_driver.release callback.
In reply to Gerd HoffmannSplit virtio_gpu_deinit(), move the drm shutdown and release to virtio_gpu_release(). Also free vbufs in case we can't queue them.
--- drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + drivers/gpu/drm/virtio/virtgpu_drv.c | 4 ++++ drivers/gpu/drm/virtio/virtgpu_kms.c | 5 +++++ drivers/gpu/drm/virtio/virtgpu_vq.c | 8 ++++++-- 4 files changed, 16 insertions(+), 2 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.h +1 -0
@@ -216,6 +216,7 @@ extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS];/* virtio_kms.c */ int virtio_gpu_init (struct drm_device *dev);void virtio_gpu_deinit (struct drm_device *dev); +void virtio_gpu_release (struct drm_device *dev);int virtio_gpu_driver_open (struct drm_device *dev,struct drm_file *file);void virtio_gpu_driver_postclose (struct drm_device *dev,struct drm_file *file);
drivers/gpu/drm/virtio/virtgpu_drv.c +4 -0
@@ -31,6 +31,7 @@#include <linux/pci.h> #include <drm/drm.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> #include <drm/drm_file.h>
@@ -136,6 +137,7 @@ static void virtio_gpu_remove(struct virtio_device *vdev)struct drm_device *dev = vdev->priv;drm_dev_unregister (dev); +drm_atomic_helper_shutdown (dev);virtio_gpu_deinit (dev);drm_dev_put (dev); }
@@ -214,4 +216,6 @@ static struct drm_driver driver = { .major = DRIVER_MAJOR, .minor = DRIVER_MINOR, .patchlevel = DRIVER_PATCHLEVEL, + + .release = virtio_gpu_release, };
drivers/gpu/drm/virtio/virtgpu_kms.c +5 -0
@@ -237,6 +237,11 @@ void virtio_gpu_deinit(struct drm_device *dev)flush_work (&vgdev->config_changed_work); vgdev->vdev->config->reset (vgdev->vdev); vgdev->vdev->config->del_vqs (vgdev->vdev); +} + +void virtio_gpu_release (struct drm_device *dev) +{ +struct virtio_gpu_device *vgdev = dev->dev_private;virtio_gpu_modeset_fini (vgdev);virtio_gpu_free_vbufs (vgdev);
drivers/gpu/drm/virtio/virtgpu_vq.c +6 -2
@@ -319,8 +319,10 @@ static bool virtio_gpu_queue_ctrl_buffer_locked(struct virtio_gpu_device *vgdev,bool notify = false;int ret; -if (!vgdev->vqs_ready) +if (!vgdev->vqs_ready) { +free_vbuf (vgdev, vbuf);return notify; + }sg_init_one (&vcmd, vbuf->buf, vbuf->size); sgs[outcnt + incnt] = &vcmd;
@@ -447,8 +449,10 @@ static void virtio_gpu_queue_cursor(struct virtio_gpu_device *vgdev,int ret;int outcnt; -if (!vgdev->vqs_ready) +if (!vgdev->vqs_ready) { +free_vbuf (vgdev, vbuf);return ; + }sg_init_one (&ccmd, vbuf->buf, vbuf->size); sgs[0 ] = &ccmd;
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH 4/4 drm/qxl: add drm_driver.release callback.
In reply to Gerd HoffmannMove final cleanups to qxl_drm_release() callback. Add drm_atomic_helper_shutdown() call to qxl_pci_remove().
Reorder calls in qxl_device_fini(). Cleaning up gem & ttm might trigger qxl commands, so we should do that before releaseing command rings.
--- drivers/gpu/drm/qxl/qxl_drv.c | 21 ++++++++++++++------- drivers/gpu/drm/qxl/qxl_kms.c | 8 ++++---- 2 files changed, 18 insertions(+), 11 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.c +14 -7
@@ -34,6 +34,7 @@#include <linux/pci.h> #include <drm/drm.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> #include <drm/drm_file.h> #include <drm/drm_modeset_helper.h>
@@ -132,21 +133,25 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)return ret; } +static void qxl_drm_release (struct drm_device *dev) +{ +struct qxl_device *qdev = dev->dev_private; + +qxl_modeset_fini (qdev); +qxl_device_fini (qdev); + dev->dev_private =NULL ; +kfree (qdev); +} +static void qxl_pci_remove (struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); -struct qxl_device *qdev = dev->dev_private;drm_dev_unregister (dev); - -qxl_modeset_fini (qdev); -qxl_device_fini (qdev); +drm_atomic_helper_shutdown (dev);if (is_vga (pdev))vga_put (pdev,VGA_RSRC_LEGACY_IO ); - - dev->dev_private =NULL ; -kfree (qdev);drm_dev_put (dev); }
@@ -279,6 +284,8 @@ static struct drm_driver qxl_driver = { .major = 0, .minor = 1, .patchlevel = 0, + + .release = qxl_drm_release, };static int __init qxl_init (void )
drivers/gpu/drm/qxl/qxl_kms.c +4 -4
@@ -299,12 +299,12 @@ void qxl_device_fini(struct qxl_device *qdev) {qxl_bo_unref (&qdev->current_release_bo[0 ]);qxl_bo_unref (&qdev->current_release_bo[1 ]); -flush_work (&qdev->gc_work); -qxl_ring_free (qdev->command_ring); -qxl_ring_free (qdev->cursor_ring); -qxl_ring_free (qdev->release_ring);qxl_gem_fini (qdev);qxl_bo_fini (qdev); +flush_work (&qdev->gc_work); +qxl_ring_free (qdev->command_ring); +qxl_ring_free (qdev->cursor_ring); +qxl_ring_free (qdev->release_ring);io_mapping_free (qdev->surface_mapping);io_mapping_free (qdev->vram_mapping);iounmap (qdev->ram_header);
Signature · 1 line
2.18.1
Re: [Spice-devel] [PATCH 4/4] drm/qxl: add drm_driver.release callback.
Quoted 2 lines
Move final cleanups to
qxl_drm_release()callback.
Can you explain in the commit why this is better or preferable?
Quoted 1 line
Add
drm_atomic_helper_shutdown()call toqxl_pci_remove().
I suppose this is to replace the former manual cleanup calls, which were moved to qxl_drm_release, I think this could be added in the commit message ("why"), I don't see much value in describing "how" this was done.
Quoted 4 lines
Reorder calls in
qxl_device_fini(). Cleaning up gem & ttm might trigger qxl commands, so we should do that before releaseing command rings.
Typo: releaseing -> releasing
Why not putting this in a separate commit? Was this behaviour changed? It does not seem so to me.
Quoted 73 lines
Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/qxl/qxl_drv.c | 21 ++++++++++++++------- drivers/gpu/drm/qxl/qxl_kms.c | 8 ++++---- 2 files changed, 18 insertions(+), 11 deletions(-)drivers/gpu/drm/qxl/qxl_drv.c +14
-7@@ -34,6 +34,7 @@#include <linux/pci.h> #include <drm/drm.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> #include <drm/drm_file.h> #include <drm/drm_modeset_helper.h> @@ -132,21 +133,25 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)return ret; } +static void qxl_drm_release (struct drm_device *dev) +{ +struct qxl_device *qdev = dev->dev_private; + +qxl_modeset_fini (qdev); +qxl_device_fini (qdev); + dev->dev_private =NULL ; +kfree (qdev); +} +static void qxl_pci_remove (struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); -struct qxl_device *qdev = dev->dev_private;drm_dev_unregister (dev); - -qxl_modeset_fini (qdev); -qxl_device_fini (qdev); +drm_atomic_helper_shutdown (dev);if (is_vga (pdev))vga_put (pdev,VGA_RSRC_LEGACY_IO ); - - dev->dev_private =NULL ; -kfree (qdev);drm_dev_put (dev); }@@ -279,6 +284,8 @@ static struct drm_driver qxl_driver = { .major = 0, .minor = 1, .patchlevel = 0, + + .release = qxl_drm_release, };static int __init qxl_init (void )drivers/gpu/drm/qxl/qxl_kms.c +0
-3@@ -299,12 +299,12 @@ void qxl_device_fini(struct qxl_device *qdev) {qxl_bo_unref (&qdev->current_release_bo[0 ]);qxl_bo_unref (&qdev->current_release_bo[1 ]); -flush_work (&qdev->gc_work); -qxl_ring_free (qdev->command_ring); -qxl_ring_free (qdev->cursor_ring);
drivers/gpu/drm/qxl/qxl_kms.c void qxl_device_fini(struct qxl_device *qdev) · line 310
Quoted 10 lines
drivers/gpu/drm/qxl/qxl_kms.c +4
-1-qxl_ring_free (qdev->release_ring);qxl_gem_fini (qdev);qxl_bo_fini (qdev); +flush_work (&qdev->gc_work); +qxl_ring_free (qdev->command_ring); +qxl_ring_free (qdev->cursor_ring); +qxl_ring_free (qdev->release_ring);io_mapping_free (qdev->surface_mapping);io_mapping_free (qdev->vram_mapping);iounmap (qdev->ram_header);
Frediano
Re: [Spice-devel] [PATCH 4/4] drm/qxl: add drm_driver.release callback.
In reply to Gerd HoffmannQuoted 2 lines
Move final cleanups to
qxl_drm_release()callback.
Can you explain in the commit why this is better or preferable?
Quoted 1 line
Add
drm_atomic_helper_shutdown()call toqxl_pci_remove().
I suppose this is to replace the former manual cleanup calls, which were moved to qxl_drm_release, I think this could be added in the commit message ("why"), I don't see much value in describing "how" this was done.
Quoted 4 lines
Reorder calls in
qxl_device_fini(). Cleaning up gem & ttm might trigger qxl commands, so we should do that before releaseing command rings.
Typo: releaseing -> releasing
Why not putting this in a separate commit? Was this behaviour changed? It does not seem so to me.
Quoted 73 lines
Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/qxl/qxl_drv.c | 21 ++++++++++++++------- drivers/gpu/drm/qxl/qxl_kms.c | 8 ++++---- 2 files changed, 18 insertions(+), 11 deletions(-)drivers/gpu/drm/qxl/qxl_drv.c +14
-7@@ -34,6 +34,7 @@#include <linux/pci.h> #include <drm/drm.h> +#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> #include <drm/drm_file.h> #include <drm/drm_modeset_helper.h> @@ -132,21 +133,25 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)return ret; } +static void qxl_drm_release (struct drm_device *dev) +{ +struct qxl_device *qdev = dev->dev_private; + +qxl_modeset_fini (qdev); +qxl_device_fini (qdev); + dev->dev_private =NULL ; +kfree (qdev); +} +static void qxl_pci_remove (struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); -struct qxl_device *qdev = dev->dev_private;drm_dev_unregister (dev); - -qxl_modeset_fini (qdev); -qxl_device_fini (qdev); +drm_atomic_helper_shutdown (dev);if (is_vga (pdev))vga_put (pdev,VGA_RSRC_LEGACY_IO ); - - dev->dev_private =NULL ; -kfree (qdev);drm_dev_put (dev); }@@ -279,6 +284,8 @@ static struct drm_driver qxl_driver = { .major = 0, .minor = 1, .patchlevel = 0, + + .release = qxl_drm_release, };static int __init qxl_init (void )drivers/gpu/drm/qxl/qxl_kms.c +0
-3@@ -299,12 +299,12 @@ void qxl_device_fini(struct qxl_device *qdev) {qxl_bo_unref (&qdev->current_release_bo[0 ]);qxl_bo_unref (&qdev->current_release_bo[1 ]); -flush_work (&qdev->gc_work); -qxl_ring_free (qdev->command_ring); -qxl_ring_free (qdev->cursor_ring);
drivers/gpu/drm/qxl/qxl_kms.c void qxl_device_fini(struct qxl_device *qdev) · line 310
Quoted 10 lines
drivers/gpu/drm/qxl/qxl_kms.c +4
-1-qxl_ring_free (qdev->release_ring);qxl_gem_fini (qdev);qxl_bo_fini (qdev); +flush_work (&qdev->gc_work); +qxl_ring_free (qdev->command_ring); +qxl_ring_free (qdev->cursor_ring); +qxl_ring_free (qdev->release_ring);io_mapping_free (qdev->surface_mapping);io_mapping_free (qdev->vram_mapping);iounmap (qdev->ram_header);
Frediano
Gerd Hoffmann
maintainerRe: [Spice-devel] [PATCH 4/4] drm/qxl: add drm_driver.release callback.
Quoted 4 lines · Frediano Ziglio
Quoted 2 lines
Move final cleanups to
qxl_drm_release()callback.Can you explain in the commit why this is better or preferable?
It gets called when the drm device refcount goes down to zero. It's needed for a proper cleanup in the correct order.
Quoted 6 lines
Quoted 1 line
Add
drm_atomic_helper_shutdown()call toqxl_pci_remove().I suppose this is to replace the former manual cleanup calls, which were moved to
qxl_drm_release, I think this could be added in the commit message ("why"), I don't see much value in describing "how" this was done.
The call is part of the shutdown sequence for atomic drm drivers and wasn't present in qxl for some reason.
Quoted 7 lines
Quoted 3 lines
Reorder calls in
qxl_device_fini(). Cleaning up gem & ttm might trigger qxl commands, so we should do that before releaseing command rings.Typo: releaseing -> releasing
Why not putting this in a separate commit? Was this behaviour changed? It does not seem so to me.
Yes, I can make that a separate commit.
No, behavior didn't change. qxl_device_fini() is simply broken without this.
cheers,
Gerd
Gerd Hoffmann
maintainerRe: [Spice-devel] [PATCH 4/4] drm/qxl: add drm_driver.release callback.
In reply to Frediano ZiglioQuoted 4 lines · Frediano Ziglio
Quoted 2 lines
Move final cleanups to
qxl_drm_release()callback.Can you explain in the commit why this is better or preferable?
It gets called when the drm device refcount goes down to zero. It's needed for a proper cleanup in the correct order.
Quoted 6 lines
Quoted 1 line
Add
drm_atomic_helper_shutdown()call toqxl_pci_remove().I suppose this is to replace the former manual cleanup calls, which were moved to
qxl_drm_release, I think this could be added in the commit message ("why"), I don't see much value in describing "how" this was done.
The call is part of the shutdown sequence for atomic drm drivers and wasn't present in qxl for some reason.
Quoted 7 lines
Quoted 3 lines
Reorder calls in
qxl_device_fini(). Cleaning up gem & ttm might trigger qxl commands, so we should do that before releaseing command rings.Typo: releaseing -> releasing
Why not putting this in a separate commit? Was this behaviour changed? It does not seem so to me.
Yes, I can make that a separate commit.
No, behavior didn't change. qxl_device_fini() is simply broken without this.
cheers,
Gerd