diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-10-16 10:49:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-10-16 10:49:58 +1000 |
| commit | fc33686ef044a4a59d48da2a648a0c2d0a1a7fd6 (patch) | |
| tree | e3d13d840ca30a61d31f77b2c73ae6e0788c6733 /linux-core | |
| parent | e4fa03f7ddb86720fa19cfc839689e1df72bb928 (diff) | |
drm/radeon: initial suspend/resume fix.
This enables the evict code and also sets radeon up
to allow evict from VRAM to LOCAL
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drm_bo.c | 2 | ||||
| -rw-r--r-- | linux-core/radeon_buffer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c index ecf65c20..94a81559 100644 --- a/linux-core/drm_bo.c +++ b/linux-core/drm_bo.c @@ -2126,7 +2126,7 @@ void drm_bo_evict_mm(struct drm_device *dev, int mem_type, int no_wait) drm_bo_usage_deref_unlocked(&entry); mutex_lock(&dev->struct_mutex); - } while(0); + } while(1); mutex_unlock(&dev->struct_mutex); diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c index fe2aa6fd..c375100c 100644 --- a/linux-core/radeon_buffer.c +++ b/linux-core/radeon_buffer.c @@ -436,6 +436,6 @@ uint64_t radeon_evict_flags(struct drm_buffer_object *bo) case DRM_BO_MEM_TT: return DRM_BO_FLAG_MEM_LOCAL; default: - return DRM_BO_FLAG_MEM_TT; + return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_MEM_LOCAL; } } |