drm/nouveau: merge nvbios and nouveau_bios_info

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 34af3b27741..c406be6fdc5 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 dcb_table *dcb = &dev_priv->VBIOS.dcb;
+        struct dcb_table *dcb = &dev_priv->vbios.dcb;
         uint32_t connector[16] = {};
         int ret, i;
 
@@ -526,7 +526,7 @@ int nv50_display_create(struct drm_device *dev)
                 connector[entry->connector] |= (1 << entry->type);
         }
 
-        /* It appears that DCB 3.0+ VBIOS has a connector table, however,
+        /* It appears that DCB 3.0+ vbios has a connector table, however,
          * I'm not 100% certain how to decode it correctly yet so just
          * look at what encoders are present on each connector index and
          * attempt to derive the connector type from that.
@@ -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;
@@ -692,7 +692,7 @@ nv50_display_script_select(struct drm_device *dev, struct dcb_entry *dcbent,
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nouveau_connector *nv_connector = NULL;
         struct drm_encoder *encoder;
-        struct nvbios *bios = &dev_priv->VBIOS;
+        struct nvbios *bios = &dev_priv->vbios;
         uint32_t mc, script = 0, or;
 
         list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
@@ -710,7 +710,7 @@ nv50_display_script_select(struct drm_device *dev, struct dcb_entry *dcbent,
         switch (dcbent->type) {
         case OUTPUT_LVDS:
                 script = (mc >> 8) & 0xf;
-                if (bios->pub.fp_no_ddc) {
+                if (bios->fp_no_ddc) {
                         if (bios->fp.dual_link)
                                 script |= 0x0100;
                         if (bios->fp.if_is_24bit)