diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-11-18 23:32:56 -0500 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2010-12-07 21:00:36 -0500 |
| commit | 12fb9525075982bc65cfd71427dd7afdf47bafed (patch) | |
| tree | 0e8b75e10ec7c5b607f14d24b857041850bc40d9 /drivers/gpu/drm/nouveau/nouveau_hw.c | |
| parent | ceac30999dfb00ee7b56cfea8b28ef50999a3c95 (diff) | |
drm/nouveau: introduce a util function to wait on reg != val
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.c b/drivers/gpu/drm/nouveau/nouveau_hw.c index 6ba640e7a7e..053edf9d2f6 100644 --- a/drivers/gpu/drm/nouveau/nouveau_hw.c +++ b/drivers/gpu/drm/nouveau/nouveau_hw.c | |||
| @@ -999,8 +999,8 @@ nv_load_state_ext(struct drm_device *dev, int head, | |||
| 999 | if (dev_priv->card_type == NV_10) { | 999 | if (dev_priv->card_type == NV_10) { |
| 1000 | /* Not waiting for vertical retrace before modifying | 1000 | /* Not waiting for vertical retrace before modifying |
| 1001 | CRE_53/CRE_54 causes lockups. */ | 1001 | CRE_53/CRE_54 causes lockups. */ |
| 1002 | nouveau_wait_until(dev, 650000000, NV_PRMCIO_INP0__COLOR, 0x8, 0x8); | 1002 | nouveau_wait_eq(dev, 650000000, NV_PRMCIO_INP0__COLOR, 0x8, 0x8); |
| 1003 | nouveau_wait_until(dev, 650000000, NV_PRMCIO_INP0__COLOR, 0x8, 0x0); | 1003 | nouveau_wait_eq(dev, 650000000, NV_PRMCIO_INP0__COLOR, 0x8, 0x0); |
| 1004 | } | 1004 | } |
| 1005 | 1005 | ||
| 1006 | wr_cio_state(dev, head, regp, NV_CIO_CRE_53); | 1006 | wr_cio_state(dev, head, regp, NV_CIO_CRE_53); |