Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: setup MC/VRAM the same way for suspend/resume
drm/radeon/kms: Fix caching mode selection for GTT object
+3
-1
drivers/gpu/drm/radeon/radeon_device.c
+3
-1
drivers/gpu/drm/radeon/radeon_device.c
···
152
152
}
153
153
} else {
154
154
rdev->mc.vram_location = 0;
155
-
rdev->mc.gtt_location = rdev->mc.mc_vram_size;
155
+
tmp = rdev->mc.mc_vram_size;
156
+
tmp = (tmp + rdev->mc.gtt_size - 1) & ~(rdev->mc.gtt_size - 1);
157
+
rdev->mc.gtt_location = tmp;
156
158
}
157
159
DRM_INFO("radeon: VRAM %uM\n", rdev->mc.real_vram_size >> 20);
158
160
DRM_INFO("radeon: VRAM from 0x%08X to 0x%08X\n",
+1
-1
drivers/gpu/drm/radeon/radeon_object.c
+1
-1
drivers/gpu/drm/radeon/radeon_object.c
···
106
106
flags |= TTM_PL_FLAG_VRAM | TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
107
107
}
108
108
if (domain & RADEON_GEM_DOMAIN_GTT) {
109
-
flags |= TTM_PL_FLAG_TT | TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
109
+
flags |= TTM_PL_FLAG_TT | TTM_PL_MASK_CACHING;
110
110
}
111
111
if (domain & RADEON_GEM_DOMAIN_CPU) {
112
112
flags |= TTM_PL_FLAG_SYSTEM | TTM_PL_MASK_CACHING;