diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-07-06 07:21:42 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-09-20 02:05:48 -0400 |
| commit | 02e4f5877dc7b963b3dd2beaf9664cf29c12d728 (patch) | |
| tree | f374377a38bb946b65e43f34427ee07e53468ef7 /drivers/gpu/drm/nouveau/nv50_display.c | |
| parent | 4784e4aa47a1754cdd1be24fd5106b722c4c137d (diff) | |
drm/nouveau/bios: allow passing in crtc to the init table parser
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 5754c0ac8937..8260303c2fca 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c | |||
| @@ -689,7 +689,7 @@ nv50_display_unk10_handler(struct drm_device *dev) | |||
| 689 | struct dcb_entry *dcb = &dev_priv->vbios.dcb.entry[i]; | 689 | struct dcb_entry *dcb = &dev_priv->vbios.dcb.entry[i]; |
| 690 | 690 | ||
| 691 | if (dcb->type == type && (dcb->or & (1 << or))) { | 691 | if (dcb->type == type && (dcb->or & (1 << or))) { |
| 692 | nouveau_bios_run_display_table(dev, dcb, 0, -1); | 692 | nouveau_bios_run_display_table(dev, 0, -1, dcb, -1); |
| 693 | disp->irq.dcb = dcb; | 693 | disp->irq.dcb = dcb; |
| 694 | goto ack; | 694 | goto ack; |
| 695 | } | 695 | } |
| @@ -744,7 +744,7 @@ nv50_display_unk20_handler(struct drm_device *dev) | |||
| 744 | NV_DEBUG_KMS(dev, "0x610030: 0x%08x\n", unk30); | 744 | NV_DEBUG_KMS(dev, "0x610030: 0x%08x\n", unk30); |
| 745 | dcb = disp->irq.dcb; | 745 | dcb = disp->irq.dcb; |
| 746 | if (dcb) { | 746 | if (dcb) { |
| 747 | nouveau_bios_run_display_table(dev, dcb, 0, -2); | 747 | nouveau_bios_run_display_table(dev, 0, -2, dcb, -1); |
| 748 | disp->irq.dcb = NULL; | 748 | disp->irq.dcb = NULL; |
| 749 | } | 749 | } |
| 750 | 750 | ||
| @@ -828,7 +828,7 @@ nv50_display_unk20_handler(struct drm_device *dev) | |||
| 828 | } | 828 | } |
| 829 | 829 | ||
| 830 | script = nv50_display_script_select(dev, dcb, mc, pclk); | 830 | script = nv50_display_script_select(dev, dcb, mc, pclk); |
| 831 | nouveau_bios_run_display_table(dev, dcb, script, pclk); | 831 | nouveau_bios_run_display_table(dev, script, pclk, dcb, -1); |
| 832 | 832 | ||
| 833 | nv50_display_unk20_dp_hack(dev, dcb); | 833 | nv50_display_unk20_dp_hack(dev, dcb); |
| 834 | 834 | ||
| @@ -895,7 +895,7 @@ nv50_display_unk40_handler(struct drm_device *dev) | |||
| 895 | if (!dcb) | 895 | if (!dcb) |
| 896 | goto ack; | 896 | goto ack; |
| 897 | 897 | ||
| 898 | nouveau_bios_run_display_table(dev, dcb, script, -pclk); | 898 | nouveau_bios_run_display_table(dev, script, -pclk, dcb, -1); |
| 899 | nv50_display_unk40_dp_set_tmds(dev, dcb); | 899 | nv50_display_unk40_dp_set_tmds(dev, dcb); |
| 900 | 900 | ||
| 901 | ack: | 901 | ack: |
