diff options
| author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2013-04-04 16:03:55 +0800 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@linaro.org> | 2013-04-04 16:03:55 +0800 |
| commit | b1c56292a748d7f4748c480bf89a8d0941e92ac0 (patch) | |
| tree | 7675ec08232a25e1901a080cb8720c0c94fd7ae2 | |
| parent | 4f225364ba908b120c33230573c66a6fab631012 (diff) | |
fb: append flags of de and pixdata
Since there're DATA ENABLE & PIXDATA postive/negative flags in
data flags of display_timing structure, they should be copied into
fb_videomode structure too.
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
| -rw-r--r-- | drivers/video/fbmon.c | 10 | ||||
| -rw-r--r-- | include/uapi/linux/fb.h | 5 |
2 files changed, 14 insertions, 1 deletions
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index 94ad0f71383..7e1fb813b06 100644 --- a/drivers/video/fbmon.c +++ b/drivers/video/fbmon.c @@ -1398,6 +1398,7 @@ int fb_videomode_from_videomode(const struct videomode *vm, fbmode->sync = 0; fbmode->vmode = 0; + fbmode->flag = 0; if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH) fbmode->sync |= FB_SYNC_HOR_HIGH_ACT; if (vm->dmt_flags & VESA_DMT_HSYNC_HIGH) @@ -1406,7 +1407,14 @@ int fb_videomode_from_videomode(const struct videomode *vm, fbmode->vmode |= FB_VMODE_INTERLACED; if (vm->data_flags & DISPLAY_FLAGS_DOUBLESCAN) fbmode->vmode |= FB_VMODE_DOUBLE; - fbmode->flag = 0; + if (vm->data_flags & DISPLAY_FLAGS_DE_HIGH) + fbmode->flag |= FB_FLAG_DE_HIGH; + if (vm->data_flags & DISPLAY_FLAGS_DE_LOW) + fbmode->flag |= FB_FLAG_DE_LOW; + if (vm->data_flags & DISPLAY_FLAGS_PIXDATA_POSEDGE) + fbmode->flag |= FB_FLAG_PIXDATA_POSEDGE; + if (vm->data_flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE) + fbmode->flag |= FB_FLAG_PIXDATA_NEGEDGE; htotal = vm->hactive + vm->hfront_porch + vm->hback_porch + vm->hsync_len; diff --git a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h index fb795c3b3c1..864e01e9613 100644 --- a/include/uapi/linux/fb.h +++ b/include/uapi/linux/fb.h @@ -226,6 +226,11 @@ struct fb_bitfield { #define FB_VMODE_SMOOTH_XPAN 512 /* smooth xpan possible (internally used) */ #define FB_VMODE_CONUPDATE 512 /* don't update x/yoffset */ +#define FB_FLAG_DE_HIGH 1 /* data enable high active */ +#define FB_FLAG_DE_LOW 2 /* data enable low active */ +#define FB_FLAG_PIXDATA_POSEDGE 4 /* pixdata postive edge */ +#define FB_FLAG_PIXDATA_NEGEDGE 8 /* pixdata negative edge */ + /* * Display rotation support */ |