mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 08:58:07 +00:00
9e517ac88b
Convert the driver from using the x86-specific MTRR code to the
architecture-agnostic arch_phys_wc_add(). It will avoid MTRR if
write-combining is available, in order to take advantage of that
also ensure the ioremapped area is requested as write-combining.
There are a few motivations for this:
a) Take advantage of PAT when available
b) Help bury MTRR code away, MTRR is architecture-specific and on
x86 it is being replaced by PAT.
c) Help with the goal of eventually using _PAGE_CACHE_UC over
_PAGE_CACHE_UC_MINUS on x86 on ioremap_nocache() (see commit
de33c442e titled "x86 PAT: fix performance drop for glx,
use UC minus for ioremap(), ioremap_nocache() and
pci_mmap_page_range()")
The conversion done is expressed by the following Coccinelle
SmPL patch, it additionally required manual intervention to
address all the ifdeffery and removal of redundant things which
arch_phys_wc_add() already addresses such as verbose message
about when MTRR fails and doing nothing when we didn't get an
MTRR.
@ mtrr_found @
expression index, base, size;
@@
-index = mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1);
+index = arch_phys_wc_add(base, size);
@ mtrr_rm depends on mtrr_found @
expression mtrr_found.index, mtrr_found.base, mtrr_found.size;
@@
-mtrr_del(index, base, size);
+arch_phys_wc_del(index);
@ mtrr_rm_zero_arg depends on mtrr_found @
expression mtrr_found.index;
@@
-mtrr_del(index, 0, 0);
+arch_phys_wc_del(index);
@ mtrr_rm_fb_info depends on mtrr_found @
struct fb_info *info;
expression mtrr_found.index;
@@
-mtrr_del(index, info->fix.smem_start, info->fix.smem_len);
+arch_phys_wc_del(index);
@ ioremap_replace_nocache depends on mtrr_found @
struct fb_info *info;
expression base, size;
@@
-info->screen_base = ioremap_nocache(base, size);
+info->screen_base = ioremap_wc(base, size);
@ ioremap_replace_default depends on mtrr_found @
struct fb_info *info;
expression base, size;
@@
-info->screen_base = ioremap(base, size);
+info->screen_base = ioremap_wc(base, size);
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Antonino Daplas <adaplas@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suresh Siddha <sbsiddha@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: airlied@linux.ie
Cc: benh@kernel.crashing.org
Cc: bhelgaas@google.com
Cc: dan.j.williams@intel.com
Cc: konrad.wilk@oracle.com
Cc: linux-fbdev@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Cc: mst@redhat.com
Cc: toshi.kani@hp.com
Cc: vinod.koul@intel.com
Cc: xen-devel@lists.xensource.com
Link: http://lkml.kernel.org/r/1440443613-13696-4-git-send-email-mcgrof@do-not-panic.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
91 lines
2.4 KiB
C
91 lines
2.4 KiB
C
/*
|
|
* linux/drivers/video/kyro/kryo.h
|
|
*
|
|
* Copyright (C) 2002 STMicroelectronics
|
|
* Copyright (C) 2004 Paul Mundt
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file COPYING in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#ifndef _KYRO_H
|
|
#define _KYRO_H
|
|
|
|
struct kyrofb_info {
|
|
void __iomem *regbase;
|
|
|
|
u32 palette[16];
|
|
u32 HTot; /* Hor Total Time */
|
|
u32 HFP; /* Hor Front Porch */
|
|
u32 HST; /* Hor Sync Time */
|
|
u32 HBP; /* Hor Back Porch */
|
|
s32 HSP; /* Hor Sync Polarity */
|
|
u32 VTot; /* Ver Total Time */
|
|
u32 VFP; /* Ver Front Porch */
|
|
u32 VST; /* Ver Sync Time */
|
|
u32 VBP; /* Ver Back Porch */
|
|
s32 VSP; /* Ver Sync Polarity */
|
|
u32 XRES; /* X Resolution */
|
|
u32 YRES; /* Y Resolution */
|
|
u32 VFREQ; /* Ver Frequency */
|
|
u32 PIXCLK; /* Pixel Clock */
|
|
u32 HCLK; /* Hor Clock */
|
|
|
|
/* Useful to hold depth here for Linux */
|
|
u8 PIXDEPTH;
|
|
|
|
int wc_cookie;
|
|
};
|
|
|
|
extern int kyro_dev_init(void);
|
|
extern void kyro_dev_reset(void);
|
|
|
|
extern unsigned char *kyro_dev_physical_fb_ptr(void);
|
|
extern unsigned char *kyro_dev_virtual_fb_ptr(void);
|
|
extern void *kyro_dev_physical_regs_ptr(void);
|
|
extern void *kyro_dev_virtual_regs_ptr(void);
|
|
extern unsigned int kyro_dev_fb_size(void);
|
|
extern unsigned int kyro_dev_regs_size(void);
|
|
|
|
extern u32 kyro_dev_overlay_offset(void);
|
|
|
|
/*
|
|
* benedict.gaster@superh.com
|
|
* Added the follow IOCTLS for the creation of overlay services...
|
|
*/
|
|
#define KYRO_IOC_MAGIC 'k'
|
|
|
|
#define KYRO_IOCTL_OVERLAY_CREATE _IO(KYRO_IOC_MAGIC, 0)
|
|
#define KYRO_IOCTL_OVERLAY_VIEWPORT_SET _IO(KYRO_IOC_MAGIC, 1)
|
|
#define KYRO_IOCTL_SET_VIDEO_MODE _IO(KYRO_IOC_MAGIC, 2)
|
|
#define KYRO_IOCTL_UVSTRIDE _IO(KYRO_IOC_MAGIC, 3)
|
|
#define KYRO_IOCTL_OVERLAY_OFFSET _IO(KYRO_IOC_MAGIC, 4)
|
|
#define KYRO_IOCTL_STRIDE _IO(KYRO_IOC_MAGIC, 5)
|
|
|
|
/*
|
|
* The follow 3 structures are used to pass data from user space into the kernel
|
|
* for the creation of overlay surfaces and setting the video mode.
|
|
*/
|
|
typedef struct _OVERLAY_CREATE {
|
|
u32 ulWidth;
|
|
u32 ulHeight;
|
|
int bLinear;
|
|
} overlay_create;
|
|
|
|
typedef struct _OVERLAY_VIEWPORT_SET {
|
|
u32 xOrgin;
|
|
u32 yOrgin;
|
|
u32 xSize;
|
|
u32 ySize;
|
|
} overlay_viewport_set;
|
|
|
|
typedef struct _SET_VIDEO_MODE {
|
|
u32 ulWidth;
|
|
u32 ulHeight;
|
|
u32 ulScan;
|
|
u8 displayDepth;
|
|
int bLinear;
|
|
} set_video_mode;
|
|
|
|
#endif /* _KYRO_H */
|