diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-04-05 20:58:22 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-04-10 11:21:00 +0200 |
| commit | 4de833c337509916b7931982734d858191cf0700 (patch) | |
| tree | f5eeaeff34fe4f8b2a51ee3a6817a1fa4dcae68c /drivers/gpu/drm/radeon/r600.c | |
| parent | modpost: Fix modpost license checking of vmlinux.o (diff) | |
| download | linux-4de833c337509916b7931982734d858191cf0700.tar.xz linux-4de833c337509916b7931982734d858191cf0700.zip | |
drm/radeon: replace udelay with mdelay for long timeouts
Some architectures require that delays longer than a few
miliseconds are called through mdelay. This was triggered
on ARM randconfig builds.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 391bd2636a80..de71243b591f 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -2839,7 +2839,7 @@ void r600_rlc_stop(struct radeon_device *rdev) /* r7xx asics need to soft reset RLC before halting */ WREG32(SRBM_SOFT_RESET, SOFT_RESET_RLC); RREG32(SRBM_SOFT_RESET); - udelay(15000); + mdelay(15); WREG32(SRBM_SOFT_RESET, 0); RREG32(SRBM_SOFT_RESET); } |