80 lines
2.4 KiB
Diff
80 lines
2.4 KiB
Diff
|
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
|
||
|
|
index 448cf1d2839..2b9e9675da5 100644
|
||
|
|
--- a/drivers/video/msm/msm_fb.c
|
||
|
|
+++ b/drivers/video/msm/msm_fb.c
|
||
|
|
@@ -1459,16 +1459,16 @@ static int msm_fb_register(struct msm_fb_data_type *mfd)
|
||
|
|
fix->xpanstep = 1;
|
||
|
|
fix->ypanstep = 1;
|
||
|
|
var->vmode = FB_VMODE_NONINTERLACED;
|
||
|
|
- var->blue.offset = 0;
|
||
|
|
- var->green.offset = 8;
|
||
|
|
- var->red.offset = 16;
|
||
|
|
+ var->blue.offset = 24;
|
||
|
|
+ var->green.offset = 16;
|
||
|
|
+ var->red.offset = 8;
|
||
|
|
var->blue.length = 8;
|
||
|
|
var->green.length = 8;
|
||
|
|
var->red.length = 8;
|
||
|
|
var->blue.msb_right = 0;
|
||
|
|
var->green.msb_right = 0;
|
||
|
|
var->red.msb_right = 0;
|
||
|
|
- var->transp.offset = 24;
|
||
|
|
+ var->transp.offset = 0;
|
||
|
|
var->transp.length = 8;
|
||
|
|
bpp = 4;
|
||
|
|
break;
|
||
|
|
@@ -1478,16 +1478,16 @@ static int msm_fb_register(struct msm_fb_data_type *mfd)
|
||
|
|
fix->xpanstep = 1;
|
||
|
|
fix->ypanstep = 1;
|
||
|
|
var->vmode = FB_VMODE_NONINTERLACED;
|
||
|
|
- var->blue.offset = 8;
|
||
|
|
- var->green.offset = 16;
|
||
|
|
- var->red.offset = 24;
|
||
|
|
+ var->blue.offset = 16;
|
||
|
|
+ var->green.offset = 8;
|
||
|
|
+ var->red.offset = 0;
|
||
|
|
var->blue.length = 8;
|
||
|
|
var->green.length = 8;
|
||
|
|
var->red.length = 8;
|
||
|
|
var->blue.msb_right = 0;
|
||
|
|
var->green.msb_right = 0;
|
||
|
|
var->red.msb_right = 0;
|
||
|
|
- var->transp.offset = 0;
|
||
|
|
+ var->transp.offset = 24;
|
||
|
|
var->transp.length = 8;
|
||
|
|
bpp = 4;
|
||
|
|
break;
|
||
|
|
@@ -2357,15 +2357,15 @@ static int msm_fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
|
||
|
|
/* Figure out if the user meant RGBA or ARGB
|
||
|
|
and verify the position of the RGB components */
|
||
|
|
|
||
|
|
- if (var->transp.offset == 24) {
|
||
|
|
- if ((var->blue.offset != 0) ||
|
||
|
|
- (var->green.offset != 8) ||
|
||
|
|
- (var->red.offset != 16))
|
||
|
|
- return -EINVAL;
|
||
|
|
- } else if (var->transp.offset == 0) {
|
||
|
|
- if ((var->blue.offset != 8) ||
|
||
|
|
+ if (var->transp.offset == 0) {
|
||
|
|
+ if ((var->blue.offset != 24) ||
|
||
|
|
(var->green.offset != 16) ||
|
||
|
|
- (var->red.offset != 24))
|
||
|
|
+ (var->red.offset != 8))
|
||
|
|
+ return -EINVAL;
|
||
|
|
+ } else if (var->transp.offset == 24) {
|
||
|
|
+ if ((var->blue.offset != 16) ||
|
||
|
|
+ (var->green.offset != 8) ||
|
||
|
|
+ (var->red.offset != 0))
|
||
|
|
return -EINVAL;
|
||
|
|
} else
|
||
|
|
return -EINVAL;
|
||
|
|
@@ -2462,7 +2462,7 @@ static int msm_fb_set_par(struct fb_info *info)
|
||
|
|
break;
|
||
|
|
|
||
|
|
case 32:
|
||
|
|
- if (var->transp.offset == 24)
|
||
|
|
+ if (var->transp.offset == 0)
|
||
|
|
mfd->fb_imgType = MDP_ARGB_8888;
|
||
|
|
else
|
||
|
|
mfd->fb_imgType = MDP_RGBA_8888;
|