On Tue, May 14, 2013 at 8:58 AM, Alex Deucher [off-list ref] wrote:

On Mon, May 13, 2013 at 7:58 PM, Andy Lutomirski [off-list ref] wrote:

quoted

Reviewed-by: Daniel Vetter <redacted>
Signed-off-by: Andy Lutomirski <luto@amacapital.net>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

I believe it will break something but we could deal with the fallout
once it happens.

quoted

---
 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 d3aface..15cd34b 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c

@@ -321,8 +321,8 @@ void radeon_bo_force_delete(struct radeon_device *rdev)
 int radeon_bo_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);
+       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,
                (unsigned long long)rdev->mc.aper_size >> 20);

@@ -334,6 +334,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.1.4