* udl fix + 2 cleanups
@ 2019-04-05 3:17 Dave Airlie
2019-04-05 3:17 ` [PATCH 1/3] drm/udl: add a release method and delay modeset teardown Dave Airlie
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Dave Airlie @ 2019-04-05 3:17 UTC (permalink / raw
To: dri-devel
The first patch is a repost, Daniel already reviewed it, and I'll put
it into fixes soon, the two follow-ups are for -next.
They move udl over to having the drm device embedded in the udl struct
which hopefully will help with future lifetime issues.
Dave.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] drm/udl: add a release method and delay modeset teardown
2019-04-05 3:17 udl fix + 2 cleanups Dave Airlie
@ 2019-04-05 3:17 ` Dave Airlie
2019-04-05 3:17 ` [PATCH 2/3] drm/udl: introduce a macro to convert dev to udl Dave Airlie
2019-04-05 3:17 ` [PATCH 3/3] drm/udl: move to embedding drm device inside udl device Dave Airlie
2 siblings, 0 replies; 5+ messages in thread
From: Dave Airlie @ 2019-04-05 3:17 UTC (permalink / raw
To: dri-devel
From: Dave Airlie <airlied@redhat.com>
If we unplug a udl device, the usb callback with deinit the
mode_config struct, however userspace will still have an open
file descriptor and a framebuffer on that device. When userspace
closes the fd, we'll oops because it'll try and look stuff up
in the object idr which we've destroyed.
This punts destroying the mode objects until release time instead.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
drivers/gpu/drm/udl/udl_drv.c | 1 +
drivers/gpu/drm/udl/udl_drv.h | 1 +
drivers/gpu/drm/udl/udl_main.c | 8 +++++++-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index 22cd2d13e272..ff47f890e6ad 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -52,6 +52,7 @@ static struct drm_driver driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,
.load = udl_driver_load,
.unload = udl_driver_unload,
+ .release = udl_driver_release,
/* gem hooks */
.gem_free_object_unlocked = udl_gem_free_object,
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index e9e9b1ff678e..4ae67d882eae 100644
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -104,6 +104,7 @@ void udl_urb_completion(struct urb *urb);
int udl_driver_load(struct drm_device *dev, unsigned long flags);
void udl_driver_unload(struct drm_device *dev);
+void udl_driver_release(struct drm_device *dev);
int udl_fbdev_init(struct drm_device *dev);
void udl_fbdev_cleanup(struct drm_device *dev);
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 9086d0d1b880..1f8ef34ade24 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -379,6 +379,12 @@ void udl_driver_unload(struct drm_device *dev)
udl_free_urb_list(dev);
udl_fbdev_cleanup(dev);
- udl_modeset_cleanup(dev);
kfree(udl);
}
+
+void udl_driver_release(struct drm_device *dev)
+{
+ udl_modeset_cleanup(dev);
+ drm_dev_fini(dev);
+ kfree(dev);
+}
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] drm/udl: introduce a macro to convert dev to udl.
2019-04-05 3:17 udl fix + 2 cleanups Dave Airlie
2019-04-05 3:17 ` [PATCH 1/3] drm/udl: add a release method and delay modeset teardown Dave Airlie
@ 2019-04-05 3:17 ` Dave Airlie
2019-04-05 3:17 ` [PATCH 3/3] drm/udl: move to embedding drm device inside udl device Dave Airlie
2 siblings, 0 replies; 5+ messages in thread
From: Dave Airlie @ 2019-04-05 3:17 UTC (permalink / raw
To: dri-devel
From: Dave Airlie <airlied@redhat.com>
This just makes it easier to later embed drm into udl.
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
drivers/gpu/drm/udl/udl_drv.h | 2 ++
drivers/gpu/drm/udl/udl_fb.c | 10 +++++-----
drivers/gpu/drm/udl/udl_gem.c | 2 +-
drivers/gpu/drm/udl/udl_main.c | 12 ++++++------
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index 4ae67d882eae..b3e08e876d62 100644
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -71,6 +71,8 @@ struct udl_device {
atomic_t cpu_kcycles_used; /* transpired during pixel processing */
};
+#define to_udl(x) ((x)->dev_private)
+
struct udl_gem_object {
struct drm_gem_object base;
struct page **pages;
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index dd9ffded223b..590323ea261f 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -82,7 +82,7 @@ int udl_handle_damage(struct udl_framebuffer *fb, int x, int y,
int width, int height)
{
struct drm_device *dev = fb->base.dev;
- struct udl_device *udl = dev->dev_private;
+ struct udl_device *udl = to_udl(dev);
int i, ret;
char *cmd;
cycles_t start_cycles, end_cycles;
@@ -210,7 +210,7 @@ static int udl_fb_open(struct fb_info *info, int user)
{
struct udl_fbdev *ufbdev = info->par;
struct drm_device *dev = ufbdev->ufb.base.dev;
- struct udl_device *udl = dev->dev_private;
+ struct udl_device *udl = to_udl(dev);
/* If the USB device is gone, we don't accept new opens */
if (drm_dev_is_unplugged(udl->ddev))
@@ -441,7 +441,7 @@ static void udl_fbdev_destroy(struct drm_device *dev,
int udl_fbdev_init(struct drm_device *dev)
{
- struct udl_device *udl = dev->dev_private;
+ struct udl_device *udl = to_udl(dev);
int bpp_sel = fb_bpp;
struct udl_fbdev *ufbdev;
int ret;
@@ -480,7 +480,7 @@ int udl_fbdev_init(struct drm_device *dev)
void udl_fbdev_cleanup(struct drm_device *dev)
{
- struct udl_device *udl = dev->dev_private;
+ struct udl_device *udl = to_udl(dev);
if (!udl->fbdev)
return;
@@ -491,7 +491,7 @@ void udl_fbdev_cleanup(struct drm_device *dev)
void udl_fbdev_unplug(struct drm_device *dev)
{
- struct udl_device *udl = dev->dev_private;
+ struct udl_device *udl = to_udl(dev);
struct udl_fbdev *ufbdev;
if (!udl->fbdev)
return;
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index bb7b58407039..3b3e17652bb2 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -203,7 +203,7 @@ int udl_gem_mmap(struct drm_file *file, struct drm_device *dev,
{
struct udl_gem_object *gobj;
struct drm_gem_object *obj;
- struct udl_device *udl = dev->dev_private;
+ struct udl_device *udl = to_udl(dev);
int ret = 0;
mutex_lock(&udl->gem_lock);
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 1f8ef34ade24..862c099d7c4c 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -30,7 +30,7 @@
static int udl_parse_vendor_descriptor(struct drm_device *dev,
struct usb_device *usbdev)
{
- struct udl_device *udl = dev->dev_private;
+ struct udl_device *udl = to_udl(dev);
char *desc;
char *buf;
char *desc_end;
@@ -166,7 +166,7 @@ void udl_urb_completion(struct urb *urb)
static void udl_free_urb_list(struct drm_device *dev)
{
- struct udl_device *udl = dev->dev_private;
+ struct udl_device *udl = to_udl(dev);
int count = udl->urbs.count;
struct list_head *node;
struct urb_node *unode;
@@ -199,7 +199,7 @@ static void udl_free_urb_list(struct drm_device *dev)
static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size)
{
- struct udl_device *udl = dev->dev_private;
+ struct udl_device *udl = to_udl(dev);
struct urb *urb;
struct urb_node *unode;
char *buf;
@@ -263,7 +263,7 @@ static int udl_alloc_urb_list(struct drm_device *dev, int count, size_t size)
struct urb *udl_get_urb(struct drm_device *dev)
{
- struct udl_device *udl = dev->dev_private;
+ struct udl_device *udl = to_udl(dev);
int ret = 0;
struct list_head *entry;
struct urb_node *unode;
@@ -296,7 +296,7 @@ struct urb *udl_get_urb(struct drm_device *dev)
int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len)
{
- struct udl_device *udl = dev->dev_private;
+ struct udl_device *udl = to_udl(dev);
int ret;
BUG_ON(len > udl->urbs.size);
@@ -371,7 +371,7 @@ int udl_drop_usb(struct drm_device *dev)
void udl_driver_unload(struct drm_device *dev)
{
- struct udl_device *udl = dev->dev_private;
+ struct udl_device *udl = to_udl(dev);
drm_kms_helper_poll_fini(dev);
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] drm/udl: move to embedding drm device inside udl device.
2019-04-05 3:17 udl fix + 2 cleanups Dave Airlie
2019-04-05 3:17 ` [PATCH 1/3] drm/udl: add a release method and delay modeset teardown Dave Airlie
2019-04-05 3:17 ` [PATCH 2/3] drm/udl: introduce a macro to convert dev to udl Dave Airlie
@ 2019-04-05 3:17 ` Dave Airlie
2019-04-05 13:15 ` Alex Deucher
2 siblings, 1 reply; 5+ messages in thread
From: Dave Airlie @ 2019-04-05 3:17 UTC (permalink / raw
To: dri-devel
From: Dave Airlie <airlied@redhat.com>
This should help with some of the lifetime issues, and move us away
from load/unload.
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
drivers/gpu/drm/udl/udl_drv.c | 56 +++++++++++++++++++++++++++-------
drivers/gpu/drm/udl/udl_drv.h | 9 +++---
drivers/gpu/drm/udl/udl_fb.c | 2 +-
drivers/gpu/drm/udl/udl_main.c | 23 ++------------
4 files changed, 53 insertions(+), 37 deletions(-)
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
index ff47f890e6ad..15c0e3eeaf3b 100644
--- a/drivers/gpu/drm/udl/udl_drv.c
+++ b/drivers/gpu/drm/udl/udl_drv.c
@@ -48,10 +48,16 @@ static const struct file_operations udl_driver_fops = {
.llseek = noop_llseek,
};
+static void udl_driver_release(struct drm_device *dev)
+{
+ udl_fini(dev);
+ udl_modeset_cleanup(dev);
+ drm_dev_fini(dev);
+ kfree(dev);
+}
+
static struct drm_driver driver = {
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,
- .load = udl_driver_load,
- .unload = udl_driver_unload,
.release = udl_driver_release,
/* gem hooks */
@@ -75,28 +81,56 @@ static struct drm_driver driver = {
.patchlevel = DRIVER_PATCHLEVEL,
};
+static struct udl_device *udl_driver_create(struct usb_interface *interface)
+{
+ struct usb_device *udev = interface_to_usbdev(interface);
+ struct udl_device *udl;
+ int r;
+
+ udl = kzalloc(sizeof(struct udl_device), GFP_KERNEL);
+ if (!udl)
+ return ERR_PTR(-ENOMEM);
+
+ r = drm_dev_init(&udl->drm, &driver, &interface->dev);
+ if (r) {
+ kfree(udl);
+ return ERR_PTR(r);
+ }
+
+ udl->udev = udev;
+ udl->drm.dev_private = udl;
+
+ r = udl_init(udl);
+ if (r) {
+ drm_dev_fini(&udl->drm);
+ kfree(udl);
+ return ERR_PTR(r);
+ }
+
+ usb_set_intfdata(interface, udl);
+ return udl;
+}
+
+
static int udl_usb_probe(struct usb_interface *interface,
const struct usb_device_id *id)
{
- struct usb_device *udev = interface_to_usbdev(interface);
- struct drm_device *dev;
int r;
- dev = drm_dev_alloc(&driver, &interface->dev);
- if (IS_ERR(dev))
- return PTR_ERR(dev);
+ struct udl_device *udl = udl_driver_create(interface);
+ if (IS_ERR(udl))
+ return PTR_ERR(udl);
- r = drm_dev_register(dev, (unsigned long)udev);
+ r = drm_dev_register(&udl->drm, 0);
if (r)
goto err_free;
- usb_set_intfdata(interface, dev);
- DRM_INFO("Initialized udl on minor %d\n", dev->primary->index);
+ DRM_INFO("Initialized udl on minor %d\n", udl->drm.primary->index);
return 0;
err_free:
- drm_dev_put(dev);
+ drm_dev_put(&udl->drm);
return r;
}
diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
index b3e08e876d62..35c1f33fbc1a 100644
--- a/drivers/gpu/drm/udl/udl_drv.h
+++ b/drivers/gpu/drm/udl/udl_drv.h
@@ -50,8 +50,8 @@ struct urb_list {
struct udl_fbdev;
struct udl_device {
+ struct drm_device drm;
struct device *dev;
- struct drm_device *ddev;
struct usb_device *udev;
struct drm_crtc *crtc;
@@ -71,7 +71,7 @@ struct udl_device {
atomic_t cpu_kcycles_used; /* transpired during pixel processing */
};
-#define to_udl(x) ((x)->dev_private)
+#define to_udl(x) container_of(x, struct udl_device, drm)
struct udl_gem_object {
struct drm_gem_object base;
@@ -104,9 +104,8 @@ struct urb *udl_get_urb(struct drm_device *dev);
int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len);
void udl_urb_completion(struct urb *urb);
-int udl_driver_load(struct drm_device *dev, unsigned long flags);
-void udl_driver_unload(struct drm_device *dev);
-void udl_driver_release(struct drm_device *dev);
+int udl_init(struct udl_device *udl);
+void udl_fini(struct drm_device *dev);
int udl_fbdev_init(struct drm_device *dev);
void udl_fbdev_cleanup(struct drm_device *dev);
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index 590323ea261f..4ab101bf1df0 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -213,7 +213,7 @@ static int udl_fb_open(struct fb_info *info, int user)
struct udl_device *udl = to_udl(dev);
/* If the USB device is gone, we don't accept new opens */
- if (drm_dev_is_unplugged(udl->ddev))
+ if (drm_dev_is_unplugged(&udl->drm))
return -ENODEV;
ufbdev->fb_count++;
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
index 862c099d7c4c..6743eaef4594 100644
--- a/drivers/gpu/drm/udl/udl_main.c
+++ b/drivers/gpu/drm/udl/udl_main.c
@@ -311,20 +311,12 @@ int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len)
return ret;
}
-int udl_driver_load(struct drm_device *dev, unsigned long flags)
+int udl_init(struct udl_device *udl)
{
- struct usb_device *udev = (void*)flags;
- struct udl_device *udl;
+ struct drm_device *dev = &udl->drm;
int ret = -ENOMEM;
DRM_DEBUG("\n");
- udl = kzalloc(sizeof(struct udl_device), GFP_KERNEL);
- if (!udl)
- return -ENOMEM;
-
- udl->udev = udev;
- udl->ddev = dev;
- dev->dev_private = udl;
mutex_init(&udl->gem_lock);
@@ -358,7 +350,6 @@ int udl_driver_load(struct drm_device *dev, unsigned long flags)
err:
if (udl->urbs.count)
udl_free_urb_list(dev);
- kfree(udl);
DRM_ERROR("%d\n", ret);
return ret;
}
@@ -369,7 +360,7 @@ int udl_drop_usb(struct drm_device *dev)
return 0;
}
-void udl_driver_unload(struct drm_device *dev)
+void udl_fini(struct drm_device *dev)
{
struct udl_device *udl = to_udl(dev);
@@ -379,12 +370,4 @@ void udl_driver_unload(struct drm_device *dev)
udl_free_urb_list(dev);
udl_fbdev_cleanup(dev);
- kfree(udl);
-}
-
-void udl_driver_release(struct drm_device *dev)
-{
- udl_modeset_cleanup(dev);
- drm_dev_fini(dev);
- kfree(dev);
}
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] drm/udl: move to embedding drm device inside udl device.
2019-04-05 3:17 ` [PATCH 3/3] drm/udl: move to embedding drm device inside udl device Dave Airlie
@ 2019-04-05 13:15 ` Alex Deucher
0 siblings, 0 replies; 5+ messages in thread
From: Alex Deucher @ 2019-04-05 13:15 UTC (permalink / raw
To: Dave Airlie; +Cc: Maling list - DRI developers
On Thu, Apr 4, 2019 at 11:17 PM Dave Airlie <airlied@gmail.com> wrote:
>
> From: Dave Airlie <airlied@redhat.com>
>
> This should help with some of the lifetime issues, and move us away
> from load/unload.
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
Not too familiar with the usb interface stuff, but it seems to be
doing the right thing. Patches 1, 2 are:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Patch 3:
Acked-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/udl/udl_drv.c | 56 +++++++++++++++++++++++++++-------
> drivers/gpu/drm/udl/udl_drv.h | 9 +++---
> drivers/gpu/drm/udl/udl_fb.c | 2 +-
> drivers/gpu/drm/udl/udl_main.c | 23 ++------------
> 4 files changed, 53 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
> index ff47f890e6ad..15c0e3eeaf3b 100644
> --- a/drivers/gpu/drm/udl/udl_drv.c
> +++ b/drivers/gpu/drm/udl/udl_drv.c
> @@ -48,10 +48,16 @@ static const struct file_operations udl_driver_fops = {
> .llseek = noop_llseek,
> };
>
> +static void udl_driver_release(struct drm_device *dev)
> +{
> + udl_fini(dev);
> + udl_modeset_cleanup(dev);
> + drm_dev_fini(dev);
> + kfree(dev);
> +}
> +
> static struct drm_driver driver = {
> .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,
> - .load = udl_driver_load,
> - .unload = udl_driver_unload,
> .release = udl_driver_release,
>
> /* gem hooks */
> @@ -75,28 +81,56 @@ static struct drm_driver driver = {
> .patchlevel = DRIVER_PATCHLEVEL,
> };
>
> +static struct udl_device *udl_driver_create(struct usb_interface *interface)
> +{
> + struct usb_device *udev = interface_to_usbdev(interface);
> + struct udl_device *udl;
> + int r;
> +
> + udl = kzalloc(sizeof(struct udl_device), GFP_KERNEL);
> + if (!udl)
> + return ERR_PTR(-ENOMEM);
> +
> + r = drm_dev_init(&udl->drm, &driver, &interface->dev);
> + if (r) {
> + kfree(udl);
> + return ERR_PTR(r);
> + }
> +
> + udl->udev = udev;
> + udl->drm.dev_private = udl;
> +
> + r = udl_init(udl);
> + if (r) {
> + drm_dev_fini(&udl->drm);
> + kfree(udl);
> + return ERR_PTR(r);
> + }
> +
> + usb_set_intfdata(interface, udl);
> + return udl;
> +}
> +
> +
> static int udl_usb_probe(struct usb_interface *interface,
> const struct usb_device_id *id)
> {
> - struct usb_device *udev = interface_to_usbdev(interface);
> - struct drm_device *dev;
> int r;
>
> - dev = drm_dev_alloc(&driver, &interface->dev);
> - if (IS_ERR(dev))
> - return PTR_ERR(dev);
> + struct udl_device *udl = udl_driver_create(interface);
> + if (IS_ERR(udl))
> + return PTR_ERR(udl);
>
> - r = drm_dev_register(dev, (unsigned long)udev);
> + r = drm_dev_register(&udl->drm, 0);
> if (r)
> goto err_free;
>
> - usb_set_intfdata(interface, dev);
> - DRM_INFO("Initialized udl on minor %d\n", dev->primary->index);
> + DRM_INFO("Initialized udl on minor %d\n", udl->drm.primary->index);
>
> return 0;
>
> err_free:
> - drm_dev_put(dev);
> + drm_dev_put(&udl->drm);
> return r;
> }
>
> diff --git a/drivers/gpu/drm/udl/udl_drv.h b/drivers/gpu/drm/udl/udl_drv.h
> index b3e08e876d62..35c1f33fbc1a 100644
> --- a/drivers/gpu/drm/udl/udl_drv.h
> +++ b/drivers/gpu/drm/udl/udl_drv.h
> @@ -50,8 +50,8 @@ struct urb_list {
> struct udl_fbdev;
>
> struct udl_device {
> + struct drm_device drm;
> struct device *dev;
> - struct drm_device *ddev;
> struct usb_device *udev;
> struct drm_crtc *crtc;
>
> @@ -71,7 +71,7 @@ struct udl_device {
> atomic_t cpu_kcycles_used; /* transpired during pixel processing */
> };
>
> -#define to_udl(x) ((x)->dev_private)
> +#define to_udl(x) container_of(x, struct udl_device, drm)
>
> struct udl_gem_object {
> struct drm_gem_object base;
> @@ -104,9 +104,8 @@ struct urb *udl_get_urb(struct drm_device *dev);
> int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len);
> void udl_urb_completion(struct urb *urb);
>
> -int udl_driver_load(struct drm_device *dev, unsigned long flags);
> -void udl_driver_unload(struct drm_device *dev);
> -void udl_driver_release(struct drm_device *dev);
> +int udl_init(struct udl_device *udl);
> +void udl_fini(struct drm_device *dev);
>
> int udl_fbdev_init(struct drm_device *dev);
> void udl_fbdev_cleanup(struct drm_device *dev);
> diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
> index 590323ea261f..4ab101bf1df0 100644
> --- a/drivers/gpu/drm/udl/udl_fb.c
> +++ b/drivers/gpu/drm/udl/udl_fb.c
> @@ -213,7 +213,7 @@ static int udl_fb_open(struct fb_info *info, int user)
> struct udl_device *udl = to_udl(dev);
>
> /* If the USB device is gone, we don't accept new opens */
> - if (drm_dev_is_unplugged(udl->ddev))
> + if (drm_dev_is_unplugged(&udl->drm))
> return -ENODEV;
>
> ufbdev->fb_count++;
> diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c
> index 862c099d7c4c..6743eaef4594 100644
> --- a/drivers/gpu/drm/udl/udl_main.c
> +++ b/drivers/gpu/drm/udl/udl_main.c
> @@ -311,20 +311,12 @@ int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len)
> return ret;
> }
>
> -int udl_driver_load(struct drm_device *dev, unsigned long flags)
> +int udl_init(struct udl_device *udl)
> {
> - struct usb_device *udev = (void*)flags;
> - struct udl_device *udl;
> + struct drm_device *dev = &udl->drm;
> int ret = -ENOMEM;
>
> DRM_DEBUG("\n");
> - udl = kzalloc(sizeof(struct udl_device), GFP_KERNEL);
> - if (!udl)
> - return -ENOMEM;
> -
> - udl->udev = udev;
> - udl->ddev = dev;
> - dev->dev_private = udl;
>
> mutex_init(&udl->gem_lock);
>
> @@ -358,7 +350,6 @@ int udl_driver_load(struct drm_device *dev, unsigned long flags)
> err:
> if (udl->urbs.count)
> udl_free_urb_list(dev);
> - kfree(udl);
> DRM_ERROR("%d\n", ret);
> return ret;
> }
> @@ -369,7 +360,7 @@ int udl_drop_usb(struct drm_device *dev)
> return 0;
> }
>
> -void udl_driver_unload(struct drm_device *dev)
> +void udl_fini(struct drm_device *dev)
> {
> struct udl_device *udl = to_udl(dev);
>
> @@ -379,12 +370,4 @@ void udl_driver_unload(struct drm_device *dev)
> udl_free_urb_list(dev);
>
> udl_fbdev_cleanup(dev);
> - kfree(udl);
> -}
> -
> -void udl_driver_release(struct drm_device *dev)
> -{
> - udl_modeset_cleanup(dev);
> - drm_dev_fini(dev);
> - kfree(dev);
> }
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-04-05 13:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-05 3:17 udl fix + 2 cleanups Dave Airlie
2019-04-05 3:17 ` [PATCH 1/3] drm/udl: add a release method and delay modeset teardown Dave Airlie
2019-04-05 3:17 ` [PATCH 2/3] drm/udl: introduce a macro to convert dev to udl Dave Airlie
2019-04-05 3:17 ` [PATCH 3/3] drm/udl: move to embedding drm device inside udl device Dave Airlie
2019-04-05 13:15 ` Alex Deucher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.