aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@pentafluge.infradead.org>2005-06-21 20:17:08 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 22:07:42 -0400
commit58a606431a704b5c240c1429a5526fac81c9800a (patch)
tree42299e741ce03b4f30448eb6d2cc1f2ce10d0b5a
parentf1ab5dac251bb4514607918b0019a3b3f5f5fb48 (diff)
[PATCH] fbdev: fill in the access_align field.
Several drivers miss filling in the access_align field. So this patch has them fill it in. Signed-off-by: James Simmons <jsimmons@www.infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/video/fbmem.c2
-rw-r--r--drivers/video/i810/i810_main.c1
-rw-r--r--drivers/video/intelfb/intelfbdrv.c1
-rw-r--r--drivers/video/nvidia/nvidia.c1
-rw-r--r--drivers/video/riva/fbdev.c1
-rw-r--r--drivers/video/savage/savagefb_driver.c2
6 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 6f871a8b9058..2222de6ad844 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1034,7 +1034,7 @@ register_framebuffer(struct fb_info *fb_info)
1034 fb_info->pixmap.size = FBPIXMAPSIZE; 1034 fb_info->pixmap.size = FBPIXMAPSIZE;
1035 fb_info->pixmap.buf_align = 1; 1035 fb_info->pixmap.buf_align = 1;
1036 fb_info->pixmap.scan_align = 1; 1036 fb_info->pixmap.scan_align = 1;
1037 fb_info->pixmap.access_align = 4; 1037 fb_info->pixmap.access_align = 32;
1038 fb_info->pixmap.flags = FB_PIXMAP_DEFAULT; 1038 fb_info->pixmap.flags = FB_PIXMAP_DEFAULT;
1039 } 1039 }
1040 } 1040 }
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index a9a618f2aa6a..7513fb9b19cf 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1885,6 +1885,7 @@ static int __devinit i810fb_init_pci (struct pci_dev *dev,
1885 memset(info->pixmap.addr, 0, 8*1024); 1885 memset(info->pixmap.addr, 0, 8*1024);
1886 info->pixmap.size = 8*1024; 1886 info->pixmap.size = 8*1024;
1887 info->pixmap.buf_align = 8; 1887 info->pixmap.buf_align = 8;
1888 info->pixmap.access_align = 32;
1888 info->pixmap.flags = FB_PIXMAP_SYSTEM; 1889 info->pixmap.flags = FB_PIXMAP_SYSTEM;
1889 1890
1890 if ((err = i810_allocate_pci_resource(par, entry))) { 1891 if ((err = i810_allocate_pci_resource(par, entry))) {
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index 448c90864016..298bc9cd99e7 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -1091,6 +1091,7 @@ intelfb_set_fbinfo(struct intelfb_info *dinfo)
1091 1091
1092 info->pixmap.size = 64*1024; 1092 info->pixmap.size = 64*1024;
1093 info->pixmap.buf_align = 8; 1093 info->pixmap.buf_align = 8;
1094 info->pixmap.access_align = 32;
1094 info->pixmap.flags = FB_PIXMAP_SYSTEM; 1095 info->pixmap.flags = FB_PIXMAP_SYSTEM;
1095 1096
1096 if (intelfb_init_var(dinfo)) 1097 if (intelfb_init_var(dinfo))
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index 266ff5d7ac36..b2e6b2407869 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -1345,6 +1345,7 @@ static int __devinit nvidia_set_fbinfo(struct fb_info *info)
1345 1345
1346 info->pixmap.scan_align = 4; 1346 info->pixmap.scan_align = 4;
1347 info->pixmap.buf_align = 4; 1347 info->pixmap.buf_align = 4;
1348 info->pixmap.access_align = 32;
1348 info->pixmap.size = 8 * 1024; 1349 info->pixmap.size = 8 * 1024;
1349 info->pixmap.flags = FB_PIXMAP_SYSTEM; 1350 info->pixmap.flags = FB_PIXMAP_SYSTEM;
1350 1351
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 7540f60af948..6a9e183be41b 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1723,6 +1723,7 @@ static int __devinit riva_set_fbinfo(struct fb_info *info)
1723 1723
1724 info->pixmap.size = 8 * 1024; 1724 info->pixmap.size = 8 * 1024;
1725 info->pixmap.buf_align = 4; 1725 info->pixmap.buf_align = 4;
1726 info->pixmap.access_align = 32;
1726 info->pixmap.flags = FB_PIXMAP_SYSTEM; 1727 info->pixmap.flags = FB_PIXMAP_SYSTEM;
1727 info->var.yres_virtual = -1; 1728 info->var.yres_virtual = -1;
1728 NVTRACE_LEAVE(); 1729 NVTRACE_LEAVE();
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 03d74e8ee067..8fadcdae6f42 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -1897,7 +1897,7 @@ static int __devinit savage_init_fb_info (struct fb_info *info,
1897 info->pixmap.size = 8*1024; 1897 info->pixmap.size = 8*1024;
1898 info->pixmap.scan_align = 4; 1898 info->pixmap.scan_align = 4;
1899 info->pixmap.buf_align = 4; 1899 info->pixmap.buf_align = 4;
1900 info->pixmap.access_align = 4; 1900 info->pixmap.access_align = 32;
1901 1901
1902 fb_alloc_cmap (&info->cmap, NR_PALETTE, 0); 1902 fb_alloc_cmap (&info->cmap, NR_PALETTE, 0);
1903 info->flags |= FBINFO_HWACCEL_COPYAREA | 1903 info->flags |= FBINFO_HWACCEL_COPYAREA |