summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2014-04-12 06:03:31 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2014-04-12 06:03:31 +0000
commitdfc5d517da49bcbf05e8c65b9407b446d901065a (patch)
treec5865e35edbc87b5486273e7f9e29626b0a17ae2 /sys
parentd5d82b7de82858094b3878dabcdf36784ea13e84 (diff)
drm/radeon: TTM must be init with cpu-visible VRAM, v2
From Lauri Kasanen 7e88b3ea565f869721b8ac011ee73b95b773e938 in ubuntu 3.8 14eedc32a3c0ec9dd70448a73763ee21feae3111 in mainline linux
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/drm/radeon/radeon_ttm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/radeon/radeon_ttm.c b/sys/dev/pci/drm/radeon/radeon_ttm.c
index 19f6cc17835..53b8ce90b88 100644
--- a/sys/dev/pci/drm/radeon/radeon_ttm.c
+++ b/sys/dev/pci/drm/radeon/radeon_ttm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radeon_ttm.c,v 1.4 2014/03/24 17:06:49 kettenis Exp $ */
+/* $OpenBSD: radeon_ttm.c,v 1.5 2014/04/12 06:03:30 jsg Exp $ */
/*
* Copyright 2009 Jerome Glisse.
* All Rights Reserved.
@@ -791,6 +791,9 @@ int radeon_ttm_init(struct radeon_device *rdev)
DRM_ERROR("Failed initializing VRAM heap.\n");
return r;
}
+ /* Change the size here instead of the init above so only lpfn is affected */
+ radeon_ttm_set_active_vram_size(rdev, rdev->mc.visible_vram_size);
+
#ifdef __sparc64__
r = radeon_bo_create(rdev, rdev->fb_offset, PAGE_SIZE, true,
RADEON_GEM_DOMAIN_VRAM,