These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / video / fbdev / pm3fb.c

diff --git a/kernel/drivers/video/fbdev/pm3fb.c b/kernel/drivers/video/fbdev/pm3fb.c
index 77b99ed..6ff5077 100644 (file)
--- a/kernel/drivers/video/fbdev/pm3fb.c
+++ b/kernel/drivers/video/fbdev/pm3fb.c
@@ -32,9 +32,6 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#ifdef CONFIG_MTRR
-#include <asm/mtrr.h>
-#endif
 
 #include <video/pm3fb.h>
 
@@ -58,11 +55,7 @@
 static int hwcursor = 1;
 static char *mode_option;
 static bool noaccel;
-
-/* mtrr option */
-#ifdef CONFIG_MTRR
 static bool nomtrr;
-#endif
 
 /*
  * This structure defines the hardware state of the graphics card. Normally
@@ -76,7 +69,7 @@ struct pm3_par {
        u32             video;          /* video flags before blanking */
        u32             base;           /* screen base in 128 bits unit */
        u32             palette[16];
-       int             mtrr_handle;
+       int             wc_cookie;
 };
 
 /*
@@ -1374,8 +1367,8 @@ static int pm3fb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
                printk(KERN_WARNING "pm3fb: Can't reserve smem.\n");
                goto err_exit_mmio;
        }
-       info->screen_base =
-               ioremap_nocache(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
+       info->screen_base = ioremap_wc(pm3fb_fix.smem_start,
+                                      pm3fb_fix.smem_len);
        if (!info->screen_base) {
                printk(KERN_WARNING "pm3fb: Can't ioremap smem area.\n");
                release_mem_region(pm3fb_fix.smem_start, pm3fb_fix.smem_len);
@@ -1383,12 +1376,9 @@ static int pm3fb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
        }
        info->screen_size = pm3fb_fix.smem_len;
 
-#ifdef CONFIG_MTRR
        if (!nomtrr)
-               par->mtrr_handle = mtrr_add(pm3fb_fix.smem_start,
-                                               pm3fb_fix.smem_len,
-                                               MTRR_TYPE_WRCOMB, 1);
-#endif
+               par->wc_cookie = arch_phys_wc_add(pm3fb_fix.smem_start,
+                                                 pm3fb_fix.smem_len);
        info->fbops = &pm3fb_ops;
 
        par->video = PM3_READ_REG(par, PM3VideoControl);
@@ -1478,11 +1468,7 @@ static void pm3fb_remove(struct pci_dev *dev)
                unregister_framebuffer(info);
                fb_dealloc_cmap(&info->cmap);
 
-#ifdef CONFIG_MTRR
-               if (par->mtrr_handle >= 0)
-                       mtrr_del(par->mtrr_handle, info->fix.smem_start,
-                                info->fix.smem_len);
-#endif /* CONFIG_MTRR */
+               arch_phys_wc_del(par->wc_cookie);
                iounmap(info->screen_base);
                release_mem_region(fix->smem_start, fix->smem_len);
                iounmap(par->v_regs);
@@ -1533,10 +1519,8 @@ static int __init pm3fb_setup(char *options)
                        noaccel = 1;
                else if (!strncmp(this_opt, "hwcursor=", 9))
                        hwcursor = simple_strtoul(this_opt + 9, NULL, 0);
-#ifdef CONFIG_MTRR
                else if (!strncmp(this_opt, "nomtrr", 6))
                        nomtrr = 1;
-#endif
                else
                        mode_option = this_opt;
        }
@@ -1577,10 +1561,8 @@ MODULE_PARM_DESC(noaccel, "Disable acceleration");
 module_param(hwcursor, int, 0644);
 MODULE_PARM_DESC(hwcursor, "Enable hardware cursor "
                        "(1=enable, 0=disable, default=1)");
-#ifdef CONFIG_MTRR
 module_param(nomtrr, bool, 0);
 MODULE_PARM_DESC(nomtrr, "Disable MTRR support (0 or 1=disabled) (default=0)");
-#endif
 
 MODULE_DESCRIPTION("Permedia3 framebuffer device driver");
 MODULE_LICENSE("GPL");