diff options
| author |   Francisco Jerez <currojerez@riseup.net> | 2010-07-03 12:47:14 +0200 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2010-07-13 10:13:18 +1000 |
| commit | be8860ac0c99c4cd67dfc364c6f57d299f8d7e9d (patch) | |
| tree | 534a6aec167f1c88a9d18b50866f1d2ed66df8ff /drivers/gpu/drm/nouveau/nv04_dac.c | |
| parent | drm/nv50: when debugging on, log which crtc we connect an encoder to (diff) | |
| download | linux-dev-be8860ac0c99c4cd67dfc364c6f57d299f8d7e9d.tar.xz linux-dev-be8860ac0c99c4cd67dfc364c6f57d299f8d7e9d.zip | |
drm/nv17-nv40: Avoid using active CRTCs for load detection.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_dac.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_dac.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c index 8066c56afa34..bcc8090adb23 100644 --- a/drivers/gpu/drm/nouveau/nv04_dac.c +++ b/drivers/gpu/drm/nouveau/nv04_dac.c @@ -261,12 +261,11 @@ uint32_t nv17_dac_sample_load(struct drm_encoder *encoder) saved_routput = NVReadRAMDAC(dev, 0, NV_PRAMDAC_DACCLK + regoffset); head = (saved_routput & 0x100) >> 8; -#if 0 - /* if there's a spare crtc, using it will minimise flicker for the case - * where the in-use crtc is in use by an off-chip tmds encoder */ - if (xf86_config->crtc[head]->enabled && !xf86_config->crtc[head ^ 1]->enabled) + + /* if there's a spare crtc, using it will minimise flicker */ + if (!(NVReadVgaCrtc(dev, head, NV_CIO_CRE_RPC1_INDEX) & 0xC0)) head ^= 1; -#endif + /* nv driver and nv31 use 0xfffffeee, nv34 and 6600 use 0xfffffece */ routput = (saved_routput & 0xfffffece) | head << 8; |