Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

[mv-sheeva.git] / drivers / video / via / accel.c

diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c
index e77746857c8f32d505cefcc6296306a85755eb6b..e44893ea590d9b1b2194a621d567b38b78a70364 100644 (file)
--- a/drivers/video/via/accel.c
+++ b/drivers/video/via/accel.c
@@ -18,7 +18,7 @@
  * Foundation, Inc.,
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include "via-core.h"
+#include <linux/via-core.h>
 #include "global.h"
 
 /*
@@ -370,6 +370,22 @@ int viafb_init_engine(struct fb_info *info)
        viapar->shared->vq_vram_addr = viapar->fbmem_free;
        viapar->fbmem_used += VQ_SIZE;
 
+#if defined(CONFIG_FB_VIA_CAMERA) || defined(CONFIG_FB_VIA_CAMERA_MODULE)
+       /*
+        * Set aside a chunk of framebuffer memory for the camera
+        * driver.  Someday this driver probably needs a proper allocator
+        * for fbmem; for now, we just have to do this before the
+        * framebuffer initializes itself.
+        *
+        * As for the size: the engine can handle three frames,
+        * 16 bits deep, up to VGA resolution.
+        */
+       viapar->shared->vdev->camera_fbmem_size = 3*VGA_HEIGHT*VGA_WIDTH*2;
+       viapar->fbmem_free -= viapar->shared->vdev->camera_fbmem_size;
+       viapar->fbmem_used += viapar->shared->vdev->camera_fbmem_size;
+       viapar->shared->vdev->camera_fbmem_offset = viapar->fbmem_free;
+#endif
+
        /* Init AGP and VQ regs */
        switch (chip_name) {
        case UNICHROME_K8M890: