drm, agpgart: Use pgprot_writecombine for AGP maps and make the MTRR optional

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / gpu / drm / drm_pci.c

diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 14194b6..80c0b2b 100644 (file)
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -278,10 +278,10 @@ static int drm_pci_agp_init(struct drm_device *dev)
                }
                if (drm_core_has_MTRR(dev)) {
                        if (dev->agp)
-                               dev->agp->agp_mtrr =
-                                       mtrr_add(dev->agp->agp_info.aper_base,
-                                                dev->agp->agp_info.aper_size *
-                                                1024 * 1024, MTRR_TYPE_WRCOMB, 1);
+                               dev->agp->agp_mtrr = arch_phys_wc_add(
+                                       dev->agp->agp_info.aper_base,
+                                       dev->agp->agp_info.aper_size *
+                                       1024 * 1024);
                }
        }
        return 0;