From b586bbd8ae301622a17f1fa21683b39255f3527e Mon Sep 17 00:00:00 2001 From: martii Date: Mon, 21 Oct 2013 19:41:48 +0200 Subject: [PATCH] Revert "libspark/video: enable/disable analogue output when leaving/entering standby mode (experimental and untested)" This reverts commit 3bc1035ecf6ada80f32ba65eb252861cb575bd18. Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/e44c547d782be28a3b04292585a03ef898acacbd Author: martii Date: 2013-10-21 (Mon, 21 Oct 2013) ------------------ This commit was generated by Migit --- libspark/video.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libspark/video.cpp b/libspark/video.cpp index 905ac19..b724a43 100644 --- a/libspark/video.cpp +++ b/libspark/video.cpp @@ -154,18 +154,13 @@ static int hdmi_out(bool enable) goto out; } hdmi_enabled = enable; - out.caps = STMFBIO_OUTPUT_CAPS_HDMI_CONFIG | STMFBIO_OUTPUT_CAPS_ANALOGUE_CONFIG; + out.caps = STMFBIO_OUTPUT_CAPS_HDMI_CONFIG; out.activate = STMFBIO_ACTIVATE_IMMEDIATE; + out.analogue_config = 0; if (enable) - { - out.analogue_config |= STMFBIO_OUTPUT_ANALOGUE_MASK; out.hdmi_config &= ~STMFBIO_OUTPUT_HDMI_DISABLED; - } else - { - out.analogue_config &= ~STMFBIO_OUTPUT_ANALOGUE_MASK; out.hdmi_config |= STMFBIO_OUTPUT_HDMI_DISABLED; - } ret = ioctl(fb, STMFBIO_SET_OUTPUT_CONFIG, &out); if (ret < 0)