diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-09-03 21:01:42 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-09-03 23:47:07 -0400 |
| commit | 4b31ebcf69a48d5d70cf26cea080bd0818fdd9af (patch) | |
| tree | 0ce008c6a6a682998011f8ff7d81672e3abca950 | |
| parent | 5087f51da805f53cba7366f70d596e7bde2a5486 (diff) | |
drm/nv50-/kms: assume analog display connected if load on any pin
Fixes a VGA monitor with a dodgy red (in this case) pin not being
detected.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 9d2092a5ed38..f8e66c08b11a 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c | |||
| @@ -1583,7 +1583,7 @@ nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector) | |||
| 1583 | load = 340; | 1583 | load = 340; |
| 1584 | 1584 | ||
| 1585 | ret = nv_exec(disp->core, NV50_DISP_DAC_LOAD + or, &load, sizeof(load)); | 1585 | ret = nv_exec(disp->core, NV50_DISP_DAC_LOAD + or, &load, sizeof(load)); |
| 1586 | if (ret || load != 7) | 1586 | if (ret || !load) |
| 1587 | return connector_status_disconnected; | 1587 | return connector_status_disconnected; |
| 1588 | 1588 | ||
| 1589 | return connector_status_connected; | 1589 | return connector_status_connected; |