Commit | Line | Data |
---|---|---|
6ee73861 BS |
1 | /* |
2 | * Copyright (C) 2008 Maarten Maathuis. | |
3 | * All Rights Reserved. | |
4 | * | |
5 | * Permission is hereby granted, free of charge, to any person obtaining | |
6 | * a copy of this software and associated documentation files (the | |
7 | * "Software"), to deal in the Software without restriction, including | |
8 | * without limitation the rights to use, copy, modify, merge, publish, | |
9 | * distribute, sublicense, and/or sell copies of the Software, and to | |
10 | * permit persons to whom the Software is furnished to do so, subject to | |
11 | * the following conditions: | |
12 | * | |
13 | * The above copyright notice and this permission notice (including the | |
14 | * next paragraph) shall be included in all copies or substantial | |
15 | * portions of the Software. | |
16 | * | |
17 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | |
18 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | |
19 | * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | |
20 | * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE | |
21 | * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | |
22 | * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | |
23 | * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | |
24 | * | |
25 | */ | |
26 | ||
a1470890 BS |
27 | #include <acpi/button.h> |
28 | ||
5addcf0a | 29 | #include <linux/pm_runtime.h> |
39c1c901 | 30 | #include <linux/vga_switcheroo.h> |
5addcf0a | 31 | |
760285e7 | 32 | #include <drm/drmP.h> |
616915ec | 33 | #include <drm/drm_atomic_helper.h> |
760285e7 DH |
34 | #include <drm/drm_edid.h> |
35 | #include <drm/drm_crtc_helper.h> | |
a743d758 | 36 | #include <drm/drm_atomic.h> |
a1470890 | 37 | |
6ee73861 | 38 | #include "nouveau_reg.h" |
4dc28134 | 39 | #include "nouveau_drv.h" |
1a646342 | 40 | #include "dispnv04/hw.h" |
c0077061 | 41 | #include "nouveau_acpi.h" |
6ee73861 | 42 | |
77145f1c BS |
43 | #include "nouveau_display.h" |
44 | #include "nouveau_connector.h" | |
6ee73861 BS |
45 | #include "nouveau_encoder.h" |
46 | #include "nouveau_crtc.h" | |
77145f1c | 47 | |
923bc416 | 48 | #include <nvif/class.h> |
7568b106 | 49 | #include <nvif/cl0046.h> |
79ca2770 BS |
50 | #include <nvif/event.h> |
51 | ||
616915ec BS |
52 | struct drm_display_mode * |
53 | nouveau_conn_native_mode(struct drm_connector *connector) | |
54 | { | |
55 | const struct drm_connector_helper_funcs *helper = connector->helper_private; | |
56 | struct nouveau_drm *drm = nouveau_drm(connector->dev); | |
57 | struct drm_device *dev = connector->dev; | |
58 | struct drm_display_mode *mode, *largest = NULL; | |
59 | int high_w = 0, high_h = 0, high_v = 0; | |
60 | ||
61 | list_for_each_entry(mode, &connector->probed_modes, head) { | |
62 | mode->vrefresh = drm_mode_vrefresh(mode); | |
63 | if (helper->mode_valid(connector, mode) != MODE_OK || | |
64 | (mode->flags & DRM_MODE_FLAG_INTERLACE)) | |
65 | continue; | |
66 | ||
67 | /* Use preferred mode if there is one.. */ | |
68 | if (mode->type & DRM_MODE_TYPE_PREFERRED) { | |
69 | NV_DEBUG(drm, "native mode from preferred\n"); | |
70 | return drm_mode_duplicate(dev, mode); | |
71 | } | |
72 | ||
73 | /* Otherwise, take the resolution with the largest width, then | |
74 | * height, then vertical refresh | |
75 | */ | |
76 | if (mode->hdisplay < high_w) | |
77 | continue; | |
78 | ||
79 | if (mode->hdisplay == high_w && mode->vdisplay < high_h) | |
80 | continue; | |
81 | ||
82 | if (mode->hdisplay == high_w && mode->vdisplay == high_h && | |
83 | mode->vrefresh < high_v) | |
84 | continue; | |
85 | ||
86 | high_w = mode->hdisplay; | |
87 | high_h = mode->vdisplay; | |
88 | high_v = mode->vrefresh; | |
89 | largest = mode; | |
90 | } | |
91 | ||
92 | NV_DEBUG(drm, "native mode from largest: %dx%d@%d\n", | |
93 | high_w, high_h, high_v); | |
94 | return largest ? drm_mode_duplicate(dev, largest) : NULL; | |
95 | } | |
96 | ||
97 | int | |
98 | nouveau_conn_atomic_get_property(struct drm_connector *connector, | |
99 | const struct drm_connector_state *state, | |
100 | struct drm_property *property, u64 *val) | |
101 | { | |
102 | struct nouveau_conn_atom *asyc = nouveau_conn_atom(state); | |
103 | struct nouveau_display *disp = nouveau_display(connector->dev); | |
104 | struct drm_device *dev = connector->dev; | |
105 | ||
106 | if (property == dev->mode_config.scaling_mode_property) | |
107 | *val = asyc->scaler.mode; | |
108 | else if (property == disp->underscan_property) | |
109 | *val = asyc->scaler.underscan.mode; | |
110 | else if (property == disp->underscan_hborder_property) | |
111 | *val = asyc->scaler.underscan.hborder; | |
112 | else if (property == disp->underscan_vborder_property) | |
113 | *val = asyc->scaler.underscan.vborder; | |
114 | else if (property == disp->dithering_mode) | |
115 | *val = asyc->dither.mode; | |
116 | else if (property == disp->dithering_depth) | |
117 | *val = asyc->dither.depth; | |
118 | else if (property == disp->vibrant_hue_property) | |
119 | *val = asyc->procamp.vibrant_hue; | |
120 | else if (property == disp->color_vibrance_property) | |
121 | *val = asyc->procamp.color_vibrance; | |
122 | else | |
123 | return -EINVAL; | |
124 | ||
125 | return 0; | |
126 | } | |
127 | ||
128 | int | |
129 | nouveau_conn_atomic_set_property(struct drm_connector *connector, | |
130 | struct drm_connector_state *state, | |
131 | struct drm_property *property, u64 val) | |
132 | { | |
133 | struct drm_device *dev = connector->dev; | |
134 | struct nouveau_conn_atom *asyc = nouveau_conn_atom(state); | |
135 | struct nouveau_display *disp = nouveau_display(dev); | |
136 | ||
137 | if (property == dev->mode_config.scaling_mode_property) { | |
138 | switch (val) { | |
139 | case DRM_MODE_SCALE_NONE: | |
140 | /* We allow 'None' for EDID modes, even on a fixed | |
141 | * panel (some exist with support for lower refresh | |
142 | * rates, which people might want to use for power- | |
143 | * saving purposes). | |
144 | * | |
145 | * Non-EDID modes will force the use of GPU scaling | |
146 | * to the native mode regardless of this setting. | |
147 | */ | |
148 | switch (connector->connector_type) { | |
149 | case DRM_MODE_CONNECTOR_LVDS: | |
150 | case DRM_MODE_CONNECTOR_eDP: | |
151 | /* ... except prior to G80, where the code | |
152 | * doesn't support such things. | |
153 | */ | |
154 | if (disp->disp.oclass < NV50_DISP) | |
155 | return -EINVAL; | |
156 | break; | |
157 | default: | |
158 | break; | |
159 | } | |
160 | case DRM_MODE_SCALE_FULLSCREEN: | |
161 | case DRM_MODE_SCALE_CENTER: | |
162 | case DRM_MODE_SCALE_ASPECT: | |
163 | break; | |
164 | default: | |
165 | return -EINVAL; | |
166 | } | |
167 | ||
168 | if (asyc->scaler.mode != val) { | |
169 | asyc->scaler.mode = val; | |
170 | asyc->set.scaler = true; | |
171 | } | |
172 | } else | |
173 | if (property == disp->underscan_property) { | |
174 | if (asyc->scaler.underscan.mode != val) { | |
175 | asyc->scaler.underscan.mode = val; | |
176 | asyc->set.scaler = true; | |
177 | } | |
178 | } else | |
179 | if (property == disp->underscan_hborder_property) { | |
180 | if (asyc->scaler.underscan.hborder != val) { | |
181 | asyc->scaler.underscan.hborder = val; | |
182 | asyc->set.scaler = true; | |
183 | } | |
184 | } else | |
185 | if (property == disp->underscan_vborder_property) { | |
186 | if (asyc->scaler.underscan.vborder != val) { | |
187 | asyc->scaler.underscan.vborder = val; | |
188 | asyc->set.scaler = true; | |
189 | } | |
190 | } else | |
191 | if (property == disp->dithering_mode) { | |
192 | if (asyc->dither.mode != val) { | |
193 | asyc->dither.mode = val; | |
194 | asyc->set.dither = true; | |
195 | } | |
196 | } else | |
197 | if (property == disp->dithering_depth) { | |
198 | if (asyc->dither.mode != val) { | |
199 | asyc->dither.depth = val; | |
200 | asyc->set.dither = true; | |
201 | } | |
202 | } else | |
203 | if (property == disp->vibrant_hue_property) { | |
204 | if (asyc->procamp.vibrant_hue != val) { | |
205 | asyc->procamp.vibrant_hue = val; | |
206 | asyc->set.procamp = true; | |
207 | } | |
208 | } else | |
209 | if (property == disp->color_vibrance_property) { | |
210 | if (asyc->procamp.color_vibrance != val) { | |
211 | asyc->procamp.color_vibrance = val; | |
212 | asyc->set.procamp = true; | |
213 | } | |
214 | } else { | |
215 | return -EINVAL; | |
216 | } | |
217 | ||
218 | return 0; | |
219 | } | |
220 | ||
221 | void | |
222 | nouveau_conn_atomic_destroy_state(struct drm_connector *connector, | |
223 | struct drm_connector_state *state) | |
224 | { | |
225 | struct nouveau_conn_atom *asyc = nouveau_conn_atom(state); | |
226 | __drm_atomic_helper_connector_destroy_state(&asyc->state); | |
227 | kfree(asyc); | |
228 | } | |
229 | ||
230 | struct drm_connector_state * | |
231 | nouveau_conn_atomic_duplicate_state(struct drm_connector *connector) | |
232 | { | |
233 | struct nouveau_conn_atom *armc = nouveau_conn_atom(connector->state); | |
234 | struct nouveau_conn_atom *asyc; | |
235 | if (!(asyc = kmalloc(sizeof(*asyc), GFP_KERNEL))) | |
236 | return NULL; | |
237 | __drm_atomic_helper_connector_duplicate_state(connector, &asyc->state); | |
238 | asyc->dither = armc->dither; | |
239 | asyc->scaler = armc->scaler; | |
240 | asyc->procamp = armc->procamp; | |
241 | asyc->set.mask = 0; | |
242 | return &asyc->state; | |
243 | } | |
244 | ||
245 | void | |
246 | nouveau_conn_reset(struct drm_connector *connector) | |
247 | { | |
248 | struct nouveau_conn_atom *asyc; | |
249 | ||
250 | if (WARN_ON(!(asyc = kzalloc(sizeof(*asyc), GFP_KERNEL)))) | |
251 | return; | |
252 | ||
253 | if (connector->state) | |
254 | __drm_atomic_helper_connector_destroy_state(connector->state); | |
255 | __drm_atomic_helper_connector_reset(connector, &asyc->state); | |
256 | asyc->dither.mode = DITHERING_MODE_AUTO; | |
257 | asyc->dither.depth = DITHERING_DEPTH_AUTO; | |
258 | asyc->scaler.mode = DRM_MODE_SCALE_NONE; | |
259 | asyc->scaler.underscan.mode = UNDERSCAN_OFF; | |
260 | asyc->procamp.color_vibrance = 150; | |
261 | asyc->procamp.vibrant_hue = 90; | |
262 | ||
263 | if (nouveau_display(connector->dev)->disp.oclass < NV50_DISP) { | |
264 | switch (connector->connector_type) { | |
265 | case DRM_MODE_CONNECTOR_LVDS: | |
266 | /* See note in nouveau_conn_atomic_set_property(). */ | |
267 | asyc->scaler.mode = DRM_MODE_SCALE_FULLSCREEN; | |
268 | break; | |
269 | default: | |
270 | break; | |
271 | } | |
272 | } | |
273 | } | |
274 | ||
56182b8b BS |
275 | void |
276 | nouveau_conn_attach_properties(struct drm_connector *connector) | |
277 | { | |
278 | struct drm_device *dev = connector->dev; | |
279 | struct nouveau_conn_atom *armc = nouveau_conn_atom(connector->state); | |
280 | struct nouveau_display *disp = nouveau_display(dev); | |
281 | ||
282 | /* Init DVI-I specific properties. */ | |
283 | if (connector->connector_type == DRM_MODE_CONNECTOR_DVII) | |
284 | drm_object_attach_property(&connector->base, dev->mode_config. | |
285 | dvi_i_subconnector_property, 0); | |
286 | ||
287 | /* Add overscan compensation options to digital outputs. */ | |
288 | if (disp->underscan_property && | |
289 | (connector->connector_type == DRM_MODE_CONNECTOR_DVID || | |
290 | connector->connector_type == DRM_MODE_CONNECTOR_DVII || | |
291 | connector->connector_type == DRM_MODE_CONNECTOR_HDMIA || | |
292 | connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort)) { | |
293 | drm_object_attach_property(&connector->base, | |
294 | disp->underscan_property, | |
295 | UNDERSCAN_OFF); | |
296 | drm_object_attach_property(&connector->base, | |
297 | disp->underscan_hborder_property, 0); | |
298 | drm_object_attach_property(&connector->base, | |
299 | disp->underscan_vborder_property, 0); | |
300 | } | |
301 | ||
302 | /* Add hue and saturation options. */ | |
303 | if (disp->vibrant_hue_property) | |
304 | drm_object_attach_property(&connector->base, | |
305 | disp->vibrant_hue_property, | |
306 | armc->procamp.vibrant_hue); | |
307 | if (disp->color_vibrance_property) | |
308 | drm_object_attach_property(&connector->base, | |
309 | disp->color_vibrance_property, | |
310 | armc->procamp.color_vibrance); | |
311 | ||
312 | /* Scaling mode property. */ | |
313 | switch (connector->connector_type) { | |
314 | case DRM_MODE_CONNECTOR_TV: | |
315 | break; | |
316 | case DRM_MODE_CONNECTOR_VGA: | |
317 | if (disp->disp.oclass < NV50_DISP) | |
318 | break; /* Can only scale on DFPs. */ | |
319 | /* Fall-through. */ | |
320 | default: | |
321 | drm_object_attach_property(&connector->base, dev->mode_config. | |
322 | scaling_mode_property, | |
323 | armc->scaler.mode); | |
324 | break; | |
325 | } | |
326 | ||
327 | /* Dithering properties. */ | |
328 | switch (connector->connector_type) { | |
329 | case DRM_MODE_CONNECTOR_TV: | |
330 | case DRM_MODE_CONNECTOR_VGA: | |
331 | break; | |
332 | default: | |
333 | if (disp->dithering_mode) { | |
334 | drm_object_attach_property(&connector->base, | |
335 | disp->dithering_mode, | |
336 | armc->dither.mode); | |
337 | } | |
338 | if (disp->dithering_depth) { | |
339 | drm_object_attach_property(&connector->base, | |
340 | disp->dithering_depth, | |
341 | armc->dither.depth); | |
342 | } | |
343 | break; | |
344 | } | |
345 | } | |
346 | ||
77145f1c | 347 | MODULE_PARM_DESC(tv_disable, "Disable TV-out detection"); |
703fa264 | 348 | int nouveau_tv_disable = 0; |
77145f1c BS |
349 | module_param_named(tv_disable, nouveau_tv_disable, int, 0400); |
350 | ||
351 | MODULE_PARM_DESC(ignorelid, "Ignore ACPI lid status"); | |
703fa264 | 352 | int nouveau_ignorelid = 0; |
77145f1c BS |
353 | module_param_named(ignorelid, nouveau_ignorelid, int, 0400); |
354 | ||
355 | MODULE_PARM_DESC(duallink, "Allow dual-link TMDS (default: enabled)"); | |
703fa264 | 356 | int nouveau_duallink = 1; |
77145f1c | 357 | module_param_named(duallink, nouveau_duallink, int, 0400); |
6ee73861 | 358 | |
1a0c96c0 IM |
359 | MODULE_PARM_DESC(hdmimhz, "Force a maximum HDMI pixel clock (in MHz)"); |
360 | int nouveau_hdmimhz = 0; | |
361 | module_param_named(hdmimhz, nouveau_hdmimhz, int, 0400); | |
362 | ||
10b461e4 | 363 | struct nouveau_encoder * |
e19b20bb | 364 | find_encoder(struct drm_connector *connector, int type) |
6ee73861 BS |
365 | { |
366 | struct drm_device *dev = connector->dev; | |
367 | struct nouveau_encoder *nv_encoder; | |
6d385c0a | 368 | struct drm_encoder *enc; |
6ee73861 BS |
369 | int i, id; |
370 | ||
371 | for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) { | |
372 | id = connector->encoder_ids[i]; | |
373 | if (!id) | |
374 | break; | |
375 | ||
418da172 | 376 | enc = drm_encoder_find(dev, NULL, id); |
6d385c0a | 377 | if (!enc) |
6ee73861 | 378 | continue; |
6d385c0a | 379 | nv_encoder = nouveau_encoder(enc); |
6ee73861 | 380 | |
4874322e BS |
381 | if (type == DCB_OUTPUT_ANY || |
382 | (nv_encoder->dcb && nv_encoder->dcb->type == type)) | |
6ee73861 BS |
383 | return nv_encoder; |
384 | } | |
385 | ||
386 | return NULL; | |
387 | } | |
388 | ||
389 | struct nouveau_connector * | |
390 | nouveau_encoder_connector_get(struct nouveau_encoder *encoder) | |
391 | { | |
392 | struct drm_device *dev = to_drm_encoder(encoder)->dev; | |
393 | struct drm_connector *drm_connector; | |
394 | ||
395 | list_for_each_entry(drm_connector, &dev->mode_config.connector_list, head) { | |
396 | if (drm_connector->encoder == to_drm_encoder(encoder)) | |
397 | return nouveau_connector(drm_connector); | |
398 | } | |
399 | ||
400 | return NULL; | |
401 | } | |
402 | ||
6ee73861 | 403 | static void |
fce2bad0 | 404 | nouveau_connector_destroy(struct drm_connector *connector) |
6ee73861 | 405 | { |
fce2bad0 | 406 | struct nouveau_connector *nv_connector = nouveau_connector(connector); |
80bc340b | 407 | nvif_notify_fini(&nv_connector->hpd); |
c8ebe275 | 408 | kfree(nv_connector->edid); |
34ea3d38 | 409 | drm_connector_unregister(connector); |
fce2bad0 | 410 | drm_connector_cleanup(connector); |
8894f491 BS |
411 | if (nv_connector->aux.transfer) |
412 | drm_dp_aux_unregister(&nv_connector->aux); | |
fce2bad0 | 413 | kfree(connector); |
6ee73861 BS |
414 | } |
415 | ||
8777c5c1 BS |
416 | static struct nouveau_encoder * |
417 | nouveau_connector_ddc_detect(struct drm_connector *connector) | |
6ee73861 BS |
418 | { |
419 | struct drm_device *dev = connector->dev; | |
1a1841d3 | 420 | struct nouveau_connector *nv_connector = nouveau_connector(connector); |
77145f1c | 421 | struct nouveau_drm *drm = nouveau_drm(dev); |
1167c6bc | 422 | struct nvkm_gpio *gpio = nvxx_gpio(&drm->client.device); |
8777c5c1 | 423 | struct nouveau_encoder *nv_encoder; |
6d385c0a | 424 | struct drm_encoder *encoder; |
1a1841d3 BS |
425 | int i, panel = -ENODEV; |
426 | ||
427 | /* eDP panels need powering on by us (if the VBIOS doesn't default it | |
428 | * to on) before doing any AUX channel transactions. LVDS panel power | |
429 | * is handled by the SOR itself, and not required for LVDS DDC. | |
430 | */ | |
431 | if (nv_connector->type == DCB_CONNECTOR_eDP) { | |
2ea7249f | 432 | panel = nvkm_gpio_get(gpio, 0, DCB_GPIO_PANEL_POWER, 0xff); |
1a1841d3 | 433 | if (panel == 0) { |
2ea7249f | 434 | nvkm_gpio_set(gpio, 0, DCB_GPIO_PANEL_POWER, 0xff, 1); |
1a1841d3 BS |
435 | msleep(300); |
436 | } | |
437 | } | |
6ee73861 | 438 | |
8777c5c1 BS |
439 | for (i = 0; nv_encoder = NULL, i < DRM_CONNECTOR_MAX_ENCODER; i++) { |
440 | int id = connector->encoder_ids[i]; | |
441 | if (id == 0) | |
6ee73861 BS |
442 | break; |
443 | ||
418da172 | 444 | encoder = drm_encoder_find(dev, NULL, id); |
6d385c0a | 445 | if (!encoder) |
6ee73861 | 446 | continue; |
6d385c0a | 447 | nv_encoder = nouveau_encoder(encoder); |
4ca2b712 | 448 | |
8777c5c1 BS |
449 | if (nv_encoder->dcb->type == DCB_OUTPUT_DP) { |
450 | int ret = nouveau_dp_detect(nv_encoder); | |
52aa30f2 BS |
451 | if (ret == NOUVEAU_DP_MST) |
452 | return NULL; | |
453 | if (ret == NOUVEAU_DP_SST) | |
8777c5c1 BS |
454 | break; |
455 | } else | |
39c1c901 LW |
456 | if ((vga_switcheroo_handler_flags() & |
457 | VGA_SWITCHEROO_CAN_SWITCH_DDC) && | |
458 | nv_encoder->dcb->type == DCB_OUTPUT_LVDS && | |
459 | nv_encoder->i2c) { | |
460 | int ret; | |
461 | vga_switcheroo_lock_ddc(dev->pdev); | |
462 | ret = nvkm_probe_i2c(nv_encoder->i2c, 0x50); | |
463 | vga_switcheroo_unlock_ddc(dev->pdev); | |
464 | if (ret) | |
465 | break; | |
466 | } else | |
8777c5c1 | 467 | if (nv_encoder->i2c) { |
2aa5eac5 | 468 | if (nvkm_probe_i2c(nv_encoder->i2c, 0x50)) |
8777c5c1 | 469 | break; |
6ee73861 BS |
470 | } |
471 | } | |
472 | ||
1a1841d3 BS |
473 | /* eDP panel not detected, restore panel power GPIO to previous |
474 | * state to avoid confusing the SOR for other output types. | |
475 | */ | |
8777c5c1 | 476 | if (!nv_encoder && panel == 0) |
2ea7249f | 477 | nvkm_gpio_set(gpio, 0, DCB_GPIO_PANEL_POWER, 0xff, panel); |
1a1841d3 | 478 | |
8777c5c1 | 479 | return nv_encoder; |
6ee73861 BS |
480 | } |
481 | ||
c16c5707 FJ |
482 | static struct nouveau_encoder * |
483 | nouveau_connector_of_detect(struct drm_connector *connector) | |
484 | { | |
485 | #ifdef __powerpc__ | |
486 | struct drm_device *dev = connector->dev; | |
487 | struct nouveau_connector *nv_connector = nouveau_connector(connector); | |
488 | struct nouveau_encoder *nv_encoder; | |
489 | struct device_node *cn, *dn = pci_device_to_OF_node(dev->pdev); | |
490 | ||
491 | if (!dn || | |
cb75d97e BS |
492 | !((nv_encoder = find_encoder(connector, DCB_OUTPUT_TMDS)) || |
493 | (nv_encoder = find_encoder(connector, DCB_OUTPUT_ANALOG)))) | |
c16c5707 FJ |
494 | return NULL; |
495 | ||
496 | for_each_child_of_node(dn, cn) { | |
497 | const char *name = of_get_property(cn, "name", NULL); | |
498 | const void *edid = of_get_property(cn, "EDID", NULL); | |
499 | int idx = name ? name[strlen(name) - 1] - 'A' : 0; | |
500 | ||
501 | if (nv_encoder->dcb->i2c_index == idx && edid) { | |
502 | nv_connector->edid = | |
503 | kmemdup(edid, EDID_LENGTH, GFP_KERNEL); | |
504 | of_node_put(cn); | |
505 | return nv_encoder; | |
506 | } | |
507 | } | |
508 | #endif | |
509 | return NULL; | |
510 | } | |
511 | ||
6ee73861 BS |
512 | static void |
513 | nouveau_connector_set_encoder(struct drm_connector *connector, | |
514 | struct nouveau_encoder *nv_encoder) | |
515 | { | |
516 | struct nouveau_connector *nv_connector = nouveau_connector(connector); | |
77145f1c | 517 | struct nouveau_drm *drm = nouveau_drm(connector->dev); |
6ee73861 BS |
518 | struct drm_device *dev = connector->dev; |
519 | ||
520 | if (nv_connector->detected_encoder == nv_encoder) | |
521 | return; | |
522 | nv_connector->detected_encoder = nv_encoder; | |
523 | ||
1167c6bc | 524 | if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_TESLA) { |
c8334423 BS |
525 | connector->interlace_allowed = true; |
526 | connector->doublescan_allowed = true; | |
527 | } else | |
cb75d97e BS |
528 | if (nv_encoder->dcb->type == DCB_OUTPUT_LVDS || |
529 | nv_encoder->dcb->type == DCB_OUTPUT_TMDS) { | |
6ee73861 BS |
530 | connector->doublescan_allowed = false; |
531 | connector->interlace_allowed = false; | |
532 | } else { | |
533 | connector->doublescan_allowed = true; | |
1167c6bc BS |
534 | if (drm->client.device.info.family == NV_DEVICE_INFO_V0_KELVIN || |
535 | (drm->client.device.info.family == NV_DEVICE_INFO_V0_CELSIUS && | |
4a0ff754 IM |
536 | (dev->pdev->device & 0x0ff0) != 0x0100 && |
537 | (dev->pdev->device & 0x0ff0) != 0x0150)) | |
6ee73861 BS |
538 | /* HW is broken */ |
539 | connector->interlace_allowed = false; | |
540 | else | |
541 | connector->interlace_allowed = true; | |
542 | } | |
543 | ||
befb51e9 | 544 | if (nv_connector->type == DCB_CONNECTOR_DVI_I) { |
2db83827 | 545 | drm_object_property_set_value(&connector->base, |
6ee73861 | 546 | dev->mode_config.dvi_i_subconnector_property, |
cb75d97e | 547 | nv_encoder->dcb->type == DCB_OUTPUT_TMDS ? |
6ee73861 BS |
548 | DRM_MODE_SUBCONNECTOR_DVID : |
549 | DRM_MODE_SUBCONNECTOR_DVIA); | |
550 | } | |
551 | } | |
552 | ||
553 | static enum drm_connector_status | |
930a9e28 | 554 | nouveau_connector_detect(struct drm_connector *connector, bool force) |
6ee73861 BS |
555 | { |
556 | struct drm_device *dev = connector->dev; | |
77145f1c | 557 | struct nouveau_drm *drm = nouveau_drm(dev); |
6ee73861 BS |
558 | struct nouveau_connector *nv_connector = nouveau_connector(connector); |
559 | struct nouveau_encoder *nv_encoder = NULL; | |
e19b20bb | 560 | struct nouveau_encoder *nv_partner; |
2aa5eac5 | 561 | struct i2c_adapter *i2c; |
03cd06ca | 562 | int type; |
5addcf0a DA |
563 | int ret; |
564 | enum drm_connector_status conn_status = connector_status_disconnected; | |
6ee73861 | 565 | |
b8780e2a FJ |
566 | /* Cleanup the previous EDID block. */ |
567 | if (nv_connector->edid) { | |
568 | drm_mode_connector_update_edid_property(connector, NULL); | |
569 | kfree(nv_connector->edid); | |
570 | nv_connector->edid = NULL; | |
571 | } | |
c8ebe275 | 572 | |
d61a5c10 LW |
573 | /* Outputs are only polled while runtime active, so acquiring a |
574 | * runtime PM ref here is unnecessary (and would deadlock upon | |
575 | * runtime suspend because it waits for polling to finish). | |
576 | */ | |
577 | if (!drm_kms_helper_is_poll_worker()) { | |
578 | ret = pm_runtime_get_sync(connector->dev->dev); | |
579 | if (ret < 0 && ret != -EACCES) | |
580 | return conn_status; | |
581 | } | |
5addcf0a | 582 | |
8777c5c1 BS |
583 | nv_encoder = nouveau_connector_ddc_detect(connector); |
584 | if (nv_encoder && (i2c = nv_encoder->i2c) != NULL) { | |
39c1c901 LW |
585 | if ((vga_switcheroo_handler_flags() & |
586 | VGA_SWITCHEROO_CAN_SWITCH_DDC) && | |
587 | nv_connector->type == DCB_CONNECTOR_LVDS) | |
588 | nv_connector->edid = drm_get_edid_switcheroo(connector, | |
589 | i2c); | |
590 | else | |
591 | nv_connector->edid = drm_get_edid(connector, i2c); | |
592 | ||
6ee73861 BS |
593 | drm_mode_connector_update_edid_property(connector, |
594 | nv_connector->edid); | |
595 | if (!nv_connector->edid) { | |
77145f1c | 596 | NV_ERROR(drm, "DDC responded, but no EDID for %s\n", |
8c6c361a | 597 | connector->name); |
0ed3165e | 598 | goto detect_analog; |
6ee73861 BS |
599 | } |
600 | ||
6ee73861 BS |
601 | /* Override encoder type for DVI-I based on whether EDID |
602 | * says the display is digital or analog, both use the | |
603 | * same i2c channel so the value returned from ddc_detect | |
604 | * isn't necessarily correct. | |
605 | */ | |
e19b20bb | 606 | nv_partner = NULL; |
cb75d97e BS |
607 | if (nv_encoder->dcb->type == DCB_OUTPUT_TMDS) |
608 | nv_partner = find_encoder(connector, DCB_OUTPUT_ANALOG); | |
609 | if (nv_encoder->dcb->type == DCB_OUTPUT_ANALOG) | |
610 | nv_partner = find_encoder(connector, DCB_OUTPUT_TMDS); | |
611 | ||
612 | if (nv_partner && ((nv_encoder->dcb->type == DCB_OUTPUT_ANALOG && | |
613 | nv_partner->dcb->type == DCB_OUTPUT_TMDS) || | |
614 | (nv_encoder->dcb->type == DCB_OUTPUT_TMDS && | |
615 | nv_partner->dcb->type == DCB_OUTPUT_ANALOG))) { | |
6ee73861 | 616 | if (nv_connector->edid->input & DRM_EDID_INPUT_DIGITAL) |
cb75d97e | 617 | type = DCB_OUTPUT_TMDS; |
6ee73861 | 618 | else |
cb75d97e | 619 | type = DCB_OUTPUT_ANALOG; |
6ee73861 | 620 | |
e19b20bb | 621 | nv_encoder = find_encoder(connector, type); |
6ee73861 BS |
622 | } |
623 | ||
624 | nouveau_connector_set_encoder(connector, nv_encoder); | |
5addcf0a DA |
625 | conn_status = connector_status_connected; |
626 | goto out; | |
6ee73861 BS |
627 | } |
628 | ||
c16c5707 FJ |
629 | nv_encoder = nouveau_connector_of_detect(connector); |
630 | if (nv_encoder) { | |
631 | nouveau_connector_set_encoder(connector, nv_encoder); | |
5addcf0a DA |
632 | conn_status = connector_status_connected; |
633 | goto out; | |
c16c5707 FJ |
634 | } |
635 | ||
0ed3165e | 636 | detect_analog: |
cb75d97e | 637 | nv_encoder = find_encoder(connector, DCB_OUTPUT_ANALOG); |
f4053509 | 638 | if (!nv_encoder && !nouveau_tv_disable) |
cb75d97e | 639 | nv_encoder = find_encoder(connector, DCB_OUTPUT_TV); |
84b8081c | 640 | if (nv_encoder && force) { |
6ee73861 | 641 | struct drm_encoder *encoder = to_drm_encoder(nv_encoder); |
d58ded76 | 642 | const struct drm_encoder_helper_funcs *helper = |
6ee73861 BS |
643 | encoder->helper_private; |
644 | ||
645 | if (helper->detect(encoder, connector) == | |
646 | connector_status_connected) { | |
647 | nouveau_connector_set_encoder(connector, nv_encoder); | |
5addcf0a DA |
648 | conn_status = connector_status_connected; |
649 | goto out; | |
6ee73861 BS |
650 | } |
651 | ||
652 | } | |
653 | ||
5addcf0a DA |
654 | out: |
655 | ||
d61a5c10 LW |
656 | if (!drm_kms_helper_is_poll_worker()) { |
657 | pm_runtime_mark_last_busy(connector->dev->dev); | |
658 | pm_runtime_put_autosuspend(connector->dev->dev); | |
659 | } | |
5addcf0a DA |
660 | |
661 | return conn_status; | |
6ee73861 BS |
662 | } |
663 | ||
d17f395c | 664 | static enum drm_connector_status |
930a9e28 | 665 | nouveau_connector_detect_lvds(struct drm_connector *connector, bool force) |
d17f395c BS |
666 | { |
667 | struct drm_device *dev = connector->dev; | |
77145f1c | 668 | struct nouveau_drm *drm = nouveau_drm(dev); |
d17f395c BS |
669 | struct nouveau_connector *nv_connector = nouveau_connector(connector); |
670 | struct nouveau_encoder *nv_encoder = NULL; | |
671 | enum drm_connector_status status = connector_status_disconnected; | |
672 | ||
673 | /* Cleanup the previous EDID block. */ | |
674 | if (nv_connector->edid) { | |
675 | drm_mode_connector_update_edid_property(connector, NULL); | |
676 | kfree(nv_connector->edid); | |
677 | nv_connector->edid = NULL; | |
678 | } | |
679 | ||
cb75d97e | 680 | nv_encoder = find_encoder(connector, DCB_OUTPUT_LVDS); |
d17f395c BS |
681 | if (!nv_encoder) |
682 | return connector_status_disconnected; | |
683 | ||
a6ed76d7 | 684 | /* Try retrieving EDID via DDC */ |
77145f1c | 685 | if (!drm->vbios.fp_no_ddc) { |
930a9e28 | 686 | status = nouveau_connector_detect(connector, force); |
d17f395c BS |
687 | if (status == connector_status_connected) |
688 | goto out; | |
689 | } | |
690 | ||
a6ed76d7 BS |
691 | /* On some laptops (Sony, i'm looking at you) there appears to |
692 | * be no direct way of accessing the panel's EDID. The only | |
693 | * option available to us appears to be to ask ACPI for help.. | |
694 | * | |
695 | * It's important this check's before trying straps, one of the | |
696 | * said manufacturer's laptops are configured in such a way | |
697 | * the nouveau decides an entry in the VBIOS FP mode table is | |
698 | * valid - it's not (rh#613284) | |
699 | */ | |
700 | if (nv_encoder->dcb->lvdsconf.use_acpi_for_edid) { | |
df285500 | 701 | if ((nv_connector->edid = nouveau_acpi_edid(dev, connector))) { |
a6ed76d7 BS |
702 | status = connector_status_connected; |
703 | goto out; | |
704 | } | |
705 | } | |
706 | ||
d17f395c BS |
707 | /* If no EDID found above, and the VBIOS indicates a hardcoded |
708 | * modeline is avalilable for the panel, set it as the panel's | |
709 | * native mode and exit. | |
710 | */ | |
77145f1c | 711 | if (nouveau_bios_fp_mode(dev, NULL) && (drm->vbios.fp_no_ddc || |
d17f395c BS |
712 | nv_encoder->dcb->lvdsconf.use_straps_for_mode)) { |
713 | status = connector_status_connected; | |
714 | goto out; | |
715 | } | |
716 | ||
717 | /* Still nothing, some VBIOS images have a hardcoded EDID block | |
718 | * stored for the panel stored in them. | |
719 | */ | |
77145f1c | 720 | if (!drm->vbios.fp_no_ddc) { |
d17f395c BS |
721 | struct edid *edid = |
722 | (struct edid *)nouveau_bios_embedded_edid(dev); | |
723 | if (edid) { | |
a441dbb1 MS |
724 | nv_connector->edid = |
725 | kmemdup(edid, EDID_LENGTH, GFP_KERNEL); | |
726 | if (nv_connector->edid) | |
727 | status = connector_status_connected; | |
d17f395c BS |
728 | } |
729 | } | |
730 | ||
731 | out: | |
732 | #if defined(CONFIG_ACPI_BUTTON) || \ | |
733 | (defined(CONFIG_ACPI_BUTTON_MODULE) && defined(MODULE)) | |
734 | if (status == connector_status_connected && | |
735 | !nouveau_ignorelid && !acpi_lid_open()) | |
736 | status = connector_status_unknown; | |
737 | #endif | |
738 | ||
739 | drm_mode_connector_update_edid_property(connector, nv_connector->edid); | |
3195c5f9 | 740 | nouveau_connector_set_encoder(connector, nv_encoder); |
d17f395c BS |
741 | return status; |
742 | } | |
743 | ||
6ee73861 BS |
744 | static void |
745 | nouveau_connector_force(struct drm_connector *connector) | |
746 | { | |
77145f1c | 747 | struct nouveau_drm *drm = nouveau_drm(connector->dev); |
be079e97 | 748 | struct nouveau_connector *nv_connector = nouveau_connector(connector); |
6ee73861 BS |
749 | struct nouveau_encoder *nv_encoder; |
750 | int type; | |
751 | ||
befb51e9 | 752 | if (nv_connector->type == DCB_CONNECTOR_DVI_I) { |
6ee73861 | 753 | if (connector->force == DRM_FORCE_ON_DIGITAL) |
cb75d97e | 754 | type = DCB_OUTPUT_TMDS; |
6ee73861 | 755 | else |
cb75d97e | 756 | type = DCB_OUTPUT_ANALOG; |
6ee73861 | 757 | } else |
cb75d97e | 758 | type = DCB_OUTPUT_ANY; |
6ee73861 | 759 | |
e19b20bb | 760 | nv_encoder = find_encoder(connector, type); |
6ee73861 | 761 | if (!nv_encoder) { |
77145f1c | 762 | NV_ERROR(drm, "can't find encoder to force %s on!\n", |
8c6c361a | 763 | connector->name); |
6ee73861 BS |
764 | connector->status = connector_status_disconnected; |
765 | return; | |
766 | } | |
767 | ||
768 | nouveau_connector_set_encoder(connector, nv_encoder); | |
769 | } | |
770 | ||
771 | static int | |
772 | nouveau_connector_set_property(struct drm_connector *connector, | |
773 | struct drm_property *property, uint64_t value) | |
774 | { | |
616915ec | 775 | struct nouveau_conn_atom *asyc = nouveau_conn_atom(connector->state); |
6ee73861 BS |
776 | struct nouveau_connector *nv_connector = nouveau_connector(connector); |
777 | struct nouveau_encoder *nv_encoder = nv_connector->detected_encoder; | |
4a9f822f | 778 | struct drm_encoder *encoder = to_drm_encoder(nv_encoder); |
6ee73861 BS |
779 | int ret; |
780 | ||
616915ec BS |
781 | ret = connector->funcs->atomic_set_property(&nv_connector->base, |
782 | &asyc->state, | |
783 | property, value); | |
784 | if (ret) { | |
785 | if (nv_encoder && nv_encoder->dcb->type == DCB_OUTPUT_TV) | |
786 | return get_slave_funcs(encoder)->set_property( | |
787 | encoder, connector, property, value); | |
788 | return ret; | |
b29caa58 BS |
789 | } |
790 | ||
616915ec | 791 | nv_connector->scaling_mode = asyc->scaler.mode; |
616915ec | 792 | nv_connector->dithering_mode = asyc->dither.mode; |
b29caa58 | 793 | |
c2d926aa BS |
794 | if (connector->encoder && connector->encoder->crtc) { |
795 | ret = drm_crtc_helper_set_mode(connector->encoder->crtc, | |
796 | &connector->encoder->crtc->mode, | |
797 | connector->encoder->crtc->x, | |
798 | connector->encoder->crtc->y, | |
799 | NULL); | |
800 | if (!ret) | |
801 | return -EINVAL; | |
802 | } | |
6ee73861 | 803 | |
616915ec | 804 | return 0; |
6ee73861 BS |
805 | } |
806 | ||
807 | struct moderec { | |
808 | int hdisplay; | |
809 | int vdisplay; | |
810 | }; | |
811 | ||
812 | static struct moderec scaler_modes[] = { | |
813 | { 1920, 1200 }, | |
814 | { 1920, 1080 }, | |
815 | { 1680, 1050 }, | |
816 | { 1600, 1200 }, | |
817 | { 1400, 1050 }, | |
818 | { 1280, 1024 }, | |
819 | { 1280, 960 }, | |
820 | { 1152, 864 }, | |
821 | { 1024, 768 }, | |
822 | { 800, 600 }, | |
823 | { 720, 400 }, | |
824 | { 640, 480 }, | |
825 | { 640, 400 }, | |
826 | { 640, 350 }, | |
827 | {} | |
828 | }; | |
829 | ||
830 | static int | |
831 | nouveau_connector_scaler_modes_add(struct drm_connector *connector) | |
832 | { | |
833 | struct nouveau_connector *nv_connector = nouveau_connector(connector); | |
834 | struct drm_display_mode *native = nv_connector->native_mode, *m; | |
835 | struct drm_device *dev = connector->dev; | |
836 | struct moderec *mode = &scaler_modes[0]; | |
837 | int modes = 0; | |
838 | ||
839 | if (!native) | |
840 | return 0; | |
841 | ||
842 | while (mode->hdisplay) { | |
843 | if (mode->hdisplay <= native->hdisplay && | |
f0d15402 BS |
844 | mode->vdisplay <= native->vdisplay && |
845 | (mode->hdisplay != native->hdisplay || | |
846 | mode->vdisplay != native->vdisplay)) { | |
6ee73861 BS |
847 | m = drm_cvt_mode(dev, mode->hdisplay, mode->vdisplay, |
848 | drm_mode_vrefresh(native), false, | |
849 | false, false); | |
850 | if (!m) | |
851 | continue; | |
852 | ||
6ee73861 BS |
853 | drm_mode_probed_add(connector, m); |
854 | modes++; | |
855 | } | |
856 | ||
857 | mode++; | |
858 | } | |
859 | ||
860 | return modes; | |
861 | } | |
862 | ||
63221755 BS |
863 | static void |
864 | nouveau_connector_detect_depth(struct drm_connector *connector) | |
865 | { | |
77145f1c | 866 | struct nouveau_drm *drm = nouveau_drm(connector->dev); |
63221755 BS |
867 | struct nouveau_connector *nv_connector = nouveau_connector(connector); |
868 | struct nouveau_encoder *nv_encoder = nv_connector->detected_encoder; | |
77145f1c | 869 | struct nvbios *bios = &drm->vbios; |
63221755 BS |
870 | struct drm_display_mode *mode = nv_connector->native_mode; |
871 | bool duallink; | |
872 | ||
873 | /* if the edid is feeling nice enough to provide this info, use it */ | |
874 | if (nv_connector->edid && connector->display_info.bpc) | |
875 | return; | |
876 | ||
a6a17859 BS |
877 | /* EDID 1.4 is *supposed* to be supported on eDP, but, Apple... */ |
878 | if (nv_connector->type == DCB_CONNECTOR_eDP) { | |
879 | connector->display_info.bpc = 6; | |
880 | return; | |
881 | } | |
882 | ||
883 | /* we're out of options unless we're LVDS, default to 8bpc */ | |
cb75d97e | 884 | if (nv_encoder->dcb->type != DCB_OUTPUT_LVDS) { |
c8435362 | 885 | connector->display_info.bpc = 8; |
63221755 | 886 | return; |
c8435362 BS |
887 | } |
888 | ||
889 | connector->display_info.bpc = 6; | |
63221755 BS |
890 | |
891 | /* LVDS: panel straps */ | |
892 | if (bios->fp_no_ddc) { | |
893 | if (bios->fp.if_is_24bit) | |
894 | connector->display_info.bpc = 8; | |
895 | return; | |
896 | } | |
897 | ||
898 | /* LVDS: DDC panel, need to first determine the number of links to | |
899 | * know which if_is_24bit flag to check... | |
900 | */ | |
901 | if (nv_connector->edid && | |
befb51e9 | 902 | nv_connector->type == DCB_CONNECTOR_LVDS_SPWG) |
63221755 BS |
903 | duallink = ((u8 *)nv_connector->edid)[121] == 2; |
904 | else | |
905 | duallink = mode->clock >= bios->fp.duallink_transition_clk; | |
906 | ||
907 | if ((!duallink && (bios->fp.strapless_is_24bit & 1)) || | |
908 | ( duallink && (bios->fp.strapless_is_24bit & 2))) | |
909 | connector->display_info.bpc = 8; | |
910 | } | |
911 | ||
6ee73861 BS |
912 | static int |
913 | nouveau_connector_get_modes(struct drm_connector *connector) | |
914 | { | |
915 | struct drm_device *dev = connector->dev; | |
77145f1c | 916 | struct nouveau_drm *drm = nouveau_drm(dev); |
6ee73861 BS |
917 | struct nouveau_connector *nv_connector = nouveau_connector(connector); |
918 | struct nouveau_encoder *nv_encoder = nv_connector->detected_encoder; | |
4a9f822f | 919 | struct drm_encoder *encoder = to_drm_encoder(nv_encoder); |
6ee73861 BS |
920 | int ret = 0; |
921 | ||
d17f395c | 922 | /* destroy the native mode, the attached monitor could have changed. |
6ee73861 | 923 | */ |
d17f395c | 924 | if (nv_connector->native_mode) { |
6ee73861 BS |
925 | drm_mode_destroy(dev, nv_connector->native_mode); |
926 | nv_connector->native_mode = NULL; | |
927 | } | |
928 | ||
929 | if (nv_connector->edid) | |
930 | ret = drm_add_edid_modes(connector, nv_connector->edid); | |
d17f395c | 931 | else |
cb75d97e | 932 | if (nv_encoder->dcb->type == DCB_OUTPUT_LVDS && |
d17f395c | 933 | (nv_encoder->dcb->lvdsconf.use_straps_for_mode || |
77145f1c | 934 | drm->vbios.fp_no_ddc) && nouveau_bios_fp_mode(dev, NULL)) { |
80dad869 BS |
935 | struct drm_display_mode mode; |
936 | ||
937 | nouveau_bios_fp_mode(dev, &mode); | |
938 | nv_connector->native_mode = drm_mode_duplicate(dev, &mode); | |
d17f395c | 939 | } |
6ee73861 | 940 | |
d4c2c99b BS |
941 | /* Determine display colour depth for everything except LVDS now, |
942 | * DP requires this before mode_valid() is called. | |
943 | */ | |
944 | if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS) | |
945 | nouveau_connector_detect_depth(connector); | |
946 | ||
6ee73861 BS |
947 | /* Find the native mode if this is a digital panel, if we didn't |
948 | * find any modes through DDC previously add the native mode to | |
949 | * the list of modes. | |
950 | */ | |
951 | if (!nv_connector->native_mode) | |
616915ec | 952 | nv_connector->native_mode = nouveau_conn_native_mode(connector); |
6ee73861 BS |
953 | if (ret == 0 && nv_connector->native_mode) { |
954 | struct drm_display_mode *mode; | |
955 | ||
956 | mode = drm_mode_duplicate(dev, nv_connector->native_mode); | |
957 | drm_mode_probed_add(connector, mode); | |
958 | ret = 1; | |
959 | } | |
960 | ||
d4c2c99b BS |
961 | /* Determine LVDS colour depth, must happen after determining |
962 | * "native" mode as some VBIOS tables require us to use the | |
963 | * pixel clock as part of the lookup... | |
63221755 | 964 | */ |
d4c2c99b BS |
965 | if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS) |
966 | nouveau_connector_detect_depth(connector); | |
63221755 | 967 | |
cb75d97e | 968 | if (nv_encoder->dcb->type == DCB_OUTPUT_TV) |
4a9f822f | 969 | ret = get_slave_funcs(encoder)->get_modes(encoder, connector); |
6ee73861 | 970 | |
befb51e9 BS |
971 | if (nv_connector->type == DCB_CONNECTOR_LVDS || |
972 | nv_connector->type == DCB_CONNECTOR_LVDS_SPWG || | |
973 | nv_connector->type == DCB_CONNECTOR_eDP) | |
6ee73861 BS |
974 | ret += nouveau_connector_scaler_modes_add(connector); |
975 | ||
976 | return ret; | |
977 | } | |
978 | ||
1f5bd443 | 979 | static unsigned |
1a0c96c0 | 980 | get_tmds_link_bandwidth(struct drm_connector *connector, bool hdmi) |
1f5bd443 FJ |
981 | { |
982 | struct nouveau_connector *nv_connector = nouveau_connector(connector); | |
77145f1c | 983 | struct nouveau_drm *drm = nouveau_drm(connector->dev); |
cb75d97e | 984 | struct dcb_output *dcb = nv_connector->detected_encoder->dcb; |
1f5bd443 | 985 | |
1a0c96c0 IM |
986 | if (hdmi) { |
987 | if (nouveau_hdmimhz > 0) | |
988 | return nouveau_hdmimhz * 1000; | |
989 | /* Note: these limits are conservative, some Fermi's | |
990 | * can do 297 MHz. Unclear how this can be determined. | |
991 | */ | |
1167c6bc | 992 | if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_KEPLER) |
1a0c96c0 | 993 | return 297000; |
1167c6bc | 994 | if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_FERMI) |
1a0c96c0 IM |
995 | return 225000; |
996 | } | |
1f5bd443 | 997 | if (dcb->location != DCB_LOC_ON_CHIP || |
1167c6bc | 998 | drm->client.device.info.chipset >= 0x46) |
1f5bd443 | 999 | return 165000; |
1167c6bc | 1000 | else if (drm->client.device.info.chipset >= 0x40) |
1f5bd443 | 1001 | return 155000; |
1167c6bc | 1002 | else if (drm->client.device.info.chipset >= 0x18) |
1f5bd443 FJ |
1003 | return 135000; |
1004 | else | |
1005 | return 112000; | |
1006 | } | |
1007 | ||
6ee73861 BS |
1008 | static int |
1009 | nouveau_connector_mode_valid(struct drm_connector *connector, | |
1010 | struct drm_display_mode *mode) | |
1011 | { | |
6ee73861 BS |
1012 | struct nouveau_connector *nv_connector = nouveau_connector(connector); |
1013 | struct nouveau_encoder *nv_encoder = nv_connector->detected_encoder; | |
4a9f822f | 1014 | struct drm_encoder *encoder = to_drm_encoder(nv_encoder); |
6ee73861 BS |
1015 | unsigned min_clock = 25000, max_clock = min_clock; |
1016 | unsigned clock = mode->clock; | |
1a0c96c0 | 1017 | bool hdmi; |
6ee73861 BS |
1018 | |
1019 | switch (nv_encoder->dcb->type) { | |
cb75d97e | 1020 | case DCB_OUTPUT_LVDS: |
26099a74 BS |
1021 | if (nv_connector->native_mode && |
1022 | (mode->hdisplay > nv_connector->native_mode->hdisplay || | |
1023 | mode->vdisplay > nv_connector->native_mode->vdisplay)) | |
6ee73861 BS |
1024 | return MODE_PANEL; |
1025 | ||
1026 | min_clock = 0; | |
1027 | max_clock = 400000; | |
1028 | break; | |
cb75d97e | 1029 | case DCB_OUTPUT_TMDS: |
1a0c96c0 IM |
1030 | hdmi = drm_detect_hdmi_monitor(nv_connector->edid); |
1031 | max_clock = get_tmds_link_bandwidth(connector, hdmi); | |
1032 | if (!hdmi && nouveau_duallink && | |
1033 | nv_encoder->dcb->duallink_possible) | |
1f5bd443 | 1034 | max_clock *= 2; |
6ee73861 | 1035 | break; |
cb75d97e | 1036 | case DCB_OUTPUT_ANALOG: |
6ee73861 BS |
1037 | max_clock = nv_encoder->dcb->crtconf.maxfreq; |
1038 | if (!max_clock) | |
1039 | max_clock = 350000; | |
1040 | break; | |
cb75d97e | 1041 | case DCB_OUTPUT_TV: |
4a9f822f | 1042 | return get_slave_funcs(encoder)->mode_valid(encoder, mode); |
cb75d97e | 1043 | case DCB_OUTPUT_DP: |
75a1fccf BS |
1044 | max_clock = nv_encoder->dp.link_nr; |
1045 | max_clock *= nv_encoder->dp.link_bw; | |
d4c2c99b | 1046 | clock = clock * (connector->display_info.bpc * 3) / 10; |
6ee73861 | 1047 | break; |
e7cc51c5 | 1048 | default: |
af7db03e | 1049 | BUG(); |
e7cc51c5 | 1050 | return MODE_BAD; |
6ee73861 BS |
1051 | } |
1052 | ||
37aa2243 AB |
1053 | if ((mode->flags & DRM_MODE_FLAG_3D_MASK) == DRM_MODE_FLAG_3D_FRAME_PACKING) |
1054 | clock *= 2; | |
1055 | ||
6ee73861 BS |
1056 | if (clock < min_clock) |
1057 | return MODE_CLOCK_LOW; | |
1058 | ||
1059 | if (clock > max_clock) | |
1060 | return MODE_CLOCK_HIGH; | |
1061 | ||
1062 | return MODE_OK; | |
1063 | } | |
1064 | ||
1065 | static struct drm_encoder * | |
1066 | nouveau_connector_best_encoder(struct drm_connector *connector) | |
1067 | { | |
1068 | struct nouveau_connector *nv_connector = nouveau_connector(connector); | |
1069 | ||
1070 | if (nv_connector->detected_encoder) | |
1071 | return to_drm_encoder(nv_connector->detected_encoder); | |
1072 | ||
1073 | return NULL; | |
1074 | } | |
1075 | ||
1076 | static const struct drm_connector_helper_funcs | |
1077 | nouveau_connector_helper_funcs = { | |
1078 | .get_modes = nouveau_connector_get_modes, | |
1079 | .mode_valid = nouveau_connector_mode_valid, | |
1080 | .best_encoder = nouveau_connector_best_encoder, | |
1081 | }; | |
1082 | ||
1083 | static const struct drm_connector_funcs | |
1084 | nouveau_connector_funcs = { | |
7d902c05 | 1085 | .dpms = drm_helper_connector_dpms, |
616915ec | 1086 | .reset = nouveau_conn_reset, |
6ee73861 | 1087 | .detect = nouveau_connector_detect, |
616915ec | 1088 | .force = nouveau_connector_force, |
6ee73861 BS |
1089 | .fill_modes = drm_helper_probe_single_connector_modes, |
1090 | .set_property = nouveau_connector_set_property, | |
616915ec BS |
1091 | .destroy = nouveau_connector_destroy, |
1092 | .atomic_duplicate_state = nouveau_conn_atomic_duplicate_state, | |
1093 | .atomic_destroy_state = nouveau_conn_atomic_destroy_state, | |
1094 | .atomic_set_property = nouveau_conn_atomic_set_property, | |
1095 | .atomic_get_property = nouveau_conn_atomic_get_property, | |
6ee73861 BS |
1096 | }; |
1097 | ||
d17f395c BS |
1098 | static const struct drm_connector_funcs |
1099 | nouveau_connector_funcs_lvds = { | |
7d902c05 | 1100 | .dpms = drm_helper_connector_dpms, |
616915ec | 1101 | .reset = nouveau_conn_reset, |
d17f395c | 1102 | .detect = nouveau_connector_detect_lvds, |
616915ec | 1103 | .force = nouveau_connector_force, |
d17f395c BS |
1104 | .fill_modes = drm_helper_probe_single_connector_modes, |
1105 | .set_property = nouveau_connector_set_property, | |
616915ec BS |
1106 | .destroy = nouveau_connector_destroy, |
1107 | .atomic_duplicate_state = nouveau_conn_atomic_duplicate_state, | |
1108 | .atomic_destroy_state = nouveau_conn_atomic_destroy_state, | |
1109 | .atomic_set_property = nouveau_conn_atomic_set_property, | |
1110 | .atomic_get_property = nouveau_conn_atomic_get_property, | |
d17f395c | 1111 | }; |
6ee73861 | 1112 | |
79ca2770 | 1113 | static int |
80bc340b | 1114 | nouveau_connector_hotplug(struct nvif_notify *notify) |
4f47643d BS |
1115 | { |
1116 | struct nouveau_connector *nv_connector = | |
79ca2770 | 1117 | container_of(notify, typeof(*nv_connector), hpd); |
4f47643d | 1118 | struct drm_connector *connector = &nv_connector->base; |
456b0579 | 1119 | struct nouveau_drm *drm = nouveau_drm(connector->dev); |
79ca2770 | 1120 | const struct nvif_notify_conn_rep_v0 *rep = notify->data; |
456b0579 | 1121 | const char *name = connector->name; |
f479c0ba | 1122 | struct nouveau_encoder *nv_encoder; |
4f47643d | 1123 | |
79ca2770 | 1124 | if (rep->mask & NVIF_NOTIFY_CONN_V0_IRQ) { |
f479c0ba BS |
1125 | NV_DEBUG(drm, "service %s\n", name); |
1126 | if ((nv_encoder = find_encoder(connector, DCB_OUTPUT_DP))) | |
1127 | nv50_mstm_service(nv_encoder->dp.mstm); | |
456b0579 | 1128 | } else { |
79ca2770 | 1129 | bool plugged = (rep->mask != NVIF_NOTIFY_CONN_V0_UNPLUG); |
4f47643d | 1130 | |
456b0579 | 1131 | NV_DEBUG(drm, "%splugged %s\n", plugged ? "" : "un", name); |
f479c0ba BS |
1132 | if ((nv_encoder = find_encoder(connector, DCB_OUTPUT_DP))) { |
1133 | if (!plugged) | |
1134 | nv50_mstm_remove(nv_encoder->dp.mstm); | |
1135 | } | |
1136 | ||
456b0579 BS |
1137 | drm_helper_hpd_irq_event(connector->dev); |
1138 | } | |
1139 | ||
80bc340b | 1140 | return NVIF_NOTIFY_KEEP; |
4f47643d BS |
1141 | } |
1142 | ||
8894f491 | 1143 | static ssize_t |
2aa5eac5 | 1144 | nouveau_connector_aux_xfer(struct drm_dp_aux *obj, struct drm_dp_aux_msg *msg) |
8894f491 BS |
1145 | { |
1146 | struct nouveau_connector *nv_connector = | |
2aa5eac5 | 1147 | container_of(obj, typeof(*nv_connector), aux); |
8894f491 | 1148 | struct nouveau_encoder *nv_encoder; |
2aa5eac5 | 1149 | struct nvkm_i2c_aux *aux; |
1af5c410 | 1150 | u8 size = msg->size; |
8894f491 BS |
1151 | int ret; |
1152 | ||
1153 | nv_encoder = find_encoder(&nv_connector->base, DCB_OUTPUT_DP); | |
2aa5eac5 | 1154 | if (!nv_encoder || !(aux = nv_encoder->aux)) |
8894f491 BS |
1155 | return -ENODEV; |
1156 | if (WARN_ON(msg->size > 16)) | |
1157 | return -E2BIG; | |
8894f491 | 1158 | |
2aa5eac5 | 1159 | ret = nvkm_i2c_aux_acquire(aux); |
8894f491 BS |
1160 | if (ret) |
1161 | return ret; | |
1162 | ||
2aa5eac5 | 1163 | ret = nvkm_i2c_aux_xfer(aux, false, msg->request, msg->address, |
1af5c410 | 1164 | msg->buffer, &size); |
2aa5eac5 | 1165 | nvkm_i2c_aux_release(aux); |
8894f491 BS |
1166 | if (ret >= 0) { |
1167 | msg->reply = ret; | |
1af5c410 | 1168 | return size; |
8894f491 BS |
1169 | } |
1170 | ||
1171 | return ret; | |
1172 | } | |
1173 | ||
befb51e9 BS |
1174 | static int |
1175 | drm_conntype_from_dcb(enum dcb_connector_type dcb) | |
1176 | { | |
1177 | switch (dcb) { | |
1178 | case DCB_CONNECTOR_VGA : return DRM_MODE_CONNECTOR_VGA; | |
1179 | case DCB_CONNECTOR_TV_0 : | |
1180 | case DCB_CONNECTOR_TV_1 : | |
1181 | case DCB_CONNECTOR_TV_3 : return DRM_MODE_CONNECTOR_TV; | |
fa2c113a BS |
1182 | case DCB_CONNECTOR_DMS59_0 : |
1183 | case DCB_CONNECTOR_DMS59_1 : | |
befb51e9 BS |
1184 | case DCB_CONNECTOR_DVI_I : return DRM_MODE_CONNECTOR_DVII; |
1185 | case DCB_CONNECTOR_DVI_D : return DRM_MODE_CONNECTOR_DVID; | |
1186 | case DCB_CONNECTOR_LVDS : | |
1187 | case DCB_CONNECTOR_LVDS_SPWG: return DRM_MODE_CONNECTOR_LVDS; | |
4abb410a BS |
1188 | case DCB_CONNECTOR_DMS59_DP0: |
1189 | case DCB_CONNECTOR_DMS59_DP1: | |
befb51e9 BS |
1190 | case DCB_CONNECTOR_DP : return DRM_MODE_CONNECTOR_DisplayPort; |
1191 | case DCB_CONNECTOR_eDP : return DRM_MODE_CONNECTOR_eDP; | |
1192 | case DCB_CONNECTOR_HDMI_0 : | |
6bd9293e BS |
1193 | case DCB_CONNECTOR_HDMI_1 : |
1194 | case DCB_CONNECTOR_HDMI_C : return DRM_MODE_CONNECTOR_HDMIA; | |
df00d5da | 1195 | case DCB_CONNECTOR_WFD : return DRM_MODE_CONNECTOR_VIRTUAL; |
befb51e9 BS |
1196 | default: |
1197 | break; | |
1198 | } | |
1199 | ||
1200 | return DRM_MODE_CONNECTOR_Unknown; | |
1201 | } | |
1202 | ||
8f1a6086 BS |
1203 | struct drm_connector * |
1204 | nouveau_connector_create(struct drm_device *dev, int index) | |
6ee73861 | 1205 | { |
d17f395c | 1206 | const struct drm_connector_funcs *funcs = &nouveau_connector_funcs; |
77145f1c | 1207 | struct nouveau_drm *drm = nouveau_drm(dev); |
77145f1c | 1208 | struct nouveau_display *disp = nouveau_display(dev); |
6ee73861 BS |
1209 | struct nouveau_connector *nv_connector = NULL; |
1210 | struct drm_connector *connector; | |
2fa67f12 | 1211 | int type, ret = 0; |
befb51e9 | 1212 | bool dummy; |
6ee73861 | 1213 | |
befb51e9 BS |
1214 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
1215 | nv_connector = nouveau_connector(connector); | |
1216 | if (nv_connector->index == index) | |
1217 | return connector; | |
6ee73861 BS |
1218 | } |
1219 | ||
7f612d87 BS |
1220 | nv_connector = kzalloc(sizeof(*nv_connector), GFP_KERNEL); |
1221 | if (!nv_connector) | |
8f1a6086 | 1222 | return ERR_PTR(-ENOMEM); |
befb51e9 | 1223 | |
7f612d87 | 1224 | connector = &nv_connector->base; |
befb51e9 BS |
1225 | nv_connector->index = index; |
1226 | ||
1227 | /* attempt to parse vbios connector type and hotplug gpio */ | |
cb75d97e | 1228 | nv_connector->dcb = olddcb_conn(dev, index); |
befb51e9 | 1229 | if (nv_connector->dcb) { |
befb51e9 | 1230 | u32 entry = ROM16(nv_connector->dcb[0]); |
cb75d97e | 1231 | if (olddcb_conntab(dev)[3] >= 4) |
befb51e9 BS |
1232 | entry |= (u32)ROM16(nv_connector->dcb[2]) << 16; |
1233 | ||
befb51e9 BS |
1234 | nv_connector->type = nv_connector->dcb[0]; |
1235 | if (drm_conntype_from_dcb(nv_connector->type) == | |
1236 | DRM_MODE_CONNECTOR_Unknown) { | |
77145f1c | 1237 | NV_WARN(drm, "unknown connector type %02x\n", |
befb51e9 BS |
1238 | nv_connector->type); |
1239 | nv_connector->type = DCB_CONNECTOR_NONE; | |
1240 | } | |
7f612d87 | 1241 | |
befb51e9 BS |
1242 | /* Gigabyte NX85T */ |
1243 | if (nv_match_device(dev, 0x0421, 0x1458, 0x344c)) { | |
1244 | if (nv_connector->type == DCB_CONNECTOR_HDMI_1) | |
1245 | nv_connector->type = DCB_CONNECTOR_DVI_I; | |
1246 | } | |
6ee73861 | 1247 | |
befb51e9 BS |
1248 | /* Gigabyte GV-NX86T512H */ |
1249 | if (nv_match_device(dev, 0x0402, 0x1458, 0x3455)) { | |
1250 | if (nv_connector->type == DCB_CONNECTOR_HDMI_1) | |
1251 | nv_connector->type = DCB_CONNECTOR_DVI_I; | |
1252 | } | |
1253 | } else { | |
1254 | nv_connector->type = DCB_CONNECTOR_NONE; | |
befb51e9 BS |
1255 | } |
1256 | ||
1257 | /* no vbios data, or an unknown dcb connector type - attempt to | |
1258 | * figure out something suitable ourselves | |
1259 | */ | |
1260 | if (nv_connector->type == DCB_CONNECTOR_NONE) { | |
77145f1c BS |
1261 | struct nouveau_drm *drm = nouveau_drm(dev); |
1262 | struct dcb_table *dcbt = &drm->vbios.dcb; | |
befb51e9 BS |
1263 | u32 encoders = 0; |
1264 | int i; | |
1265 | ||
1266 | for (i = 0; i < dcbt->entries; i++) { | |
1267 | if (dcbt->entry[i].connector == nv_connector->index) | |
1268 | encoders |= (1 << dcbt->entry[i].type); | |
1269 | } | |
6ee73861 | 1270 | |
cb75d97e BS |
1271 | if (encoders & (1 << DCB_OUTPUT_DP)) { |
1272 | if (encoders & (1 << DCB_OUTPUT_TMDS)) | |
befb51e9 BS |
1273 | nv_connector->type = DCB_CONNECTOR_DP; |
1274 | else | |
1275 | nv_connector->type = DCB_CONNECTOR_eDP; | |
1276 | } else | |
cb75d97e BS |
1277 | if (encoders & (1 << DCB_OUTPUT_TMDS)) { |
1278 | if (encoders & (1 << DCB_OUTPUT_ANALOG)) | |
befb51e9 BS |
1279 | nv_connector->type = DCB_CONNECTOR_DVI_I; |
1280 | else | |
1281 | nv_connector->type = DCB_CONNECTOR_DVI_D; | |
1282 | } else | |
cb75d97e | 1283 | if (encoders & (1 << DCB_OUTPUT_ANALOG)) { |
befb51e9 BS |
1284 | nv_connector->type = DCB_CONNECTOR_VGA; |
1285 | } else | |
cb75d97e | 1286 | if (encoders & (1 << DCB_OUTPUT_LVDS)) { |
befb51e9 BS |
1287 | nv_connector->type = DCB_CONNECTOR_LVDS; |
1288 | } else | |
cb75d97e | 1289 | if (encoders & (1 << DCB_OUTPUT_TV)) { |
befb51e9 BS |
1290 | nv_connector->type = DCB_CONNECTOR_TV_0; |
1291 | } | |
1292 | } | |
2fa67f12 | 1293 | |
8894f491 BS |
1294 | switch ((type = drm_conntype_from_dcb(nv_connector->type))) { |
1295 | case DRM_MODE_CONNECTOR_LVDS: | |
befb51e9 | 1296 | ret = nouveau_bios_parse_lvds_table(dev, 0, &dummy, &dummy); |
2fa67f12 | 1297 | if (ret) { |
77145f1c | 1298 | NV_ERROR(drm, "Error parsing LVDS table, disabling\n"); |
befb51e9 BS |
1299 | kfree(nv_connector); |
1300 | return ERR_PTR(ret); | |
2fa67f12 | 1301 | } |
befb51e9 BS |
1302 | |
1303 | funcs = &nouveau_connector_funcs_lvds; | |
8894f491 BS |
1304 | break; |
1305 | case DRM_MODE_CONNECTOR_DisplayPort: | |
1306 | case DRM_MODE_CONNECTOR_eDP: | |
1307 | nv_connector->aux.dev = dev->dev; | |
1308 | nv_connector->aux.transfer = nouveau_connector_aux_xfer; | |
1309 | ret = drm_dp_aux_register(&nv_connector->aux); | |
1310 | if (ret) { | |
1311 | NV_ERROR(drm, "failed to register aux channel\n"); | |
1312 | kfree(nv_connector); | |
1313 | return ERR_PTR(ret); | |
1314 | } | |
1315 | ||
8896ceef | 1316 | funcs = &nouveau_connector_funcs; |
8894f491 BS |
1317 | break; |
1318 | default: | |
1319 | funcs = &nouveau_connector_funcs; | |
1320 | break; | |
7f612d87 BS |
1321 | } |
1322 | ||
0f18d276 AB |
1323 | /* HDMI 3D support */ |
1324 | if ((disp->disp.oclass >= G82_DISP) | |
1325 | && ((type == DRM_MODE_CONNECTOR_DisplayPort) | |
1326 | || (type == DRM_MODE_CONNECTOR_eDP) | |
1327 | || (type == DRM_MODE_CONNECTOR_HDMIA))) | |
1328 | connector->stereo_allowed = true; | |
1329 | ||
befb51e9 BS |
1330 | /* defaults, will get overridden in detect() */ |
1331 | connector->interlace_allowed = false; | |
1332 | connector->doublescan_allowed = false; | |
1333 | ||
1334 | drm_connector_init(dev, connector, funcs, type); | |
1335 | drm_connector_helper_add(connector, &nouveau_connector_helper_funcs); | |
1336 | ||
56182b8b BS |
1337 | connector->funcs->reset(connector); |
1338 | nouveau_conn_attach_properties(connector); | |
df26bc9c | 1339 | |
56182b8b | 1340 | /* Default scaling mode */ |
befb51e9 | 1341 | switch (nv_connector->type) { |
0ea5fe8a BS |
1342 | case DCB_CONNECTOR_LVDS: |
1343 | case DCB_CONNECTOR_LVDS_SPWG: | |
1344 | case DCB_CONNECTOR_eDP: | |
1345 | /* see note in nouveau_connector_set_property() */ | |
1346 | if (disp->disp.oclass < NV50_DISP) { | |
1347 | nv_connector->scaling_mode = DRM_MODE_SCALE_FULLSCREEN; | |
1348 | break; | |
1349 | } | |
be079e97 BS |
1350 | nv_connector->scaling_mode = DRM_MODE_SCALE_NONE; |
1351 | break; | |
1352 | default: | |
0ea5fe8a | 1353 | nv_connector->scaling_mode = DRM_MODE_SCALE_NONE; |
7d95216e BS |
1354 | break; |
1355 | } | |
be079e97 | 1356 | |
7d95216e BS |
1357 | /* dithering properties */ |
1358 | switch (nv_connector->type) { | |
1359 | case DCB_CONNECTOR_TV_0: | |
1360 | case DCB_CONNECTOR_TV_1: | |
1361 | case DCB_CONNECTOR_TV_3: | |
1362 | case DCB_CONNECTOR_VGA: | |
1363 | break; | |
1364 | default: | |
56182b8b | 1365 | nv_connector->dithering_mode = DITHERING_MODE_AUTO; |
be079e97 | 1366 | break; |
6ee73861 BS |
1367 | } |
1368 | ||
a01ca78c BS |
1369 | ret = nvif_notify_init(&disp->disp, nouveau_connector_hotplug, true, |
1370 | NV04_DISP_NTFY_CONN, | |
79ca2770 BS |
1371 | &(struct nvif_notify_conn_req_v0) { |
1372 | .mask = NVIF_NOTIFY_CONN_V0_ANY, | |
1373 | .conn = index, | |
1374 | }, | |
1375 | sizeof(struct nvif_notify_conn_req_v0), | |
1376 | sizeof(struct nvif_notify_conn_rep_v0), | |
1377 | &nv_connector->hpd); | |
456b0579 BS |
1378 | if (ret) |
1379 | connector->polled = DRM_CONNECTOR_POLL_CONNECT; | |
1380 | else | |
4f47643d | 1381 | connector->polled = DRM_CONNECTOR_POLL_HPD; |
fce2bad0 | 1382 | |
34ea3d38 | 1383 | drm_connector_register(connector); |
befb51e9 | 1384 | return connector; |
6ee73861 | 1385 | } |