drm/nv50: fix iommu errors caused by device reading from address 0

[safe/jmp/linux-2.6] / drivers / gpu / drm / nouveau / nv04_dac.c

diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c
index 1d73b15..1cb19e3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv04_dac.c
+++ b/drivers/gpu/drm/nouveau/nv04_dac.c
@@ -230,13 +230,13 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder)
        if (dcb->type == OUTPUT_TV) {
                testval = RGB_TEST_DATA(0xa0, 0xa0, 0xa0);
 
-               if (dev_priv->vbios->tvdactestval)
-                       testval = dev_priv->vbios->tvdactestval;
+               if (dev_priv->vbios.tvdactestval)
+                       testval = dev_priv->vbios.tvdactestval;
        } else {
                testval = RGB_TEST_DATA(0x140, 0x140, 0x140); /* 0x94050140 */
 
-               if (dev_priv->vbios->dactestval)
-                       testval = dev_priv->vbios->dactestval;
+               if (dev_priv->vbios.dactestval)
+                       testval = dev_priv->vbios.dactestval;
        }
 
        saved_rtest_ctrl = NVReadRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset);