K Krzysztof Helt #
Message details and related content
From: Krzysztof Helt <redacted> This patch adds usage of MTRR registers and two new options: noaccel and nomtrr. Signed-off-by: Krzysztof Helt <redacted> --- The previous patch does not applied if the mm patches were applied. This one fixes it.
--- linux-2.6.21/drivers/video/pm2fb.c 2007-06-2108:32:07.000000000 +0200
+++ linux-2.6.22/drivers/video/pm2fb.c 2007-06-2108:30:09.000000000 +0200
@@ -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>
@@ -71,8 +74,13 @@ static char *mode __devinitdata = NULL; * these flags allow the user to specify that requests for +ve sync * should be silently turned in -ve sync. */ -static int lowhsync; -static int lowvsync; +static int lowhsync __devinitdata; +static int lowvsync __devinitdata; +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 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 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(struc 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 *opti 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 [off-list ref]");
MODULE_DESCRIPTION("Permedia2 framebuffer device driver");
----------------------------------------------------
Wrocław Non Stop - eksplozja kultury we Wrocławiu!
22 czerwca - 1 lipca 2007.
W ramach festiwalu wystąpią m.in. Iggy Pop & The Stooges!
wwW.wroclawnonstop.pl http://klik.wp.pl/?adr=http%3A%2F%2Fadv.reklama.wp.pl%2Fas%2Figgypop.html&sid=1194