Merge tag 'dm-3.5-changes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/agk...

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / nv50_dac.c

diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c
index 55c56330be6d2a68bb78d6ad17cfa95f7fe6fb55..eb216a446b894a90a59b0d100fc64963d2f0d80d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_dac.c
+++ b/drivers/gpu/drm/nouveau/nv50_dac.c
@@ -55,9 +55,9 @@ nv50_dac_disconnect(struct drm_encoder *encoder)
                NV_ERROR(dev, "no space while disconnecting DAC\n");
                return;
        }
-       BEGIN_RING(evo, 0, NV50_EVO_DAC(nv_encoder->or, MODE_CTRL), 1);
+       BEGIN_NV04(evo, 0, NV50_EVO_DAC(nv_encoder->or, MODE_CTRL), 1);
        OUT_RING  (evo, 0);
-       BEGIN_RING(evo, 0, NV50_EVO_UPDATE, 1);
+       BEGIN_NV04(evo, 0, NV50_EVO_UPDATE, 1);
        OUT_RING  (evo, 0);
 
        nv_encoder->crtc = NULL;
@@ -240,7 +240,7 @@ nv50_dac_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
                NV_ERROR(dev, "no space while connecting DAC\n");
                return;
        }
-       BEGIN_RING(evo, 0, NV50_EVO_DAC(nv_encoder->or, MODE_CTRL), 2);
+       BEGIN_NV04(evo, 0, NV50_EVO_DAC(nv_encoder->or, MODE_CTRL), 2);
        OUT_RING(evo, mode_ctl);
        OUT_RING(evo, mode_ctl2);