video: arm: rpi: Move the video settings out of the driver

Add a function to set the video parameters to the msg handler and remove
it from the video driver.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>

diff --git a/arch/arm/mach-bcm283x/include/mach/msg.h b/arch/arm/mach-bcm283x/include/mach/msg.h
index c785c43a67ab4aeb9babc1dd59a6b7d4578c8283..478b1f1c50170ca394b496e7958b63910d7cbcd5 100644 (file)
--- a/arch/arm/mach-bcm283x/include/mach/msg.h
+++ b/arch/arm/mach-bcm283x/include/mach/msg.h
@@ -31,4 +31,21 @@ int bcm2835_get_mmc_clock(void);
  */
 int bcm2835_get_video_size(int *widthp, int *heightp);
 
+/**
+ * bcm2835_set_video_params() - set the video parameters
+ *
+ * @widthp: Video width to request (returns the actual width selected)
+ * @heightp: Video height to request (returns the actual height selected)
+ * @depth_bpp: Requested bit depth
+ * @pixel_order: Pixel order to use (BCM2835_MBOX_PIXEL_ORDER_...)
+ * @alpha_mode: Alpha transparency mode to use (BCM2835_MBOX_ALPHA_MODE_...)
+ * @fb_basep: Returns base address of frame buffer
+ * @fb_sizep: Returns size of frame buffer
+ * @pitchp: Returns number of bytes in each frame buffer line
+ * @return 0 if OK, -ve on error
+ */
+int bcm2835_set_video_params(int *widthp, int *heightp, int depth_bpp,
+                            int pixel_order, int alpha_mode, ulong *fb_basep,
+                            ulong *fb_sizep, int *pitchp);
+
 #endif

diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c
index 17266c01a69b7b9fc7c25fa35d9bbfbd7239f7a2..92e93ad9e55b24031c8c75d6525bdcf5941bf317 100644 (file)
--- a/arch/arm/mach-bcm283x/msg.c
+++ b/arch/arm/mach-bcm283x/msg.c
@@ -27,6 +27,20 @@ struct msg_query {
        u32 end_tag;
 };
 
+struct msg_setup {
+       struct bcm2835_mbox_hdr hdr;
+       struct bcm2835_mbox_tag_physical_w_h physical_w_h;
+       struct bcm2835_mbox_tag_virtual_w_h virtual_w_h;
+       struct bcm2835_mbox_tag_depth depth;
+       struct bcm2835_mbox_tag_pixel_order pixel_order;
+       struct bcm2835_mbox_tag_alpha_mode alpha_mode;
+       struct bcm2835_mbox_tag_virtual_offset virtual_offset;
+       struct bcm2835_mbox_tag_overscan overscan;
+       struct bcm2835_mbox_tag_allocate_buffer allocate_buffer;
+       struct bcm2835_mbox_tag_pitch pitch;
+       u32 end_tag;
+};
+
 int bcm2835_power_on_module(u32 module)
 {
        ALLOC_CACHE_ALIGN_BUFFER(struct msg_set_power_state, msg_pwr, 1);
@@ -91,3 +105,50 @@ int bcm2835_get_video_size(int *widthp, int *heightp)
 
        return 0;
 }
+
+int bcm2835_set_video_params(int *widthp, int *heightp, int depth_bpp,
+                            int pixel_order, int alpha_mode, ulong *fb_basep,
+                            ulong *fb_sizep, int *pitchp)
+{
+       ALLOC_CACHE_ALIGN_BUFFER(struct msg_setup, msg_setup, 1);
+       int ret;
+
+       BCM2835_MBOX_INIT_HDR(msg_setup);
+       BCM2835_MBOX_INIT_TAG(&msg_setup->physical_w_h, SET_PHYSICAL_W_H);
+       msg_setup->physical_w_h.body.req.width = *widthp;
+       msg_setup->physical_w_h.body.req.height = *heightp;
+       BCM2835_MBOX_INIT_TAG(&msg_setup->virtual_w_h, SET_VIRTUAL_W_H);
+       msg_setup->virtual_w_h.body.req.width = *widthp;
+       msg_setup->virtual_w_h.body.req.height = *heightp;
+       BCM2835_MBOX_INIT_TAG(&msg_setup->depth, SET_DEPTH);
+       msg_setup->depth.body.req.bpp = 32;
+       BCM2835_MBOX_INIT_TAG(&msg_setup->pixel_order, SET_PIXEL_ORDER);
+       msg_setup->pixel_order.body.req.order = pixel_order;
+       BCM2835_MBOX_INIT_TAG(&msg_setup->alpha_mode, SET_ALPHA_MODE);
+       msg_setup->alpha_mode.body.req.alpha = alpha_mode;
+       BCM2835_MBOX_INIT_TAG(&msg_setup->virtual_offset, SET_VIRTUAL_OFFSET);
+       msg_setup->virtual_offset.body.req.x = 0;
+       msg_setup->virtual_offset.body.req.y = 0;
+       BCM2835_MBOX_INIT_TAG(&msg_setup->overscan, SET_OVERSCAN);
+       msg_setup->overscan.body.req.top = 0;
+       msg_setup->overscan.body.req.bottom = 0;
+       msg_setup->overscan.body.req.left = 0;
+       msg_setup->overscan.body.req.right = 0;
+       BCM2835_MBOX_INIT_TAG(&msg_setup->allocate_buffer, ALLOCATE_BUFFER);
+       msg_setup->allocate_buffer.body.req.alignment = 0x100;
+       BCM2835_MBOX_INIT_TAG_NO_REQ(&msg_setup->pitch, GET_PITCH);
+
+       ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, &msg_setup->hdr);
+       if (ret) {
+               printf("bcm2835: Could not configure display\n");
+               return ret;
+       }
+       *widthp = msg_setup->physical_w_h.body.resp.width;
+       *heightp = msg_setup->physical_w_h.body.resp.height;
+       *pitchp = msg_setup->pitch.body.resp.pitch;
+       *fb_basep = bus_to_phys(
+                       msg_setup->allocate_buffer.body.resp.fb_address);
+       *fb_sizep = msg_setup->allocate_buffer.body.resp.fb_size;
+
+       return 0;
+}

diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
index eb137be11caceffd0c356882f88368980d0867fa..cd15f7f32ae9b5bfdbf3531fb70c44353e4c5dfd 100644 (file)
--- a/drivers/video/bcm2835.c
+++ b/drivers/video/bcm2835.c
@@ -17,28 +17,13 @@ DECLARE_GLOBAL_DATA_PTR;
 /* Global variables that lcd.c expects to exist */
 vidinfo_t panel_info;
 
-static u32 bcm2835_pitch;
-
-struct msg_setup {
-       struct bcm2835_mbox_hdr hdr;
-       struct bcm2835_mbox_tag_physical_w_h physical_w_h;
-       struct bcm2835_mbox_tag_virtual_w_h virtual_w_h;
-       struct bcm2835_mbox_tag_depth depth;
-       struct bcm2835_mbox_tag_pixel_order pixel_order;
-       struct bcm2835_mbox_tag_alpha_mode alpha_mode;
-       struct bcm2835_mbox_tag_virtual_offset virtual_offset;
-       struct bcm2835_mbox_tag_overscan overscan;
-       struct bcm2835_mbox_tag_allocate_buffer allocate_buffer;
-       struct bcm2835_mbox_tag_pitch pitch;
-       u32 end_tag;
-};
+static int bcm2835_pitch;
 
 void lcd_ctrl_init(void *lcdbase)
 {
-       ALLOC_CACHE_ALIGN_BUFFER(struct msg_setup, msg_setup, 1);
        int ret;
        int w, h;
-       u32 fb_start, fb_end;
+       ulong fb_base, fb_size, fb_start, fb_end;
 
        debug("bcm2835: Query resolution...\n");
        ret = bcm2835_get_video_size(&w, &h);
@@ -48,42 +33,9 @@ void lcd_ctrl_init(void *lcdbase)
        }
 
        debug("bcm2835: Setting up display for %d x %d\n", w, h);
-
-       BCM2835_MBOX_INIT_HDR(msg_setup);
-       BCM2835_MBOX_INIT_TAG(&msg_setup->physical_w_h, SET_PHYSICAL_W_H);
-       msg_setup->physical_w_h.body.req.width = w;
-       msg_setup->physical_w_h.body.req.height = h;
-       BCM2835_MBOX_INIT_TAG(&msg_setup->virtual_w_h, SET_VIRTUAL_W_H);
-       msg_setup->virtual_w_h.body.req.width = w;
-       msg_setup->virtual_w_h.body.req.height = h;
-       BCM2835_MBOX_INIT_TAG(&msg_setup->depth, SET_DEPTH);
-       msg_setup->depth.body.req.bpp = 32;
-       BCM2835_MBOX_INIT_TAG(&msg_setup->pixel_order, SET_PIXEL_ORDER);
-       msg_setup->pixel_order.body.req.order = BCM2835_MBOX_PIXEL_ORDER_RGB;
-       BCM2835_MBOX_INIT_TAG(&msg_setup->alpha_mode, SET_ALPHA_MODE);
-       msg_setup->alpha_mode.body.req.alpha = BCM2835_MBOX_ALPHA_MODE_IGNORED;
-       BCM2835_MBOX_INIT_TAG(&msg_setup->virtual_offset, SET_VIRTUAL_OFFSET);
-       msg_setup->virtual_offset.body.req.x = 0;
-       msg_setup->virtual_offset.body.req.y = 0;
-       BCM2835_MBOX_INIT_TAG(&msg_setup->overscan, SET_OVERSCAN);
-       msg_setup->overscan.body.req.top = 0;
-       msg_setup->overscan.body.req.bottom = 0;
-       msg_setup->overscan.body.req.left = 0;
-       msg_setup->overscan.body.req.right = 0;
-       BCM2835_MBOX_INIT_TAG(&msg_setup->allocate_buffer, ALLOCATE_BUFFER);
-       msg_setup->allocate_buffer.body.req.alignment = 0x100;
-       BCM2835_MBOX_INIT_TAG_NO_REQ(&msg_setup->pitch, GET_PITCH);
-
-       ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, &msg_setup->hdr);
-       if (ret) {
-               printf("bcm2835: Could not configure display\n");
-               /* FIXME: How to disable the LCD to prevent errors? hang()? */
-               return;
-       }
-
-       w = msg_setup->physical_w_h.body.resp.width;
-       h = msg_setup->physical_w_h.body.resp.height;
-       bcm2835_pitch = msg_setup->pitch.body.resp.pitch;
+       ret = bcm2835_set_video_params(&w, &h, 32, BCM2835_MBOX_PIXEL_ORDER_RGB,
+                                      BCM2835_MBOX_ALPHA_MODE_IGNORED,
+                                      &fb_base, &fb_size, &bcm2835_pitch);
 
        debug("bcm2835: Final resolution is %d x %d\n", w, h);
 
@@ -91,15 +43,14 @@ void lcd_ctrl_init(void *lcdbase)
        panel_info.vl_row = h;
        panel_info.vl_bpix = LCD_COLOR32;
 
-       gd->fb_base = bus_to_phys(
-               msg_setup->allocate_buffer.body.resp.fb_address);
+       gd->fb_base = fb_base;
 
        /* Enable dcache for the frame buffer */
-       fb_start = gd->fb_base & ~(MMU_SECTION_SIZE - 1);
-       fb_end = gd->fb_base + msg_setup->allocate_buffer.body.resp.fb_size;
+       fb_start = fb_base & ~(MMU_SECTION_SIZE - 1);
+       fb_end = fb_base + fb_size;
        fb_end = ALIGN(fb_end, 1 << MMU_SECTION_SHIFT);
        mmu_set_region_dcache_behaviour(fb_start, fb_end - fb_start,
-               DCACHE_WRITEBACK);
+                                       DCACHE_WRITEBACK);
        lcd_set_flush_dcache(1);
 }
 
@@ -110,5 +61,6 @@ void lcd_enable(void)
 int lcd_get_size(int *line_length)
 {
        *line_length = bcm2835_pitch;
+
        return *line_length * panel_info.vl_row;
 }