aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-10-19 00:36:19 -0400
committerDave Airlie <airlied@redhat.com>2010-10-27 21:27:24 -0400
commit7e94250312d8b32a18e7e96cee19f2795d224e8c (patch)
treefda0c98857ca57d52589aef32c4f40f19ce585b6
parent2c7d81acf432fad02073c139355e94a6f7e4df45 (diff)
drm/radeon/kms: enable unmappable vram for evergreen
Evergreen now has blit support, but unmappable vram support was disabled in c919b371cb734f42b1130e706ecee262f8d9261d (drm/radeon/kms: avoid corner case issue with unmappable vram V2) due to merge ordering. This re-enables unmappable vram on evergreen. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/evergreen_blit_kms.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_blit_kms.c b/drivers/gpu/drm/radeon/evergreen_blit_kms.c
index 086b9b0416c4..ac3b6dde23db 100644
--- a/drivers/gpu/drm/radeon/evergreen_blit_kms.c
+++ b/drivers/gpu/drm/radeon/evergreen_blit_kms.c
@@ -495,6 +495,7 @@ done:
495 dev_err(rdev->dev, "(%d) pin blit object failed\n", r); 495 dev_err(rdev->dev, "(%d) pin blit object failed\n", r);
496 return r; 496 return r;
497 } 497 }
498 rdev->mc.active_vram_size = rdev->mc.real_vram_size;
498 return 0; 499 return 0;
499} 500}
500 501
@@ -502,6 +503,7 @@ void evergreen_blit_fini(struct radeon_device *rdev)
502{ 503{
503 int r; 504 int r;
504 505
506 rdev->mc.active_vram_size = rdev->mc.visible_vram_size;
505 if (rdev->r600_blit.shader_obj == NULL) 507 if (rdev->r600_blit.shader_obj == NULL)
506 return; 508 return;
507 /* If we can't reserve the bo, unref should be enough to destroy 509 /* If we can't reserve the bo, unref should be enough to destroy