diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-11-18 10:23:59 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 19:01:41 +1000 |
| commit | befb51e9c97e783c86a1da27bdda3a638d2f02c7 (patch) | |
| tree | 320f1a7a6d730decc566542e49e17c1a680956c4 /drivers/gpu/drm/nouveau/nv50_display.c | |
| parent | f553b79c03f0dbd52f6f03abe8233a2bef8cbd0d (diff) | |
drm/nouveau/disp: parse connector info directly in nouveau_connector.c
Another case where we parsed vbios data to some structs, then again use
that info once to construct another set of data. Skip the intermediate
step.
This is also slightly improved in that we can now use DCB 3.x connector
table info, which will allow NV4x to gain hotplug support, and to make
quirks for SPWG LVDS panels unnecessary.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index a3d28a1e8bb..9708b94a0a7 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -241,10 +241,10 @@ nv50_display_init(struct drm_device *dev) list_for_each_entry(connector, &dev->mode_config.connector_list, head) { struct nouveau_connector *conn = nouveau_connector(connector); - if (conn->dcb->gpio_tag == 0xff) + if (conn->hpd == DCB_GPIO_UNUSED) continue; - pgpio->irq_enable(dev, conn->dcb->gpio_tag, true); + pgpio->irq_enable(dev, conn->hpd, true); } ret = nv50_evo_init(dev); @@ -581,7 +581,7 @@ nv50_display_script_select(struct drm_device *dev, struct dcb_entry *dcb, } else { /* determine number of lvds links */ if (nv_connector && nv_connector->edid && - nv_connector->dcb->type == DCB_CONNECTOR_LVDS_SPWG) { + nv_connector->type == DCB_CONNECTOR_LVDS_SPWG) { /* http://www.spwg.org */ if (((u8 *)nv_connector->edid)[121] == 2) script |= 0x0100; |