drm/nouveau: implement devinit subdev, and new init table parser

v2:
- make sure not to execute display scripts unless resuming

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

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.h b/drivers/gpu/drm/nouveau/nouveau_hw.h
index ff7f31c279d8..24c459213613 100644
--- a/drivers/gpu/drm/nouveau/nouveau_hw.h
+++ b/drivers/gpu/drm/nouveau/nouveau_hw.h
@@ -161,7 +161,7 @@ static inline void NVWriteRAMDAC(struct drm_device *dev,
 static inline uint8_t nv_read_tmds(struct drm_device *dev,
                                         int or, int dl, uint8_t address)
 {
-        int ramdac = (or & OUTPUT_C) >> 2;
+        int ramdac = (or & DCB_OUTPUT_C) >> 2;
 
         NVWriteRAMDAC(dev, ramdac, NV_PRAMDAC_FP_TMDS_CONTROL + dl * 8,
         NV_PRAMDAC_FP_TMDS_CONTROL_WRITE_DISABLE | address);
@@ -172,7 +172,7 @@ static inline void nv_write_tmds(struct drm_device *dev,
                                         int or, int dl, uint8_t address,
                                         uint8_t data)
 {
-        int ramdac = (or & OUTPUT_C) >> 2;
+        int ramdac = (or & DCB_OUTPUT_C) >> 2;
 
         NVWriteRAMDAC(dev, ramdac, NV_PRAMDAC_FP_TMDS_DATA + dl * 8, data);
         NVWriteRAMDAC(dev, ramdac, NV_PRAMDAC_FP_TMDS_CONTROL + dl * 8, address);