summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv50_dac.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-02-24 10:03:05 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-02-25 15:09:21 +1000
commit04a39c577f4114a3f098ee8ef0e20f7778b5ddad (patch)
tree681d13d2a73c86a293a0ad6fa9d5e6ef4a5fd42e /drivers/gpu/drm/nouveau/nv50_dac.c
parent7f245b20e30515264b94f6373ef7d721155990a4 (diff)
downloadlinux-04a39c577f4114a3f098ee8ef0e20f7778b5ddad.tar.gz
linux-04a39c577f4114a3f098ee8ef0e20f7778b5ddad.tar.bz2
linux-04a39c577f4114a3f098ee8ef0e20f7778b5ddad.zip
drm/nouveau: merge nvbios and nouveau_bios_info
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_dac.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_dac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c
index f08f042a8e10..1fd9537beff6 100644
--- a/drivers/gpu/drm/nouveau/nv50_dac.c
+++ b/drivers/gpu/drm/nouveau/nv50_dac.c
@@ -79,8 +79,8 @@ nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)
}
/* Use bios provided value if possible. */
- if (dev_priv->vbios->dactestval) {
- load_pattern = dev_priv->vbios->dactestval;
+ if (dev_priv->vbios.dactestval) {
+ load_pattern = dev_priv->vbios.dactestval;
NV_DEBUG_KMS(dev, "Using bios provided load_pattern of %d\n",
load_pattern);
} else {