summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPuneet Saxena <puneets@nvidia.com>2012-01-24 13:02:37 +0530
committerPuneet Saxena <puneets@nvidia.com>2012-02-07 02:04:35 -0800
commitfbe8695649c2302a6513ebb4a24b3ce2d17c9e96 (patch)
tree4162fea4d3682b220cf5bd67c61eac7669021b62 /drivers
parent38925fa36fe37323bbb4ba09b7059a817fccb1e0 (diff)
video: tegra: Update LCD max height & 'lcd_line_length'
Assert occurs due to LCD max height was bigger than default Maximum LCD height, causing 'panel_info' is not initialized. Increase default Max LCD height as Waluigi has LCD height in pixel more than 768. Initialize global variable 'lcd_line_length' correctly. 'lcd_line_length' was not initialized before use, causing initialization of dependent variables wrongly. BUG=chromium-os:23496 TEST=Build ok for Cardhu, Waluigi and Seaboard. Tested on Waluigi. Change-Id: I24a9fc54541c861c48fd885e2d58d32786c31bf8 Signed-off-by: Puneet Saxena <puneets@nvidia.com> Reviewed-on: https://gerrit.chromium.org/gerrit/14699
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/tegra.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c
index 13574877c25..38b3ba69c27 100644
--- a/drivers/video/tegra.c
+++ b/drivers/video/tegra.c
@@ -50,7 +50,7 @@ static struct fdt_lcd config; /* Our LCD config, set up in handle_stage() */
enum {
/* Maximum LCD size we support */
LCD_MAX_WIDTH = 1366,
- LCD_MAX_HEIGHT = 768,
+ LCD_MAX_HEIGHT = 800,
LCD_MAX_LOG2_BPP = 4, /* 16 bpp */
};
@@ -199,7 +199,7 @@ static void update_panel_size(struct fdt_lcd *config)
void lcd_ctrl_init(void *lcdbase)
{
- int line_length, size;
+ int size;
/*
* The framebuffer address should be specified in the device tree.
@@ -221,10 +221,11 @@ void lcd_ctrl_init(void *lcdbase)
assert(config.width <= LCD_MAX_WIDTH);
assert(config.height <= LCD_MAX_HEIGHT);
assert(config.log2_bpp <= LCD_MAX_LOG2_BPP);
- if (config.width <= LCD_MAX_WIDTH && config.height <= LCD_MAX_HEIGHT &&
+ if (config.width <= LCD_MAX_WIDTH &&
+ config.height <= LCD_MAX_HEIGHT &&
config.log2_bpp <= LCD_MAX_LOG2_BPP)
update_panel_size(&config);
- size = lcd_get_size(&line_length),
+ size = lcd_get_size(&lcd_line_length),
/* call board specific hw init */
init_lcd(&config);