merge in jb-mr1-factory-release history after reset to jb-mr1-dev
diff --git a/include/videodev2_exynos_media.h b/include/videodev2_exynos_media.h
index 172cc30..0cb5876 100644
--- a/include/videodev2_exynos_media.h
+++ b/include/videodev2_exynos_media.h
@@ -63,6 +63,7 @@
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#define V4L2_CID_TV_ENABLE_HDMI_AUDIO (V4L2_CID_EXYNOS_BASE + 61)
#define V4L2_CID_TV_SET_NUM_CHANNELS (V4L2_CID_EXYNOS_BASE + 62)
+#define V4L2_CID_TV_UPDATE (V4L2_CID_EXYNOS_BASE + 63)
#define V4L2_CID_CSC_EQ_MODE (V4L2_CID_EXYNOS_BASE + 100)
#define V4L2_CID_CSC_EQ (V4L2_CID_EXYNOS_BASE + 101)
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
diff --git a/libhwc/hwc.cpp b/libhwc/hwc.cpp
index 9985b95..d9c8166 100644
--- a/libhwc/hwc.cpp
+++ b/libhwc/hwc.cpp
@@ -1504,6 +1504,11 @@
if (!fb_layer)
hdmi_disable_layer(pdev, pdev->hdmi_layers[1]);
+ if (exynos_v4l2_s_ctrl(pdev->hdmi_layers[1].fd, V4L2_CID_TV_UPDATE, 1) < 0) {
+ ALOGE("%s: s_ctrl(CID_TV_UPDATE) failed %d", __func__, errno);
+ return -1;
+ }
+
return 0;
}
diff --git a/original-kernel-headers/linux/videodev2_exynos_media.h b/original-kernel-headers/linux/videodev2_exynos_media.h
index 92d6cef..cbb3942 100644
--- a/original-kernel-headers/linux/videodev2_exynos_media.h
+++ b/original-kernel-headers/linux/videodev2_exynos_media.h
@@ -84,6 +84,7 @@
#define V4L2_CID_TV_MAX_AUDIO_CHANNELS (V4L2_CID_EXYNOS_BASE + 60)
#define V4L2_CID_TV_ENABLE_HDMI_AUDIO (V4L2_CID_EXYNOS_BASE + 61)
#define V4L2_CID_TV_SET_NUM_CHANNELS (V4L2_CID_EXYNOS_BASE + 62)
+#define V4L2_CID_TV_UPDATE (V4L2_CID_EXYNOS_BASE + 63)
/* for color space conversion equation selection */
#define V4L2_CID_CSC_EQ_MODE (V4L2_CID_EXYNOS_BASE + 100)
