diff options
author | Robert Tarasov <tutankhamen@chromium.org> | 2017-10-12 20:13:49 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-10-16 15:36:02 -0400 |
commit | afdfc4c6f55f953e073f0eef9e2afa3c8cf78d7c (patch) | |
tree | 988d8334f9c836534aef4dfe1e4df3e69c700ab3 | |
parent | a52ff2a509a77aacdcc464f26181e77d49880da9 (diff) |
drm/udl: Fixed problem with UDL adpater reconnection
Fixed problem with DisplayLink and DisplayLink certified adapers in drm/udl
driver when adapter doesn't want to work if it was initialized with
disconnected DVI cable by enabling drm connectot polling and updating
current connector's state.
Signed-off-by: Robert Tarasov <tutankhamen@chromium.org>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171013001350.172155-1-tutankhamen@chromium.org
-rw-r--r-- | drivers/gpu/drm/udl/udl_connector.c | 76 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_connector.h | 13 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_drv.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_main.c | 5 |
4 files changed, 72 insertions, 26 deletions
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c index 9f9a49748d17..b4d1464d2d87 100644 --- a/drivers/gpu/drm/udl/udl_connector.c +++ b/drivers/gpu/drm/udl/udl_connector.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <drm/drm_crtc.h> | 14 | #include <drm/drm_crtc.h> |
15 | #include <drm/drm_edid.h> | 15 | #include <drm/drm_edid.h> |
16 | #include <drm/drm_crtc_helper.h> | 16 | #include <drm/drm_crtc_helper.h> |
17 | #include "udl_connector.h" | ||
17 | #include "udl_drv.h" | 18 | #include "udl_drv.h" |
18 | 19 | ||
19 | /* dummy connector to just get EDID, | 20 | /* dummy connector to just get EDID, |
@@ -56,28 +57,15 @@ error: | |||
56 | 57 | ||
57 | static int udl_get_modes(struct drm_connector *connector) | 58 | static int udl_get_modes(struct drm_connector *connector) |
58 | { | 59 | { |
59 | struct udl_device *udl = connector->dev->dev_private; | 60 | struct udl_drm_connector *udl_connector = |
60 | struct edid *edid; | 61 | container_of(connector, |
61 | int ret; | 62 | struct udl_drm_connector, |
62 | 63 | connector); | |
63 | edid = (struct edid *)udl_get_edid(udl); | 64 | |
64 | if (!edid) { | 65 | drm_mode_connector_update_edid_property(connector, udl_connector->edid); |
65 | drm_mode_connector_update_edid_property(connector, NULL); | 66 | if (udl_connector->edid) |
66 | return 0; | 67 | return drm_add_edid_modes(connector, udl_connector->edid); |
67 | } | 68 | return 0; |
68 | |||
69 | /* | ||
70 | * We only read the main block, but if the monitor reports extension | ||
71 | * blocks then the drm edid code expects them to be present, so patch | ||
72 | * the extension count to 0. | ||
73 | */ | ||
74 | edid->checksum += edid->extensions; | ||
75 | edid->extensions = 0; | ||
76 | |||
77 | drm_mode_connector_update_edid_property(connector, edid); | ||
78 | ret = drm_add_edid_modes(connector, edid); | ||
79 | kfree(edid); | ||
80 | return ret; | ||
81 | } | 69 | } |
82 | 70 | ||
83 | static int udl_mode_valid(struct drm_connector *connector, | 71 | static int udl_mode_valid(struct drm_connector *connector, |
@@ -96,8 +84,33 @@ static int udl_mode_valid(struct drm_connector *connector, | |||
96 | static enum drm_connector_status | 84 | static enum drm_connector_status |
97 | udl_detect(struct drm_connector *connector, bool force) | 85 | udl_detect(struct drm_connector *connector, bool force) |
98 | { | 86 | { |
99 | if (drm_dev_is_unplugged(connector->dev)) | 87 | struct edid *edid; |
88 | struct udl_device *udl = connector->dev->dev_private; | ||
89 | struct udl_drm_connector *udl_connector = | ||
90 | container_of(connector, | ||
91 | struct udl_drm_connector, | ||
92 | connector); | ||
93 | |||
94 | if (udl_connector->edid != NULL) { | ||
95 | kfree(udl_connector->edid); | ||
96 | udl_connector->edid = NULL; | ||
97 | } | ||
98 | |||
99 | edid = (struct edid *)udl_get_edid(udl); | ||
100 | if (!edid || !memchr_inv(edid, 0, EDID_LENGTH)) | ||
100 | return connector_status_disconnected; | 101 | return connector_status_disconnected; |
102 | |||
103 | udl_connector->edid = edid; | ||
104 | |||
105 | /* | ||
106 | * We only read the main block, but if the monitor reports extension | ||
107 | * blocks then the drm edid code expects them to be present, so patch | ||
108 | * the extension count to 0. | ||
109 | */ | ||
110 | udl_connector->edid->checksum += | ||
111 | udl_connector->edid->extensions; | ||
112 | udl_connector->edid->extensions = 0; | ||
113 | |||
101 | return connector_status_connected; | 114 | return connector_status_connected; |
102 | } | 115 | } |
103 | 116 | ||
@@ -117,8 +130,14 @@ static int udl_connector_set_property(struct drm_connector *connector, | |||
117 | 130 | ||
118 | static void udl_connector_destroy(struct drm_connector *connector) | 131 | static void udl_connector_destroy(struct drm_connector *connector) |
119 | { | 132 | { |
133 | struct udl_drm_connector *udl_connector = | ||
134 | container_of(connector, | ||
135 | struct udl_drm_connector, | ||
136 | connector); | ||
137 | |||
120 | drm_connector_unregister(connector); | 138 | drm_connector_unregister(connector); |
121 | drm_connector_cleanup(connector); | 139 | drm_connector_cleanup(connector); |
140 | kfree(udl_connector->edid); | ||
122 | kfree(connector); | 141 | kfree(connector); |
123 | } | 142 | } |
124 | 143 | ||
@@ -138,17 +157,22 @@ static const struct drm_connector_funcs udl_connector_funcs = { | |||
138 | 157 | ||
139 | int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder) | 158 | int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder) |
140 | { | 159 | { |
160 | struct udl_drm_connector *udl_connector; | ||
141 | struct drm_connector *connector; | 161 | struct drm_connector *connector; |
142 | 162 | ||
143 | connector = kzalloc(sizeof(struct drm_connector), GFP_KERNEL); | 163 | udl_connector = kzalloc(sizeof(struct udl_drm_connector), GFP_KERNEL); |
144 | if (!connector) | 164 | if (!udl_connector) |
145 | return -ENOMEM; | 165 | return -ENOMEM; |
146 | 166 | ||
147 | drm_connector_init(dev, connector, &udl_connector_funcs, DRM_MODE_CONNECTOR_DVII); | 167 | connector = &udl_connector->connector; |
168 | drm_connector_init(dev, connector, &udl_connector_funcs, | ||
169 | DRM_MODE_CONNECTOR_DVII); | ||
148 | drm_connector_helper_add(connector, &udl_connector_helper_funcs); | 170 | drm_connector_helper_add(connector, &udl_connector_helper_funcs); |
149 | 171 | ||
150 | drm_connector_register(connector); | 172 | drm_connector_register(connector); |
151 | drm_mode_connector_attach_encoder(connector, encoder); | 173 | drm_mode_connector_attach_encoder(connector, encoder); |
174 | connector->polled = DRM_CONNECTOR_POLL_HPD | | ||
175 | DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT; | ||
152 | 176 | ||
153 | return 0; | 177 | return 0; |
154 | } | 178 | } |
diff --git a/drivers/gpu/drm/udl/udl_connector.h b/drivers/gpu/drm/udl/udl_connector.h new file mode 100644 index 000000000000..0fb0db5c4612 --- /dev/null +++ b/drivers/gpu/drm/udl/udl_connector.h | |||
@@ -0,0 +1,13 @@ | |||
1 | #ifndef __UDL_CONNECTOR_H__ | ||
2 | #define __UDL_CONNECTOR_H__ | ||
3 | |||
4 | #include <drm/drm_crtc.h> | ||
5 | |||
6 | struct udl_drm_connector { | ||
7 | struct drm_connector connector; | ||
8 | /* last udl_detect edid */ | ||
9 | struct edid *edid; | ||
10 | }; | ||
11 | |||
12 | |||
13 | #endif //__UDL_CONNECTOR_H__ | ||
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c index 31421b6b586e..3c45a3064726 100644 --- a/drivers/gpu/drm/udl/udl_drv.c +++ b/drivers/gpu/drm/udl/udl_drv.c | |||
@@ -14,6 +14,9 @@ | |||
14 | static int udl_usb_suspend(struct usb_interface *interface, | 14 | static int udl_usb_suspend(struct usb_interface *interface, |
15 | pm_message_t message) | 15 | pm_message_t message) |
16 | { | 16 | { |
17 | struct drm_device *dev = usb_get_intfdata(interface); | ||
18 | |||
19 | drm_kms_helper_poll_disable(dev); | ||
17 | return 0; | 20 | return 0; |
18 | } | 21 | } |
19 | 22 | ||
@@ -21,6 +24,7 @@ static int udl_usb_resume(struct usb_interface *interface) | |||
21 | { | 24 | { |
22 | struct drm_device *dev = usb_get_intfdata(interface); | 25 | struct drm_device *dev = usb_get_intfdata(interface); |
23 | 26 | ||
27 | drm_kms_helper_poll_enable(dev); | ||
24 | udl_modeset_restore(dev); | 28 | udl_modeset_restore(dev); |
25 | return 0; | 29 | return 0; |
26 | } | 30 | } |
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index 0328b2c7b210..f1ec4528a73e 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c | |||
@@ -11,6 +11,7 @@ | |||
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | #include <drm/drmP.h> | 13 | #include <drm/drmP.h> |
14 | #include <drm/drm_crtc_helper.h> | ||
14 | #include "udl_drv.h" | 15 | #include "udl_drv.h" |
15 | 16 | ||
16 | /* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */ | 17 | /* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */ |
@@ -350,6 +351,8 @@ int udl_driver_load(struct drm_device *dev, unsigned long flags) | |||
350 | if (ret) | 351 | if (ret) |
351 | goto err_fb; | 352 | goto err_fb; |
352 | 353 | ||
354 | drm_kms_helper_poll_init(dev); | ||
355 | |||
353 | return 0; | 356 | return 0; |
354 | err_fb: | 357 | err_fb: |
355 | udl_fbdev_cleanup(dev); | 358 | udl_fbdev_cleanup(dev); |
@@ -371,6 +374,8 @@ void udl_driver_unload(struct drm_device *dev) | |||
371 | { | 374 | { |
372 | struct udl_device *udl = dev->dev_private; | 375 | struct udl_device *udl = dev->dev_private; |
373 | 376 | ||
377 | drm_kms_helper_poll_fini(dev); | ||
378 | |||
374 | if (udl->urbs.count) | 379 | if (udl->urbs.count) |
375 | udl_free_urb_list(dev); | 380 | udl_free_urb_list(dev); |
376 | 381 | ||