From e6169efe37fc460032ae05072b5e6849e103bdea Mon Sep 17 00:00:00 2001
From: Joy Cho <joy.cho@hardkernel.com>
Date: Mon, 6 Mar 2017 16:48:35 +0900
Subject: [PATCH] drm/exynos: Add new hdmi modes, 480x800p60hz/1920x1200p60hz

Change-Id: Idbfd34015c56f5715ca893d91fffdb0e0af8eaec
(cherry picked from commit 9c60de878944dc7169452adfc6abf284e9b92f52)
---
 arch/arm/configs/odroidxu3_defconfig |   2 +-
 drivers/gpu/drm/exynos/exynos_hdmi.c |   9 +++++++++
 firmware/edid/1920x1200_60hz.bin     | Bin 0 -> 128 bytes
 firmware/edid/480x800.bin            | Bin 0 -> 128 bytes
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 firmware/edid/1920x1200_60hz.bin
 create mode 100644 firmware/edid/480x800.bin

diff --git a/arch/arm/configs/odroidxu3_defconfig b/arch/arm/configs/odroidxu3_defconfig
index f2b86bd62cfd..6e3c9b354411 100644
--- a/arch/arm/configs/odroidxu3_defconfig
+++ b/arch/arm/configs/odroidxu3_defconfig
@@ -1552,7 +1552,7 @@ CONFIG_STANDALONE=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE="edid/1024x768.bin edid/1280x800.bin edid/1920x1080.bin edid/720x480.bin edid/800x600.bin edid/800x480.bin edid/1280x1024.bin edid/1280x720.bin edid/1440x900.bin edid/1680x1050.bin edid/1360x768.bin edid/1366x768.bin edid/1600x1200.bin edid/1600x900.bin edid/1920x1200_30hz.bin edid/1920x1080_50hz.bin edid/640x480.bin edid/720x576.bin edid/1024x600.bin"
+CONFIG_EXTRA_FIRMWARE="edid/1024x768.bin edid/1280x800.bin edid/1920x1080.bin edid/720x480.bin edid/800x600.bin edid/800x480.bin edid/480x800.bin edid/1280x1024.bin edid/1280x720.bin edid/1440x900.bin edid/1680x1050.bin edid/1360x768.bin edid/1366x768.bin edid/1600x1200.bin edid/1600x900.bin edid/1920x1200_30hz.bin edid/1920x1200_60hz.bin edid/1920x1080_50hz.bin edid/640x480.bin edid/720x576.bin edid/1024x600.bin"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_ALLOW_DEV_COREDUMP=y
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 7e84d79f40bd..cf4aa8bc47e4 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -596,6 +596,15 @@ static const struct hdmiphy_config hdmiphy_5420_configs[] = {
 			0x54, 0x4B, 0x25, 0x03, 0x00, 0x80, 0x01, 0x80,
 		},
 	},
+	{
+		.pixel_clock = 154000000,
+		.conf = {
+			0x01, 0xD1, 0x20, 0x01, 0x40, 0x30, 0x08, 0xCC,
+			0x8C, 0xE8, 0xC1, 0xD8, 0x45, 0xA0, 0xAC, 0x80,
+			0x08, 0x80, 0x09, 0x84, 0x05, 0x02, 0x24, 0x86,
+			0x54, 0x3F, 0x25, 0x03, 0x00, 0x00, 0x01, 0x80,
+		},
+	},
 	{
 		.pixel_clock = 162000000,
 		.conf = {
diff --git a/firmware/edid/1920x1200_60hz.bin b/firmware/edid/1920x1200_60hz.bin
new file mode 100644
index 0000000000000000000000000000000000000000..74bd878e232c66111c9f5230e41e221c2894e081
GIT binary patch
literal 128
zcmZSh4+ad1ISgRHBhAR1Yb0OsD(=9NNUs^H3IQQN@rw+MC_uxeVL`zLWd}7aHHI%1
zf(#5&Kt=x<d@}P&D-@IsxD<c@DDs!V+Sb!sfC0=0i~M0Qv@|lPFf=j%D`Kz&0C;2_
A0RR91

literal 0
HcmV?d00001

diff --git a/firmware/edid/480x800.bin b/firmware/edid/480x800.bin
new file mode 100644
index 0000000000000000000000000000000000000000..87f7e8f7fcaa1b4c0f42925d842cad4484081edf
GIT binary patch
literal 128
zcmZSh4+ac|HyFTxRg952S3tVrRosCkkzO-Y6#_zl;<ASrQ9uLFg9ZTwT>}k+%M8mz
z85tNPfQtSz_+;jlRwyVNa47%*P~<Ozt-Y}+3j>%B7Wu<qVqs8WVE|F0z|aE#gZ3Q(

literal 0
HcmV?d00001