From 886d69a001dc950918922b8d013e3fdc24e47178 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 26 Jan 2016 10:48:07 -0600
Subject: [PATCH] fix: CONFIG_DRM_I2C_ADIHDMI
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patch.sh | 12 ++++-
...alternative-adv7511-driver-with-audi.patch | 6 +--
...dmi-componentize-driver-and-huge-ref.patch | 6 +--
...dihdmi-Drop-dummy-save-restore-hooks.patch | 52 +++++++++++++++++++
...dihdmi-Pass-name-to-drm_encoder_init.patch | 26 ++++++++++
...row-BeagleBone-Black-Industrial-dts.patch} | 4 +-
patches/defconfig | 2 +-
version.sh | 2 +-
8 files changed, 98 insertions(+), 12 deletions(-)
create mode 100644 patches/beaglebone/abbbi/0003-drm-adihdmi-Drop-dummy-save-restore-hooks.patch
create mode 100644 patches/beaglebone/abbbi/0004-drm-adihdmi-Pass-name-to-drm_encoder_init.patch
rename patches/beaglebone/abbbi/{0003-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch => 0005-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch} (97%)
diff --git a/patch.sh b/patch.sh
index 6aa1afa4c..daa6d3788 100644
--- a/patch.sh
+++ b/patch.sh
@@ -487,10 +487,18 @@ beaglebone () {
${git} "${DIR}/patches/beaglebone/abbbi/0001-gpu-drm-i2c-add-alternative-adv7511-driver-with-audi.patch"
${git} "${DIR}/patches/beaglebone/abbbi/0002-gpu-drm-i2c-adihdmi-componentize-driver-and-huge-ref.patch"
- ${git} "${DIR}/patches/beaglebone/abbbi/0003-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch"
+
+ is_45="enable"
+ if [ "x${is_45}" = "xenable" ] ; then
+ ${git} "${DIR}/patches/beaglebone/abbbi/0003-drm-adihdmi-Drop-dummy-save-restore-hooks.patch"
+ ${git} "${DIR}/patches/beaglebone/abbbi/0004-drm-adihdmi-Pass-name-to-drm_encoder_init.patch"
+ fi
+ unset is_45
+
+ ${git} "${DIR}/patches/beaglebone/abbbi/0005-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch"
if [ "x${regenerate}" = "xenable" ] ; then
- number=3
+ number=5
cleanup
fi
diff --git a/patches/beaglebone/abbbi/0001-gpu-drm-i2c-add-alternative-adv7511-driver-with-audi.patch b/patches/beaglebone/abbbi/0001-gpu-drm-i2c-add-alternative-adv7511-driver-with-audi.patch
index a9b237c22..8106c5634 100644
--- a/patches/beaglebone/abbbi/0001-gpu-drm-i2c-add-alternative-adv7511-driver-with-audi.patch
+++ b/patches/beaglebone/abbbi/0001-gpu-drm-i2c-add-alternative-adv7511-driver-with-audi.patch
@@ -1,7 +1,7 @@
-From a0809a15bd9a9211a42760b27d2338c0f4e53fef Mon Sep 17 00:00:00 2001
+From 7cedc08184396d2e466534a118f08f762a72126e Mon Sep 17 00:00:00 2001
From: Jason Kridner <jdk@ti.com>
Date: Thu, 10 Sep 2015 23:39:40 +0000
-Subject: [PATCH 1/3] gpu: drm: i2c: add alternative adv7511 driver with audio
+Subject: [PATCH 1/5] gpu: drm: i2c: add alternative adv7511 driver with audio
support
Hacked driver that has audio support. Use this temporarily until
@@ -1437,5 +1437,5 @@ index 0000000..8ffef6c
+MODULE_DESCRIPTION("ADIHDMI HDMI transmitter driver");
+MODULE_LICENSE("GPL");
--
-2.6.2
+2.7.0.rc3
diff --git a/patches/beaglebone/abbbi/0002-gpu-drm-i2c-adihdmi-componentize-driver-and-huge-ref.patch b/patches/beaglebone/abbbi/0002-gpu-drm-i2c-adihdmi-componentize-driver-and-huge-ref.patch
index 6993d2848..8a93427ee 100644
--- a/patches/beaglebone/abbbi/0002-gpu-drm-i2c-adihdmi-componentize-driver-and-huge-ref.patch
+++ b/patches/beaglebone/abbbi/0002-gpu-drm-i2c-adihdmi-componentize-driver-and-huge-ref.patch
@@ -1,7 +1,7 @@
-From df269ab036158f7cc7a253731d8b2aaf1a4698f7 Mon Sep 17 00:00:00 2001
+From 130743e86aa5c33440a5dae8c4bed6568faed54d Mon Sep 17 00:00:00 2001
From: Matt Porter <mporter@konsulko.com>
Date: Fri, 6 Nov 2015 09:00:09 -0500
-Subject: [PATCH 2/3] gpu: drm: i2c: adihdmi: componentize driver and huge
+Subject: [PATCH 2/5] gpu: drm: i2c: adihdmi: componentize driver and huge
reformat/cleanup
Convert the driver over the the device model component framework, making
@@ -2123,5 +2123,5 @@ index 8ffef6c..907bdf9 100644
module_exit(adihdmi_exit);
--
-2.6.2
+2.7.0.rc3
diff --git a/patches/beaglebone/abbbi/0003-drm-adihdmi-Drop-dummy-save-restore-hooks.patch b/patches/beaglebone/abbbi/0003-drm-adihdmi-Drop-dummy-save-restore-hooks.patch
new file mode 100644
index 000000000..35c0f1769
--- /dev/null
+++ b/patches/beaglebone/abbbi/0003-drm-adihdmi-Drop-dummy-save-restore-hooks.patch
@@ -0,0 +1,52 @@
+From 1efd5dfd6e3d930a49cefdd06ab551cc1a9f81b9 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Tue, 26 Jan 2016 10:39:31 -0600
+Subject: [PATCH 3/5] drm/adihdmi: Drop dummy save/restore hooks
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ drivers/gpu/drm/i2c/adihdmi_drv.c | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/drivers/gpu/drm/i2c/adihdmi_drv.c b/drivers/gpu/drm/i2c/adihdmi_drv.c
+index 907bdf9..dd25f7d 100644
+--- a/drivers/gpu/drm/i2c/adihdmi_drv.c
++++ b/drivers/gpu/drm/i2c/adihdmi_drv.c
+@@ -956,16 +956,6 @@ static void adihdmi_encoder_mode_set(struct drm_encoder *encoder,
+ adihdmi->f_tmds = mode->clock;
+ }
+
+-static void adihdmi_encoder_restore(struct drm_encoder *encoder)
+-{
+- pr_debug("%s - %d\n", __FUNCTION__, __LINE__);
+-}
+-
+-static void adihdmi_encoder_save(struct drm_encoder *encoder)
+-{
+- pr_debug("%s - %d\n", __FUNCTION__, __LINE__);
+-}
+-
+ static void adihdmi_encoder_prepare(struct drm_encoder *encoder)
+ {
+ adihdmi_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
+@@ -978,8 +968,6 @@ static void adihdmi_encoder_commit(struct drm_encoder *encoder)
+
+ static struct drm_encoder_helper_funcs adihdmi_encoder_helper_funcs = {
+ .dpms = adihdmi_encoder_dpms,
+- .save = adihdmi_encoder_save,
+- .restore = adihdmi_encoder_restore,
+ .mode_fixup = adihdmi_encoder_mode_fixup,
+ .prepare = adihdmi_encoder_prepare,
+ .commit = adihdmi_encoder_commit,
+@@ -1049,8 +1037,6 @@ static struct drm_encoder_slave_funcs adihdmi_encoder_slave_funcs = {
+ .mode_fixup = adihdmi_encoder_mode_fixup,
+ .mode_set = adihdmi_encoder_mode_set,
+ .mode_valid = adihdmi_encoder_mode_valid,
+- .restore = adihdmi_encoder_restore,
+- .save = adihdmi_encoder_save,
+ .set_config = adihdmi_encoder_slave_set_config,
+ .set_property = adihdmi_encoder_set_property,
+ };
+--
+2.7.0.rc3
+
diff --git a/patches/beaglebone/abbbi/0004-drm-adihdmi-Pass-name-to-drm_encoder_init.patch b/patches/beaglebone/abbbi/0004-drm-adihdmi-Pass-name-to-drm_encoder_init.patch
new file mode 100644
index 000000000..5fa60d642
--- /dev/null
+++ b/patches/beaglebone/abbbi/0004-drm-adihdmi-Pass-name-to-drm_encoder_init.patch
@@ -0,0 +1,26 @@
+From d4fcbece96edc567cd1e6b23400350a3638752d1 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Tue, 26 Jan 2016 10:44:46 -0600
+Subject: [PATCH 4/5] drm/adihdmi: Pass 'name' to drm_encoder_init()
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ drivers/gpu/drm/i2c/adihdmi_drv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i2c/adihdmi_drv.c b/drivers/gpu/drm/i2c/adihdmi_drv.c
+index dd25f7d..3d38626 100644
+--- a/drivers/gpu/drm/i2c/adihdmi_drv.c
++++ b/drivers/gpu/drm/i2c/adihdmi_drv.c
+@@ -1133,7 +1133,7 @@ static int adihdmi_bind(struct device *dev, struct device *master, void *data)
+
+ drm_encoder_helper_add(&priv->encoder, &adihdmi_encoder_helper_funcs);
+ ret = drm_encoder_init(drm, &priv->encoder, &adihdmi_encoder_funcs,
+- DRM_MODE_ENCODER_TMDS);
++ DRM_MODE_ENCODER_TMDS, NULL);
+ if (ret)
+ goto err_encoder;
+
+--
+2.7.0.rc3
+
diff --git a/patches/beaglebone/abbbi/0003-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch b/patches/beaglebone/abbbi/0005-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch
similarity index 97%
rename from patches/beaglebone/abbbi/0003-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch
rename to patches/beaglebone/abbbi/0005-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch
index 6edff3b75..ea482767c 100644
--- a/patches/beaglebone/abbbi/0003-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch
+++ b/patches/beaglebone/abbbi/0005-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch
@@ -1,7 +1,7 @@
-From 8541d80b2dce1cf6cbd78601205d0ed3772e8887 Mon Sep 17 00:00:00 2001
+From f6ca1227979fe75e91d45ff3b55f98ac94af8450 Mon Sep 17 00:00:00 2001
From: Matt Porter <mporter@konsulko.com>
Date: Tue, 3 Nov 2015 15:37:54 -0500
-Subject: [PATCH 3/3] ARM: dts: add Arrow BeagleBone Black Industrial dts
+Subject: [PATCH 5/5] ARM: dts: add Arrow BeagleBone Black Industrial dts
Adds a dts file for the Arrow BeagleBone Black Industrial board.
This BBB variant differs in that it uses an industrial temp rated
diff --git a/patches/defconfig b/patches/defconfig
index 6589ec971..dea78efa5 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -3796,7 +3796,7 @@ CONFIG_DRM_KMS_CMA_HELPER=y
# I2C encoder or helper chips
#
CONFIG_DRM_I2C_ADV7511=m
-# CONFIG_DRM_I2C_ADIHDMI is not set
+CONFIG_DRM_I2C_ADIHDMI=m
CONFIG_DRM_I2C_CH7006=m
CONFIG_DRM_I2C_SIL164=m
CONFIG_DRM_I2C_NXP_TDA998X=m
diff --git a/version.sh b/version.sh
index 2ed8e7df7..f4a6493b7 100644
--- a/version.sh
+++ b/version.sh
@@ -24,7 +24,7 @@ toolchain="gcc_linaro_gnueabihf_5"
#Kernel/Build
KERNEL_REL=4.5
KERNEL_TAG=${KERNEL_REL}-rc1
-BUILD=${build_prefix}1.1
+BUILD=${build_prefix}1.2
kernel_rt=".X-rtY"
#v4.X-rcX + upto SHA
--
GitLab