diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-11-18 04:23:59 +0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 13:01:41 +0400 |
| commit | befb51e9c97e783c86a1da27bdda3a638d2f02c7 (patch) | |
| tree | 320f1a7a6d730decc566542e49e17c1a680956c4 /drivers/gpu/drm/nouveau/nouveau_dp.c | |
| parent | f553b79c03f0dbd52f6f03abe8233a2bef8cbd0d (diff) | |
| download | linux-befb51e9c97e783c86a1da27bdda3a638d2f02c7.tar.xz | |
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/nouveau_dp.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_dp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c index 07bac3602453..02b00c827da3 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dp.c +++ b/drivers/gpu/drm/nouveau/nouveau_dp.c @@ -587,7 +587,7 @@ nouveau_dp_link_train(struct drm_encoder *encoder, u32 datarate) * we take during link training (DP_SET_POWER is one), we need * to ignore them for the moment to avoid races. */ - pgpio->irq_enable(dev, nv_connector->dcb->gpio_tag, false); + pgpio->irq_enable(dev, nv_connector->hpd, false); /* enable down-spreading, if possible */ if (dp.table[1] >= 16) { @@ -636,7 +636,7 @@ nouveau_dp_link_train(struct drm_encoder *encoder, u32 datarate) nouveau_bios_run_init_table(dev, ROM16(dp.entry[8]), dp.dcb, dp.crtc); /* re-enable hotplug detect */ - pgpio->irq_enable(dev, nv_connector->dcb->gpio_tag, true); + pgpio->irq_enable(dev, nv_connector->hpd, true); return true; } |