diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2007-10-16 01:28:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:14 -0700 |
| commit | d5383fcc4c221227b954e028821a697ca7859e0e (patch) | |
| tree | 36f9bbfb5fd12dd016bfd5f3b17847ef7a6a3aa4 /drivers/video/pm2fb.c | |
| parent | 0ddf78491ddad301ddcd151de8108146e20398e7 (diff) | |
| download | linux-d5383fcc4c221227b954e028821a697ca7859e0e.tar.bz2 | |
pm3fb: mtrr support and noaccel option
This patch adds usage of MTRR registers and two new options: noaccel and
nomtrr.
[bunk@kernel.org: make pm3fb_init() static again]
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/pm2fb.c')
| -rw-r--r-- | drivers/video/pm2fb.c | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 10c0cc6e93fc..af615d99d438 100644 --- a/drivers/video/pm2fb.c +++ b/drivers/video/pm2fb.c @@ -38,6 +38,9 @@ #include <linux/fb.h> #include <linux/init.h> #include <linux/pci.h> +#ifdef CONFIG_MTRR +#include <asm/mtrr.h> +#endif #include <video/permedia2.h> #include <video/cvisionppc.h> @@ -73,6 +76,11 @@ static char *mode __devinitdata = NULL; */ static int lowhsync; static int lowvsync; +static int noaccel __devinitdata; +/* mtrr option */ +#ifdef CONFIG_MTRR +static int nomtrr __devinitdata; +#endif /* * The hardware state of the graphics card that isn't part of the @@ -88,6 +96,7 @@ struct pm2fb_par u32 mem_control; /* MemControl reg at probe */ u32 boot_address; /* BootAddress reg at probe */ u32 palette[16]; + int mtrr_handle; }; /* @@ -1316,6 +1325,15 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, goto err_exit_mmio; } +#ifdef CONFIG_MTRR + default_par->mtrr_handle = -1; + if (!nomtrr) + default_par->mtrr_handle = + mtrr_add(pm2fb_fix.smem_start, + pm2fb_fix.smem_len, + MTRR_TYPE_WRCOMB, 1); +#endif + info->fbops = &pm2fb_ops; info->fix = pm2fb_fix; info->pseudo_palette = default_par->palette; @@ -1324,6 +1342,11 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT; + if (noaccel) { + printk(KERN_DEBUG "disabling acceleration\n"); + info->flags |= FBINFO_HWACCEL_DISABLED; + } + if (!mode) mode = "640x480@60"; @@ -1375,6 +1398,11 @@ static void __devexit pm2fb_remove(struct pci_dev *pdev) unregister_framebuffer(info); +#ifdef CONFIG_MTRR + if (par->mtrr_handle >= 0) + mtrr_del(par->mtrr_handle, info->fix.smem_start, + info->fix.smem_len); +#endif /* CONFIG_MTRR */ iounmap(info->screen_base); release_mem_region(fix->smem_start, fix->smem_len); iounmap(par->v_regs); @@ -1430,6 +1458,12 @@ static int __init pm2fb_setup(char *options) lowhsync = 1; } else if(!strcmp(this_opt, "lowvsync")) { lowvsync = 1; +#ifdef CONFIG_MTRR + } else if (!strncmp(this_opt, "nomtrr", 6)) { + nomtrr = 1; +#endif + } else if (!strncmp(this_opt, "noaccel", 7)) { + noaccel = 1; } else { mode = this_opt; } @@ -1474,6 +1508,12 @@ module_param(lowhsync, bool, 0); MODULE_PARM_DESC(lowhsync, "Force horizontal sync low regardless of mode"); module_param(lowvsync, bool, 0); MODULE_PARM_DESC(lowvsync, "Force vertical sync low regardless of mode"); +module_param(noaccel, bool, 0); +MODULE_PARM_DESC(noaccel, "Disable acceleration"); +#ifdef CONFIG_MTRR +module_param(nomtrr, bool, 0); +MODULE_PARM_DESC(nomtrr, "Disable MTRR support (0 or 1=disabled) (default=0)"); +#endif MODULE_AUTHOR("Jim Hague <jim.hague@acm.org>"); MODULE_DESCRIPTION("Permedia2 framebuffer device driver"); |