diff options
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index f6c615b228d4..974b0f8ae048 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c | |||
| @@ -6166,22 +6166,14 @@ parse_dcb15_entry(struct drm_device *dev, struct dcb_table *dcb, | |||
| 6166 | entry->type = OUTPUT_TV; | 6166 | entry->type = OUTPUT_TV; |
| 6167 | break; | 6167 | break; |
| 6168 | case 2: | 6168 | case 2: |
| 6169 | case 3: | ||
| 6170 | entry->type = OUTPUT_LVDS; | ||
| 6171 | break; | ||
| 6172 | case 4: | 6169 | case 4: |
| 6173 | switch ((conn & 0x000000f0) >> 4) { | 6170 | if (conn & 0x10) |
| 6174 | case 0: | ||
| 6175 | entry->type = OUTPUT_TMDS; | ||
| 6176 | break; | ||
| 6177 | case 1: | ||
| 6178 | entry->type = OUTPUT_LVDS; | 6171 | entry->type = OUTPUT_LVDS; |
| 6179 | break; | 6172 | else |
| 6180 | default: | 6173 | entry->type = OUTPUT_TMDS; |
| 6181 | NV_ERROR(dev, "Unknown DCB subtype 4/%d\n", | 6174 | break; |
| 6182 | (conn & 0x000000f0) >> 4); | 6175 | case 3: |
| 6183 | return false; | 6176 | entry->type = OUTPUT_LVDS; |
| 6184 | } | ||
| 6185 | break; | 6177 | break; |
| 6186 | default: | 6178 | default: |
| 6187 | NV_ERROR(dev, "Unknown DCB type %d\n", conn & 0x0000000f); | 6179 | NV_ERROR(dev, "Unknown DCB type %d\n", conn & 0x0000000f); |