diff options
author | Francisco Jerez <currojerez@riseup.net> | 2010-09-07 11:34:44 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 02:25:36 -0400 |
commit | 4b5c152a79d512803ea525b0878ccef627cd1629 (patch) | |
tree | ea046ac2be1e30a4e08c7ece4b8e1c787aa0ef42 /drivers/gpu/drm/nouveau/nv50_sor.c | |
parent | 35fd5b42f035c795bd9c6649591f59b500cb62b3 (diff) |
drm/nouveau: Remove implicit argument from nv_wait().
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_sor.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv50_sor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c index bcd4cf84a7e6..b4a5ecb199f9 100644 --- a/drivers/gpu/drm/nouveau/nv50_sor.c +++ b/drivers/gpu/drm/nouveau/nv50_sor.c | |||
@@ -92,7 +92,7 @@ nv50_sor_dpms(struct drm_encoder *encoder, int mode) | |||
92 | } | 92 | } |
93 | 93 | ||
94 | /* wait for it to be done */ | 94 | /* wait for it to be done */ |
95 | if (!nv_wait(NV50_PDISPLAY_SOR_DPMS_CTRL(or), | 95 | if (!nv_wait(dev, NV50_PDISPLAY_SOR_DPMS_CTRL(or), |
96 | NV50_PDISPLAY_SOR_DPMS_CTRL_PENDING, 0)) { | 96 | NV50_PDISPLAY_SOR_DPMS_CTRL_PENDING, 0)) { |
97 | NV_ERROR(dev, "timeout: SOR_DPMS_CTRL_PENDING(%d) == 0\n", or); | 97 | NV_ERROR(dev, "timeout: SOR_DPMS_CTRL_PENDING(%d) == 0\n", or); |
98 | NV_ERROR(dev, "SOR_DPMS_CTRL(%d) = 0x%08x\n", or, | 98 | NV_ERROR(dev, "SOR_DPMS_CTRL(%d) = 0x%08x\n", or, |
@@ -108,7 +108,7 @@ nv50_sor_dpms(struct drm_encoder *encoder, int mode) | |||
108 | 108 | ||
109 | nv_wr32(dev, NV50_PDISPLAY_SOR_DPMS_CTRL(or), val | | 109 | nv_wr32(dev, NV50_PDISPLAY_SOR_DPMS_CTRL(or), val | |
110 | NV50_PDISPLAY_SOR_DPMS_CTRL_PENDING); | 110 | NV50_PDISPLAY_SOR_DPMS_CTRL_PENDING); |
111 | if (!nv_wait(NV50_PDISPLAY_SOR_DPMS_STATE(or), | 111 | if (!nv_wait(dev, NV50_PDISPLAY_SOR_DPMS_STATE(or), |
112 | NV50_PDISPLAY_SOR_DPMS_STATE_WAIT, 0)) { | 112 | NV50_PDISPLAY_SOR_DPMS_STATE_WAIT, 0)) { |
113 | NV_ERROR(dev, "timeout: SOR_DPMS_STATE_WAIT(%d) == 0\n", or); | 113 | NV_ERROR(dev, "timeout: SOR_DPMS_STATE_WAIT(%d) == 0\n", or); |
114 | NV_ERROR(dev, "SOR_DPMS_STATE(%d) = 0x%08x\n", or, | 114 | NV_ERROR(dev, "SOR_DPMS_STATE(%d) = 0x%08x\n", or, |