diff options
author | Francisco Jerez <currojerez@riseup.net> | 2010-10-21 22:31:02 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-03 00:11:09 -0500 |
commit | 63f7fcfebd2ff1995b649101d6120b60fa0e5b06 (patch) | |
tree | 27ed24ca7f08b26ec46274a91106139074c6982e /drivers/gpu/drm/nouveau/nouveau_hw.c | |
parent | 382d62e524db528cdf53563ad9a018adc170dfde (diff) |
drm/nv04: Make CRTC base changes effective in the next hsync.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_hw.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.c b/drivers/gpu/drm/nouveau/nouveau_hw.c index b9672a05c411..979275836985 100644 --- a/drivers/gpu/drm/nouveau/nouveau_hw.c +++ b/drivers/gpu/drm/nouveau/nouveau_hw.c | |||
@@ -953,7 +953,7 @@ nv_load_state_ext(struct drm_device *dev, int head, | |||
953 | NVWriteCRTC(dev, head, NV_PCRTC_850, regp->crtc_850); | 953 | NVWriteCRTC(dev, head, NV_PCRTC_850, regp->crtc_850); |
954 | 954 | ||
955 | reg900 = NVReadRAMDAC(dev, head, NV_PRAMDAC_900); | 955 | reg900 = NVReadRAMDAC(dev, head, NV_PRAMDAC_900); |
956 | if (regp->crtc_cfg == NV_PCRTC_CONFIG_START_ADDRESS_HSYNC) | 956 | if (regp->crtc_cfg == NV10_PCRTC_CONFIG_START_ADDRESS_HSYNC) |
957 | NVWriteRAMDAC(dev, head, NV_PRAMDAC_900, reg900 | 0x10000); | 957 | NVWriteRAMDAC(dev, head, NV_PRAMDAC_900, reg900 | 0x10000); |
958 | else | 958 | else |
959 | NVWriteRAMDAC(dev, head, NV_PRAMDAC_900, reg900 & ~0x10000); | 959 | NVWriteRAMDAC(dev, head, NV_PRAMDAC_900, reg900 & ~0x10000); |