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

[kvmfornfv.git] / kernel / drivers / video / fbdev / matrox / matroxfb_base.h

diff --git a/kernel/drivers/video/fbdev/matrox/matroxfb_base.h b/kernel/drivers/video/fbdev/matrox/matroxfb_base.h
index 89a8a89..09b02cd 100644 (file)
--- a/kernel/drivers/video/fbdev/matrox/matroxfb_base.h
+++ b/kernel/drivers/video/fbdev/matrox/matroxfb_base.h
@@ -44,9 +44,6 @@
 
 #include <asm/io.h>
 #include <asm/unaligned.h>
-#ifdef CONFIG_MTRR
-#include <asm/mtrr.h>
-#endif
 
 #if defined(CONFIG_PPC_PMAC)
 #include <asm/prom.h>
@@ -187,23 +184,6 @@ static inline void __iomem* vaddr_va(vaddr_t va) {
        return va.vaddr;
 }
 
-#define MGA_IOREMAP_NORMAL     0
-#define MGA_IOREMAP_NOCACHE    1
-
-#define MGA_IOREMAP_FB         MGA_IOREMAP_NOCACHE
-#define MGA_IOREMAP_MMIO       MGA_IOREMAP_NOCACHE
-static inline int mga_ioremap(unsigned long phys, unsigned long size, int flags, vaddr_t* virt) {
-       if (flags & MGA_IOREMAP_NOCACHE)
-               virt->vaddr = ioremap_nocache(phys, size);
-       else
-               virt->vaddr = ioremap(phys, size);
-       return (virt->vaddr == NULL); /* 0, !0... 0, error_code in future */
-}
-
-static inline void mga_iounmap(vaddr_t va) {
-       iounmap(va.vaddr);
-}
-
 struct my_timming {
        unsigned int pixclock;
        int mnp;
@@ -449,12 +429,7 @@ struct matrox_fb_info {
                int             plnwt;
                int             srcorg;
                              } capable;
-#ifdef CONFIG_MTRR
-       struct {
-               int             vram;
-               int             vram_valid;
-                             } mtrr;
-#endif
+       int                     wc_cookie;
        struct {
                int             precise_width;
                int             mga_24bpp_fix;