aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/radeon/radeon_device.c8
-rw-r--r--drivers/gpu/drm/radeon/radeon_object.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 633acf71400b..ece097c3e079 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -604,14 +604,6 @@ int radeon_device_init(struct radeon_device *rdev,
604 /* Get vram informations */ 604 /* Get vram informations */
605 radeon_vram_info(rdev); 605 radeon_vram_info(rdev);
606 606
607 /* Add an MTRR for the VRAM */
608 rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size,
609 MTRR_TYPE_WRCOMB, 1);
610 DRM_INFO("Detected VRAM RAM=%uM, BAR=%uM\n",
611 (unsigned)(rdev->mc.mc_vram_size >> 20),
612 (unsigned)(rdev->mc.aper_size >> 20));
613 DRM_INFO("RAM width %dbits %cDR\n",
614 rdev->mc.vram_width, rdev->mc.vram_is_ddr ? 'D' : 'S');
615 /* Initialize memory controller (also test AGP) */ 607 /* Initialize memory controller (also test AGP) */
616 r = radeon_mc_init(rdev); 608 r = radeon_mc_init(rdev);
617 if (r) { 609 if (r) {
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index b85fb83d7ae8..1500d5bc7af5 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -369,6 +369,14 @@ void radeon_object_force_delete(struct radeon_device *rdev)
369 369
370int radeon_object_init(struct radeon_device *rdev) 370int radeon_object_init(struct radeon_device *rdev)
371{ 371{
372 /* Add an MTRR for the VRAM */
373 rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size,
374 MTRR_TYPE_WRCOMB, 1);
375 DRM_INFO("Detected VRAM RAM=%lluM, BAR=%lluM\n",
376 rdev->mc.mc_vram_size >> 20,
377 (unsigned long long)rdev->mc.aper_size >> 20);
378 DRM_INFO("RAM width %dbits %cDR\n",
379 rdev->mc.vram_width, rdev->mc.vram_is_ddr ? 'D' : 'S');
372 return radeon_ttm_init(rdev); 380 return radeon_ttm_init(rdev);
373} 381}
374 382