aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2011-04-22 03:09:40 -0400
committerPaul Mundt <lethal@linux-sh.org>2011-05-24 03:15:56 -0400
commitcd74ebaf7ac18eced59a3983b266be39d7b28ee0 (patch)
tree618952bda378df6df033658e7a2a5cd1d81ea992 /drivers/video
parentc9d503e93562e1de093ff16a480fc8801cfa70d9 (diff)
video: s3c-fb: add additional validate bpps
Additional validate bpps are added to windows as follows: window0: 18 bpp for RGB666 window1, 2 and 3: 28 bpp for ARGB4888 window4: 19 bpp for ARGB1666, 28 bpp for ARGB4888 Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/s3c-fb.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 88c373d9f274..cb68040dfc5b 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -1628,7 +1628,8 @@ static struct s3c_fb_win_variant s3c_fb_data_64xx_wins[] = {
1628 .has_osd_c = 1, 1628 .has_osd_c = 1,
1629 .osd_size_off = 0x8, 1629 .osd_size_off = 0x8,
1630 .palette_sz = 256, 1630 .palette_sz = 256,
1631 .valid_bpp = VALID_BPP1248 | VALID_BPP(16) | VALID_BPP(24), 1631 .valid_bpp = (VALID_BPP1248 | VALID_BPP(16) |
1632 VALID_BPP(18) | VALID_BPP(24)),
1632 }, 1633 },
1633 [1] = { 1634 [1] = {
1634 .has_osd_c = 1, 1635 .has_osd_c = 1,
@@ -1638,7 +1639,8 @@ static struct s3c_fb_win_variant s3c_fb_data_64xx_wins[] = {
1638 .palette_sz = 256, 1639 .palette_sz = 256,
1639 .valid_bpp = (VALID_BPP1248 | VALID_BPP(16) | 1640 .valid_bpp = (VALID_BPP1248 | VALID_BPP(16) |
1640 VALID_BPP(18) | VALID_BPP(19) | 1641 VALID_BPP(18) | VALID_BPP(19) |
1641 VALID_BPP(24) | VALID_BPP(25)), 1642 VALID_BPP(24) | VALID_BPP(25) |
1643 VALID_BPP(28)),
1642 }, 1644 },
1643 [2] = { 1645 [2] = {
1644 .has_osd_c = 1, 1646 .has_osd_c = 1,
@@ -1649,7 +1651,8 @@ static struct s3c_fb_win_variant s3c_fb_data_64xx_wins[] = {
1649 .palette_16bpp = 1, 1651 .palette_16bpp = 1,
1650 .valid_bpp = (VALID_BPP1248 | VALID_BPP(16) | 1652 .valid_bpp = (VALID_BPP1248 | VALID_BPP(16) |
1651 VALID_BPP(18) | VALID_BPP(19) | 1653 VALID_BPP(18) | VALID_BPP(19) |
1652 VALID_BPP(24) | VALID_BPP(25)), 1654 VALID_BPP(24) | VALID_BPP(25) |
1655 VALID_BPP(28)),
1653 }, 1656 },
1654 [3] = { 1657 [3] = {
1655 .has_osd_c = 1, 1658 .has_osd_c = 1,
@@ -1658,7 +1661,8 @@ static struct s3c_fb_win_variant s3c_fb_data_64xx_wins[] = {
1658 .palette_16bpp = 1, 1661 .palette_16bpp = 1,
1659 .valid_bpp = (VALID_BPP124 | VALID_BPP(16) | 1662 .valid_bpp = (VALID_BPP124 | VALID_BPP(16) |
1660 VALID_BPP(18) | VALID_BPP(19) | 1663 VALID_BPP(18) | VALID_BPP(19) |
1661 VALID_BPP(24) | VALID_BPP(25)), 1664 VALID_BPP(24) | VALID_BPP(25) |
1665 VALID_BPP(28)),
1662 }, 1666 },
1663 [4] = { 1667 [4] = {
1664 .has_osd_c = 1, 1668 .has_osd_c = 1,
@@ -1667,7 +1671,8 @@ static struct s3c_fb_win_variant s3c_fb_data_64xx_wins[] = {
1667 .palette_16bpp = 1, 1671 .palette_16bpp = 1,
1668 .valid_bpp = (VALID_BPP(1) | VALID_BPP(2) | 1672 .valid_bpp = (VALID_BPP(1) | VALID_BPP(2) |
1669 VALID_BPP(16) | VALID_BPP(18) | 1673 VALID_BPP(16) | VALID_BPP(18) |
1670 VALID_BPP(24) | VALID_BPP(25)), 1674 VALID_BPP(19) | VALID_BPP(24) |
1675 VALID_BPP(25) | VALID_BPP(28)),
1671 }, 1676 },
1672}; 1677};
1673 1678