From c7fb569a5ce2627408b173810965e768e780c011 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 22 Aug 2007 08:43:34 -0300
Subject: [PATCH] --- yaml --- r: 65791 b: refs/heads/master c:
 d2a35fb172845fe75c40a3ee9c95656c7c115e48 h: refs/heads/master i:   65789:
 208ad7007850abf2582b6e08655e6858fa1719ff   65787:
 288859c209dec66cca0601be862575184ba51e22   65783:
 53749ffc3d83fd7e9976a17f98fd8ecb5c816206   65775:
 0d05c368621f8d5456a65b80f28d9e61a957146c   65759:
 0e7bf2c2e6863e41c7ff647af229d80c618941cd   65727:
 b364090fa812701f4b79cd93a8d716efbce17bd7   65663:
 edc18e14963f92009585a67c14158cd493a5d842   65535:
 9f7407a1ae7917d67e0caeb8494b65a264d36c67 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/video/ivtv/ivtv-ioctl.c | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c2bf0c475885..98396c6147f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01f1e44fe8455b6c6c557a62119b8622fb99f5f2
+refs/heads/master: d2a35fb172845fe75c40a3ee9c95656c7c115e48
diff --git a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
index 0dde82f67e26..bb59634419cc 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -1270,7 +1270,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
 				"Global and Local"
 			};
 			static const char * const pixel_format[] = {
-				"Indexed",
+				"RGB Indexed",
 				"RGB 5:6:5",
 				"ARGB 1:5:5:5",
 				"ARGB 1:4:4:4",
@@ -1278,6 +1278,14 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
 				"5",
 				"6",
 				"7",
+				"YUV Indexed",
+				"YUV 5:6:5",
+				"AYUV 1:5:5:5",
+				"AYUV 1:4:4:4",
+				"AYUV 8:8:8:8",
+				"13",
+				"14",
+				"15",
 			};
 
 			ivtv_get_output(itv, itv->active_output, &vidout);
@@ -1290,10 +1298,11 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
 				mode = OUT_NONE;
 			IVTV_INFO("Output Mode:  %s\n", output_modes[mode]);
 			ivtv_vapi_result(itv, data, CX2341X_OSD_GET_STATE, 0);
+			data[0] |= (read_reg(0x2a00) >> 7) & 0x40;
 			IVTV_INFO("Overlay:      %s, Alpha: %s, Pixel Format: %s\n",
 				data[0] & 1 ? "On" : "Off",
 				alpha_mode[(data[0] >> 1) & 0x3],
-				pixel_format[(data[0] >> 3) & 0x7]);
+				pixel_format[(data[0] >> 3) & 0xf]);
 		}
 		IVTV_INFO("Tuner:  %s\n",
 			test_bit(IVTV_F_I_RADIO_USER, &itv->i_flags) ? "Radio" : "TV");