[4/4] davinci: Fix transparency handling with dm365.

Commit Message

Gilles Chanteperdrix May 18, 2010, 12:56 p.m. UTC

None

Patch

diff --git a/drivers/media/video/davinci/davinci_osd.c b/drivers/media/video/davinci/davinci_osd.c
index c285f99..a5fc01d 100644
--- a/drivers/media/video/davinci/davinci_osd.c
+++ b/drivers/media/video/davinci/davinci_osd.c
@@ -1231,7 +1231,7 @@  static void _davinci_disp_enable_color_key(enum davinci_osd_layer osdwin,
 	case PIXFMT_2BPP:
 	case PIXFMT_4BPP:
 	case PIXFMT_8BPP:
-		if (cpu_is_davinci_dm355()) {
+		if (cpu_is_davinci_dm355() || cpu_is_davinci_dm365()) {
 			switch (osdwin) {
 			case OSDWIN_OSD0:
 				osd_merge(OSD_TRANSPBMPIDX_BMP0,
@@ -1252,18 +1252,18 @@  static void _davinci_disp_enable_color_key(enum davinci_osd_layer osdwin,
 		if (cpu_is_davinci_dm644x()) {
 			osd_write(colorkey & OSD_TRANSPVAL_RGBTRANS,
 				  OSD_TRANSPVAL);
-		} else if (cpu_is_davinci_dm355()) {
+		} else if (cpu_is_davinci_dm355() || cpu_is_davinci_dm365()) {
 			osd_write(colorkey & OSD_TRANSPVALL_RGBL,
 				  OSD_TRANSPVALL);
 		}
 		break;
 	case PIXFMT_YCbCrI:
 	case PIXFMT_YCrCbI:
-		if (cpu_is_davinci_dm355())
+		if (cpu_is_davinci_dm355() || cpu_is_davinci_dm365())
 			osd_merge(OSD_TRANSPVALU_Y, colorkey, OSD_TRANSPVALU);
 		break;
 	case PIXFMT_RGB888:
-		if (cpu_is_davinci_dm355()) {
+		if (cpu_is_davinci_dm355() || cpu_is_davinci_dm365()) {
 			osd_write(colorkey & OSD_TRANSPVALL_RGBL,
 				  OSD_TRANSPVALL);
 			osd_merge(OSD_TRANSPVALU_RGBU, colorkey >> 16,