diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_dac.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_dac.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c index ba6423f2ffc..e000455e06d 100644 --- a/drivers/gpu/drm/nouveau/nv04_dac.c +++ b/drivers/gpu/drm/nouveau/nv04_dac.c | |||
| @@ -74,14 +74,14 @@ static int sample_load_twice(struct drm_device *dev, bool sense[2]) | |||
| 74 | * use a 10ms timeout (guards against crtc being inactive, in | 74 | * use a 10ms timeout (guards against crtc being inactive, in |
| 75 | * which case blank state would never change) | 75 | * which case blank state would never change) |
| 76 | */ | 76 | */ |
| 77 | if (!nouveau_wait_until(dev, 10000000, NV_PRMCIO_INP0__COLOR, | 77 | if (!nouveau_wait_eq(dev, 10000000, NV_PRMCIO_INP0__COLOR, |
| 78 | 0x00000001, 0x00000000)) | 78 | 0x00000001, 0x00000000)) |
| 79 | return -EBUSY; | 79 | return -EBUSY; |
| 80 | if (!nouveau_wait_until(dev, 10000000, NV_PRMCIO_INP0__COLOR, | 80 | if (!nouveau_wait_eq(dev, 10000000, NV_PRMCIO_INP0__COLOR, |
| 81 | 0x00000001, 0x00000001)) | 81 | 0x00000001, 0x00000001)) |
| 82 | return -EBUSY; | 82 | return -EBUSY; |
| 83 | if (!nouveau_wait_until(dev, 10000000, NV_PRMCIO_INP0__COLOR, | 83 | if (!nouveau_wait_eq(dev, 10000000, NV_PRMCIO_INP0__COLOR, |
| 84 | 0x00000001, 0x00000000)) | 84 | 0x00000001, 0x00000000)) |
| 85 | return -EBUSY; | 85 | return -EBUSY; |
| 86 | 86 | ||
| 87 | udelay(100); | 87 | udelay(100); |