| From 10b47bb6fb59ce70dfc72b44b3010144a30a49ba Mon Sep 17 00:00:00 2001 |
| From: Andy Lutomirski <luto@amacapital.net> |
| Date: Mon, 13 May 2013 23:58:45 +0000 |
| Subject: radeon: Switch to arch_phys_wc_add and add a missing ..._del |
| |
| Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Signed-off-by: Andy Lutomirski <luto@amacapital.net> |
| Reviewed-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Dave Airlie <airlied@redhat.com> |
| (cherry picked from commit 07ebea251d08ae851d501f7402359f053d038862) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/radeon/radeon_object.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c |
| index 1424ccde2377..07af5a95bb62 100644 |
| --- a/drivers/gpu/drm/radeon/radeon_object.c |
| +++ b/drivers/gpu/drm/radeon/radeon_object.c |
| @@ -322,8 +322,8 @@ int radeon_bo_init(struct radeon_device *rdev) |
| { |
| /* Add an MTRR for the VRAM */ |
| if (!rdev->fastfb_working) { |
| - rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size, |
| - MTRR_TYPE_WRCOMB, 1); |
| + rdev->mc.vram_mtrr = arch_phys_wc_add(rdev->mc.aper_base, |
| + rdev->mc.aper_size); |
| } |
| DRM_INFO("Detected VRAM RAM=%lluM, BAR=%lluM\n", |
| rdev->mc.mc_vram_size >> 20, |
| @@ -336,6 +336,7 @@ int radeon_bo_init(struct radeon_device *rdev) |
| void radeon_bo_fini(struct radeon_device *rdev) |
| { |
| radeon_ttm_fini(rdev); |
| + arch_phys_wc_del(rdev->mc.vram_mtrr); |
| } |
| |
| void radeon_bo_list_add_object(struct radeon_bo_list *lobj, |
| -- |
| 1.8.5.rc3 |
| |
