drm/virtio: Drop deprecated load/unload initialization
Subsystems (4)
PATCH 1/1 drm/virtio: Drop deprecated load/unload initialization
Move the code around so the driver is probed the bus .probe and removed from the bus .remove callbacks. This commit is just a cleanup and shouldn't affect functionality.
--- drivers/gpu/drm/virtio/Makefile | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 3 +- drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 103 ----------------------- drivers/gpu/drm/virtio/virtgpu_drv.c | 79 ++++++++++++++++- drivers/gpu/drm/virtio/virtgpu_drv.h | 9 +- drivers/gpu/drm/virtio/virtgpu_kms.c | 9 +- 6 files changed, 83 insertions(+), 122 deletions(-) delete mode 100644 drivers/gpu/drm/virtio/virtgpu_drm_bus.c
drivers/gpu/drm/virtio/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. -virtio-gpu-y := virtgpu_drv.o virtgpu_kms.o virtgpu_drm_bus.o virtgpu_gem.o \ +virtio-gpu-y := virtgpu_drv.o virtgpu_kms.o virtgpu_gem.o \ virtgpu_fb.o virtgpu_display.o virtgpu_vq.o virtgpu_ttm.o \ virtgpu_fence.o virtgpu_object.o virtgpu_debugfs.o virtgpu_plane.o \ virtgpu_ioctl.o virtgpu_prime.o
drivers/gpu/drm/virtio/virtgpu_display.c +1 -2
@@ -358,7 +358,7 @@ static const struct drm_mode_config_funcs virtio_gpu_mode_funcs = { .atomic_commit = drm_atomic_helper_commit, }; -int virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev) +void virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev) {int i;
@@ -377,7 +377,6 @@ int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)vgdev_output_init (vgdev, i);drm_mode_config_reset (vgdev->ddev); -return 0 ; }void virtio_gpu_modeset_fini (struct virtio_gpu_device *vgdev)
drivers/gpu/drm/virtio/virtgpu_drm_bus.c deleted +0 -103
103 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_drv.c +75 -4
109 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_drv.h +3 -6
@@ -50,9 +50,6 @@#define DRIVER_MINOR 1#define DRIVER_PATCHLEVEL 0 -/* virtgpu_drm_bus.c */ -int drm_virtio_init (struct drm_driver *driver,struct virtio_device *vdev); -struct virtio_gpu_object_params {uint32_t format;uint32_t width;
@@ -227,8 +224,8 @@ struct virtio_gpu_fpriv {extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS ];/* virtio_kms.c */ -int virtio_gpu_driver_load (struct drm_device *dev,unsigned long flags); -void virtio_gpu_driver_unload (struct drm_device *dev); +int virtio_gpu_init (struct drm_device *dev); +void virtio_gpu_deinit (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);
@@ -336,7 +333,7 @@ int virtio_gpu_framebuffer_init(struct drm_device *dev,struct virtio_gpu_framebuffer *vgfb, const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object *obj); -int virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev); +void virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev);void virtio_gpu_modeset_fini (struct virtio_gpu_device *vgdev);/* virtio_gpu_plane.c */
drivers/gpu/drm/virtio/virtgpu_kms.c +3 -6
@@ -106,7 +106,7 @@ static void virtio_gpu_get_capsets(struct virtio_gpu_device *vgdev, vgdev->num_capsets = num_capsets; } -int virtio_gpu_driver_load (struct drm_device *dev,unsigned long flags) +int virtio_gpu_init (struct drm_device *dev) {static vq_callback_t *callbacks[] = { virtio_gpu_ctrl_ack, virtio_gpu_cursor_ack
@@ -193,9 +193,7 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags) num_capsets, &num_capsets);DRM_INFO ("number of cap sets: %d\n" , num_capsets); - ret =virtio_gpu_modeset_init (vgdev); -if (ret) - goto err_modeset; +virtio_gpu_modeset_init (vgdev);virtio_device_ready (vgdev->vdev); vgdev->vqs_ready = true;
@@ -209,7 +207,6 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags) 5 * HZ);return 0 ; -err_modeset: err_scanouts:virtio_gpu_ttm_fini (vgdev); err_ttm:
@@ -231,7 +228,7 @@ static void virtio_gpu_cleanup_cap_cache(struct virtio_gpu_device *vgdev) } } -void virtio_gpu_driver_unload (struct drm_device *dev) +void virtio_gpu_deinit (struct drm_device *dev) {struct virtio_gpu_device *vgdev = dev->dev_private;
Signature · 6 lines
2.20.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerQuoted 4 lines · Ezequiel Garcia
Move the code around so the driver is probed the bus .probe and removed from the bus .remove callbacks. This commit is just a cleanup and shouldn't affect functionality.
Doesn't apply cleanly to drm-misc-next, and git can't find the parent sha (for 3way merge) either.
Can you rebase and resend?
thanks,
Gerd
Gerd Hoffmann
maintainerQuoted 4 lines · Ezequiel Garcia
Move the code around so the driver is probed the bus .probe and removed from the bus .remove callbacks. This commit is just a cleanup and shouldn't affect functionality.
Doesn't apply cleanly to drm-misc-next, and git can't find the parent sha (for 3way merge) either.
Can you rebase and resend?
thanks,
Gerd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 11 lines · Gerd Hoffmann
Quoted 4 lines · Ezequiel Garcia
Move the code around so the driver is probed the bus .probe and removed from the bus .remove callbacks. This commit is just a cleanup and shouldn't affect functionality.
Doesn't apply cleanly to drm-misc-next, and git can't find the parent sha (for 3way merge) either.
Can you rebase and resend?
I think I was basing it on top of your virtio series.
I'll send a v2 based on top of drm-misc-next.
Thanks,
Ezequiel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/1 drm/virtio: Drop deprecated load/unload initialization
In reply to Ezequiel GarciaMove the code around so the driver is probed the bus .probe and removed from the bus .remove callbacks. This commit is just a cleanup and shouldn't affect functionality.
---
v2: rebased on drm-misc-next
drivers/gpu/drm/virtio/Makefile | 2 +- drivers/gpu/drm/virtio/virtgpu_display.c | 3 +- drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 103 ----------------------- drivers/gpu/drm/virtio/virtgpu_drv.c | 79 ++++++++++++++++- drivers/gpu/drm/virtio/virtgpu_drv.h | 9 +- drivers/gpu/drm/virtio/virtgpu_kms.c | 9 +- 6 files changed, 83 insertions(+), 122 deletions(-) delete mode 100644 drivers/gpu/drm/virtio/virtgpu_drm_bus.c
drivers/gpu/drm/virtio/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. -virtio-gpu-y := virtgpu_drv.o virtgpu_kms.o virtgpu_drm_bus.o virtgpu_gem.o \ +virtio-gpu-y := virtgpu_drv.o virtgpu_kms.o virtgpu_gem.o \ virtgpu_fb.o virtgpu_display.o virtgpu_vq.o virtgpu_ttm.o \ virtgpu_fence.o virtgpu_object.o virtgpu_debugfs.o virtgpu_plane.o \ virtgpu_ioctl.o virtgpu_prime.o
drivers/gpu/drm/virtio/virtgpu_display.c +1 -2
@@ -358,7 +358,7 @@ static const struct drm_mode_config_funcs virtio_gpu_mode_funcs = { .atomic_commit = drm_atomic_helper_commit, }; -int virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev) +void virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev) {int i;
@@ -377,7 +377,6 @@ int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev)vgdev_output_init (vgdev, i);drm_mode_config_reset (vgdev->ddev); -return 0 ; }void virtio_gpu_modeset_fini (struct virtio_gpu_device *vgdev)
drivers/gpu/drm/virtio/virtgpu_drm_bus.c deleted +0 -103
103 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_drv.c +75 -4
109 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_drv.h +3 -6
@@ -50,9 +50,6 @@#define DRIVER_MINOR 1#define DRIVER_PATCHLEVEL 0 -/* virtgpu_drm_bus.c */ -int drm_virtio_init (struct drm_driver *driver,struct virtio_device *vdev); -struct virtio_gpu_object {struct drm_gem_object gem_base;uint32_t hw_res_handle;
@@ -209,8 +206,8 @@ struct virtio_gpu_fpriv {extern struct drm_ioctl_desc virtio_gpu_ioctls[DRM_VIRTIO_NUM_IOCTLS ];/* virtio_kms.c */ -int virtio_gpu_driver_load (struct drm_device *dev,unsigned long flags); -void virtio_gpu_driver_unload (struct drm_device *dev); +int virtio_gpu_init (struct drm_device *dev); +void virtio_gpu_deinit (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);
@@ -320,7 +317,7 @@ int virtio_gpu_framebuffer_init(struct drm_device *dev,struct virtio_gpu_framebuffer *vgfb, const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object *obj); -int virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev); +void virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev);void virtio_gpu_modeset_fini (struct virtio_gpu_device *vgdev);/* virtio_gpu_plane.c */
drivers/gpu/drm/virtio/virtgpu_kms.c +3 -6
@@ -106,7 +106,7 @@ static void virtio_gpu_get_capsets(struct virtio_gpu_device *vgdev, vgdev->num_capsets = num_capsets; } -int virtio_gpu_driver_load (struct drm_device *dev,unsigned long flags) +int virtio_gpu_init (struct drm_device *dev) {static vq_callback_t *callbacks[] = { virtio_gpu_ctrl_ack, virtio_gpu_cursor_ack
@@ -193,9 +193,7 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags) num_capsets, &num_capsets);DRM_INFO ("number of cap sets: %d\n" , num_capsets); - ret =virtio_gpu_modeset_init (vgdev); -if (ret) - goto err_modeset; +virtio_gpu_modeset_init (vgdev);virtio_device_ready (vgdev->vdev); vgdev->vqs_ready = true;
@@ -209,7 +207,6 @@ int virtio_gpu_driver_load(struct drm_device *dev, unsigned long flags) 5 * HZ);return 0 ; -err_modeset: err_scanouts:virtio_gpu_ttm_fini (vgdev); err_ttm:
@@ -231,7 +228,7 @@ static void virtio_gpu_cleanup_cap_cache(struct virtio_gpu_device *vgdev) } } -void virtio_gpu_driver_unload (struct drm_device *dev) +void virtio_gpu_deinit (struct drm_device *dev) {struct virtio_gpu_device *vgdev = dev->dev_private;
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerQuoted 4 lines · Ezequiel Garcia
Move the code around so the driver is probed the bus .probe and removed from the bus .remove callbacks. This commit is just a cleanup and shouldn't affect functionality.
That one works.
thanks,
Gerd
Gerd Hoffmann
maintainerQuoted 4 lines · Ezequiel Garcia
Move the code around so the driver is probed the bus .probe and removed from the bus .remove callbacks. This commit is just a cleanup and shouldn't affect functionality.
That one works.
thanks,
Gerd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel