summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nv50_display.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-02-24 02:56:18 +0300
committerBen Skeggs <bskeggs@redhat.com>2010-02-25 08:09:19 +0300
commit7f245b20e30515264b94f6373ef7d721155990a4 (patch)
tree51c730665e69d92e64eb7dbbbb00ed3cc2480603 /drivers/gpu/drm/nouveau/nv50_display.c
parenta6678b2ace023912000119a14eeb39a56050bc7c (diff)
downloadlinux-7f245b20e30515264b94f6373ef7d721155990a4.tar.xz
drm/nouveau: merge parsed_dcb and bios_parsed_dcb into dcb_table
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.c6
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 90f0bf59fbcd..34af3b277413 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -465,7 +465,7 @@ static int nv50_display_disable(struct drm_device *dev)
int nv50_display_create(struct drm_device *dev)
{
struct drm_nouveau_private *dev_priv = dev->dev_private;
- struct parsed_dcb *dcb = dev_priv->vbios->dcb;
+ struct dcb_table *dcb = &dev_priv->VBIOS.dcb;
uint32_t connector[16] = {};
int ret, i;
@@ -667,8 +667,8 @@ nv50_display_irq_head(struct drm_device *dev, int *phead,
return -1;
}
- for (i = 0; i < dev_priv->vbios->dcb->entries; i++) {
- struct dcb_entry *dcbent = &dev_priv->vbios->dcb->entry[i];
+ for (i = 0; i < dev_priv->VBIOS.dcb.entries; i++) {
+ struct dcb_entry *dcbent = &dev_priv->VBIOS.dcb.entry[i];
if (dcbent->type != type)
continue;