drm/radeon/kms: move mtrr range add and memory information
Subsystems (2)
PATCH 1/1 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.
Signed-off-by Jerome Glisse <[email protected]>
--- drivers/gpu/drm/radeon/radeon_device.c | 8 -------- drivers/gpu/drm/radeon/radeon_object.c | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/radeon/radeon_device.c +0 -8
@@ -598,14 +598,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) {
drivers/gpu/drm/radeon/radeon_object.c +7 -0
@@ -369,6 +369,13 @@ 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 , 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); }
Signature · 1 line
1.6.4.2