drm/radeon/kms: move mtrr range add and memory information

Move mtrr range and memory information printing to radeon_object_init,
this are memory information and initialization common to all GPU and
they better fit in this function. Will also prevent code duplication
with upcoming init path changes.

airlied: fixed warning introduced

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 633acf7..ece097c 100644 (file)
--- 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,
                /* Get vram informations */
                radeon_vram_info(rdev);
 
-               /* Add an MTRR for the VRAM */
-               rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size,
-                               MTRR_TYPE_WRCOMB, 1);
-               DRM_INFO("Detected VRAM RAM=%uM, BAR=%uM\n",
-                               (unsigned)(rdev->mc.mc_vram_size >> 20),
-                               (unsigned)(rdev->mc.aper_size >> 20));
-               DRM_INFO("RAM width %dbits %cDR\n",
-                               rdev->mc.vram_width, rdev->mc.vram_is_ddr ? 'D' : 'S');
                /* Initialize memory controller (also test AGP) */
                r = radeon_mc_init(rdev);
                if (r) {

diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index b85fb83..1500d5b 100644 (file)
--- 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)
 
 int radeon_object_init(struct radeon_device *rdev)
 {
+       /* Add an MTRR for the VRAM */
+       rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size,
+                       MTRR_TYPE_WRCOMB, 1);
+       DRM_INFO("Detected VRAM RAM=%lluM, BAR=%lluM\n",
+               rdev->mc.mc_vram_size >> 20,
+               (unsigned long long)rdev->mc.aper_size >> 20);
+       DRM_INFO("RAM width %dbits %cDR\n",
+                       rdev->mc.vram_width, rdev->mc.vram_is_ddr ? 'D' : 'S');
        return radeon_ttm_init(rdev);
 }