diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-11-03 09:32:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-11-03 09:32:39 +1000 |
| commit | 1c817cc3fc09abe93539413130de3875e4c7eafe (patch) | |
| tree | f9e5c30339939c51cc5bf9676a78b4aa4029fc69 /linux-core | |
| parent | 653b16f2dd32b5fdbd5f97277edc1c6df66755a9 (diff) | |
radeon: pull bus master enable into its own function
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/radeon_pm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linux-core/radeon_pm.c b/linux-core/radeon_pm.c index 6b1e6f84..db8f44c4 100644 --- a/linux-core/radeon_pm.c +++ b/linux-core/radeon_pm.c @@ -93,7 +93,6 @@ int radeon_resume(struct drm_device *dev) struct drm_radeon_private *dev_priv = dev->dev_private; struct drm_framebuffer *fb; int i; - u32 tmp; if (!drm_core_check_feature(dev, DRIVER_MODESET)) return 0; @@ -104,10 +103,7 @@ int radeon_resume(struct drm_device *dev) return -1; /* Turn on bus mastering -todo fix properly */ - if (dev_priv->chip_family < CHIP_RV380) { - tmp = RADEON_READ(RADEON_BUS_CNTL) & ~RADEON_BUS_MASTER_DIS; - RADEON_WRITE(RADEON_BUS_CNTL, tmp); - } + radeon_enable_bm(dev_priv); DRM_ERROR("\n"); /* on atom cards re init the whole card |