UPSTREAM: video: Add new aspect ratios for HDMI 2.0

HDMI 2.0/CEA-861-F introduces two new aspect ratios:
- 64:27
- 256:135

This patch adds enumeration for the new aspect ratios
in the existing aspect ratio list.

V2: rebase
V3: rebase
V4: Added r-b from Jose, Ack by Tomi

Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Jose Abreu <Jose.Abreu@synopsys.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1476705880-15600-4-git-send-email-shashank.sharma@intel.com
Change-Id: Ia0f63835c5ab44482baaf08c6f498d30997814d5
(cherry picked from commit a6e78b3e1406575323b30b65890ee3c29930fb27)
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c
index 162689227a23d5d2ecbc62d58ff6e0d6a363353b..1cf907ecded4eb72e191dfe727858f4ec433b08f 100644 (file)
--- a/drivers/video/hdmi.c
+++ b/drivers/video/hdmi.c
@@ -533,6 +533,10 @@ hdmi_picture_aspect_get_name(enum hdmi_picture_aspect picture_aspect)
                return "4:3";
        case HDMI_PICTURE_ASPECT_16_9:
                return "16:9";
+       case HDMI_PICTURE_ASPECT_64_27:
+               return "64:27";
+       case HDMI_PICTURE_ASPECT_256_135:
+               return "256:135";
        case HDMI_PICTURE_ASPECT_RESERVED:
                return "Reserved";
        }

diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index 6e234093d435a286867934043f08e4c1974b42eb..bc38b99a9fc9615955749af1ad644ec293313e8c 100644 (file)
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -79,6 +79,8 @@ enum hdmi_picture_aspect {
        HDMI_PICTURE_ASPECT_NONE,
        HDMI_PICTURE_ASPECT_4_3,
        HDMI_PICTURE_ASPECT_16_9,
+       HDMI_PICTURE_ASPECT_64_27,
+       HDMI_PICTURE_ASPECT_256_135,
        HDMI_PICTURE_ASPECT_RESERVED,
 };