From 54a9a9461850b7b5d4aff7c4d9bde94fd100c0a4 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Wed, 3 Oct 2018 19:17:48 +0200
Subject: [PATCH] kodi: add option to use Rockchip vendor repo

Adds Rockchip HDR support
---
 packages/mediacenter/kodi/package.mk          |  6 +++
 projects/Rockchip/kodi/appliance.xml          | 13 +++++
 projects/Rockchip/options                     |  3 ++
 .../linux/rockchip-4.4/linux-1000-limit.patch | 49 -------------------
 4 files changed, 22 insertions(+), 49 deletions(-)
 delete mode 100644 projects/Rockchip/patches/linux/rockchip-4.4/linux-1000-limit.patch

diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index fc2718ec57..272c9df3bc 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -20,6 +20,12 @@ case $KODI_VENDOR in
     PKG_URL="https://github.com/popcornmix/xbmc/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
     ;;
+  rockchip)
+    PKG_VERSION="rockchip_18.0b3-Leia"
+    PKG_SHA256="e785669ffe70cee47bcbc83c3d75a17b73e77c8add4f1cca4a983552711f821e"
+    PKG_URL="https://github.com/kwiboo/xbmc/archive/$PKG_VERSION.tar.gz"
+    PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
+    ;;
   *)
     PKG_VERSION="18.0b3-Leia"
     PKG_SHA256="cc5f1a75287438b2336c49a265019a4cab9626235e05a70345d77e4cecd6dce3"
diff --git a/projects/Rockchip/kodi/appliance.xml b/projects/Rockchip/kodi/appliance.xml
index ff2ebcc36e..349df96ec0 100644
--- a/projects/Rockchip/kodi/appliance.xml
+++ b/projects/Rockchip/kodi/appliance.xml
@@ -12,6 +12,13 @@
         <setting id="videoscreen.fakefullscreen">
           <visible>false</visible>
         </setting>
+        <setting id="videoscreen.limitguisize">
+          <default>3</default>
+          <visible>true</visible>
+        </setting>
+        <setting id="videoscreen.hdmioutputformat">
+          <visible>true</visible>
+        </setting>
       </group>
       <group id="3">
         <setting id="videoscreen.noofbuffers">
@@ -42,6 +49,12 @@
           <default>2</default>
         </setting>
       </group>
+      <group id="3">
+        <setting id="videoplayer.hdmioutputformat">
+          <default>2</default>
+          <visible>true</visible>
+        </setting>
+      </group>
     </category>
   </section>
 </settings>
diff --git a/projects/Rockchip/options b/projects/Rockchip/options
index 5744d9e477..21628264ca 100644
--- a/projects/Rockchip/options
+++ b/projects/Rockchip/options
@@ -49,6 +49,9 @@
   # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
     GRAPHIC_DRIVERS=""
 
+  # Use a vendor specific KODI repo
+    KODI_VENDOR="rockchip"
+
   # KODI Player implementation to use (default / bcm2835-driver / libfslvpuwrap)
     KODIPLAYER_DRIVER="rkmpp"
 
diff --git a/projects/Rockchip/patches/linux/rockchip-4.4/linux-1000-limit.patch b/projects/Rockchip/patches/linux/rockchip-4.4/linux-1000-limit.patch
deleted file mode 100644
index ecea7bf2b9..0000000000
--- a/projects/Rockchip/patches/linux/rockchip-4.4/linux-1000-limit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 6ed983631422dcce52d8b029818617b4cd067a93 Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Sat, 21 Apr 2018 12:52:58 +0200
-Subject: [PATCH] drm/rockchip: skip 4K 50/60Hz clocks for RK3328
-
----
- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-index e2aad6e2149b..6399bb2f3a32 100644
---- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-@@ -519,6 +519,10 @@ dw_hdmi_rockchip_mode_valid(struct drm_connector *connector,
- 	if (hdmi->dev_type == RK3288_HDMI && (mode->clock < 27500 || mode->clock > 340000))
- 		return MODE_CLOCK_RANGE;
- 
-+	/* Skip 4K 50/60Hz clocks for RK3328 */
-+	if (hdmi->dev_type == RK3328_HDMI && mode->clock > 340000)
-+		return MODE_CLOCK_RANGE;
-+
- 	/*
- 	 * ensure all drm display mode can work, if someone want support more
- 	 * resolutions, please limit the possible_crtc, only connect to
-
-From 3953395d6056914e32f4d3459cdb0d5bd8c362a0 Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Sat, 21 Apr 2018 12:53:04 +0200
-Subject: [PATCH] drm/rockchip: skip 4K 50/60Hz clocks for RK3399
-
----
- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-index 6399bb2f3a32..3171c21f1c78 100644
---- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
-@@ -523,6 +523,10 @@ dw_hdmi_rockchip_mode_valid(struct drm_connector *connector,
- 	if (hdmi->dev_type == RK3328_HDMI && mode->clock > 340000)
- 		return MODE_CLOCK_RANGE;
- 
-+	/* Skip 4K 50/60Hz clocks for RK3399 */
-+	if (hdmi->dev_type == RK3399_HDMI && mode->clock > 340000)
-+		return MODE_CLOCK_RANGE;
-+
- 	/*
- 	 * ensure all drm display mode can work, if someone want support more
- 	 * resolutions, please limit the possible_crtc, only connect to