2 files changed, 26 insertions, 0 deletions

diff --git a/drivers/video/via/accel.c b/drivers/video/via/accel.c
index e77746857c8f..189aba41f9b9 100644
--- a/drivers/video/via/accel.c
+++ b/drivers/video/via/accel.c
@@ -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:
diff --git a/drivers/video/via/via-core.h b/drivers/video/via/via-core.h
index 3d03141d6074..087c562abaec 100644
--- a/drivers/video/via/via-core.h
+++ b/drivers/video/via/via-core.h
@@ -78,6 +78,10 @@ struct viafb_dev {
         unsigned long fbmem_start;
         long fbmem_len;
         void __iomem *fbmem;
+#if defined(CONFIG_FB_VIA_CAMERA) || defined(CONFIG_FB_VIA_CAMERA_MODULE)
+        long camera_fbmem_offset;
+        long camera_fbmem_size;
+#endif
         /*
          * The MMIO region for device registers.
          */
@@ -160,4 +164,10 @@ int viafb_dma_copy_out_sg(unsigned int offset, struct scatterlist *sg, int nsg);
 #define VDMA_DPRH0      0xe38
 #define VDMA_PMR0       (0xe00 + 0x134) /* Pitch mode */
 
+/*
+ * Useful stuff that probably belongs somewhere global.
+ */
+#define VGA_WIDTH       640
+#define VGA_HEIGHT      480
+
 #endif /* __VIA_CORE_H__ */