aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNagamalleswararao Ganji <nganji@codeaurora.org>2012-07-04 03:06:41 (GMT)
committerNagamalleswararao Ganji <nganji@codeaurora.org>2012-07-30 07:14:26 (GMT)
commitec5b2ff6857134832d165b8c2db8174c0d0ef4a7 (patch)
tree46553215dece4b4e5e9184672e9b4ace36bf899d
parent73749a2af31f92193e859a6f7e6b5707f68d0a9d (diff)
msm: display: use the fb reserved fields same as kernel 3.0
Reserved fields of fb structure used for various use cases in qcom fb driver. Reducing the reserved fields caused lot of side effects and it will change the reserved fields same as kernel 3.0. Change-Id: I7bf82a9b5667cb5c84b54e428bbfcb6869157bd7 Signed-off-by: Nagamalleswararao Ganji <nganji@codeaurora.org>
-rw-r--r--drivers/video/msm/external_common.c4
-rw-r--r--drivers/video/msm/msm_fb.c10
-rw-r--r--include/linux/fb.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/msm/external_common.c b/drivers/video/msm/external_common.c
index 9f301fe..46ef7b4 100644
--- a/drivers/video/msm/external_common.c
+++ b/drivers/video/msm/external_common.c
@@ -1981,8 +1981,8 @@ bool hdmi_common_get_video_format_from_drv_data(struct msm_fb_data_type *mfd)
struct fb_var_screeninfo *var = &mfd->fbi->var;
bool changed = TRUE;
- if (var->reserved[2]) {
- format = var->reserved[2]-1;
+ if (var->reserved[3]) {
+ format = var->reserved[3]-1;
DEV_DBG("reserved format is %d\n", format);
} else if (hdmi_prim_resolution) {
format = hdmi_prim_resolution - 1;
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index 7bf516d..0f948b1 100644
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -1310,14 +1310,14 @@ static int msm_fb_register(struct msm_fb_data_type *mfd)
var->bits_per_pixel = bpp * 8; /* FrameBuffer color depth */
if (mfd->dest == DISPLAY_LCD) {
if (panel_info->type == MDDI_PANEL && panel_info->mddi.is_type1)
- var->reserved[3] = panel_info->lcd.refx100 / (100 * 2);
+ var->reserved[4] = panel_info->lcd.refx100 / (100 * 2);
else
- var->reserved[3] = panel_info->lcd.refx100 / 100;
+ var->reserved[4] = panel_info->lcd.refx100 / 100;
} else {
if (panel_info->type == MIPI_VIDEO_PANEL) {
- var->reserved[3] = panel_info->mipi.frame_rate;
+ var->reserved[4] = panel_info->mipi.frame_rate;
} else {
- var->reserved[3] = panel_info->clk_rate /
+ var->reserved[4] = panel_info->clk_rate /
((panel_info->lcdc.h_back_porch +
panel_info->lcdc.h_front_porch +
panel_info->lcdc.h_pulse_width +
@@ -1328,7 +1328,7 @@ static int msm_fb_register(struct msm_fb_data_type *mfd)
panel_info->yres));
}
}
- pr_debug("reserved[3] %u\n", var->reserved[3]);
+ pr_debug("reserved[4] %u\n", var->reserved[4]);
/*
* id field for fb app
diff --git a/include/linux/fb.h b/include/linux/fb.h
index d31cb68..f6a2923 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -279,7 +279,7 @@ struct fb_var_screeninfo {
__u32 vmode; /* see FB_VMODE_* */
__u32 rotate; /* angle we rotate counter clockwise */
__u32 colorspace; /* colorspace for FOURCC-based modes */
- __u32 reserved[4]; /* Reserved for future compatibility */
+ __u32 reserved[5]; /* Reserved for future compatibility */
};
struct fb_cmap {