summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-core/recipes-kernel/hdmi
diff options
context:
space:
mode:
Diffstat (limited to 'meta-xilinx-core/recipes-kernel/hdmi')
-rw-r--r--meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.4.0-and-current-kernels.patch82
-rw-r--r--meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.1.bb24
-rw-r--r--meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb24
-rw-r--r--meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb24
-rw-r--r--meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.2.bb24
-rw-r--r--meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.10.bb (renamed from meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2024.1.bb)5
6 files changed, 85 insertions, 98 deletions
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.4.0-and-current-kernels.patch b/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.4.0-and-current-kernels.patch
new file mode 100644
index 00000000..9bdbfc94
--- /dev/null
+++ b/meta-xilinx-core/recipes-kernel/hdmi/files/0001-Support-both-pre-6.4.0-and-current-kernels.patch
@@ -0,0 +1,82 @@
1From e1352e6872edc2b521ad44eb776ce093553192e3 Mon Sep 17 00:00:00 2001
2From: Mark Hatle <mark.hatle@amd.com>
3Date: Fri, 17 May 2024 10:44:37 -0600
4Subject: [PATCH] Support both pre 6.4.0 and current kernels
5
6Signed-off-by: Mark Hatle <mark.hatle@amd.com>
7---
8 hdmi/xilinx_drm_hdmi.c | 3 +++
9 misc/dp159.c | 14 ++++++++++++++
10 2 files changed, 17 insertions(+)
11
12diff --git a/hdmi/xilinx_drm_hdmi.c b/hdmi/xilinx_drm_hdmi.c
13index 104fc3d..6ebbdca 100644
14--- a/hdmi/xilinx_drm_hdmi.c
15+++ b/hdmi/xilinx_drm_hdmi.c
16@@ -17,6 +17,7 @@
17 * GNU General Public License for more details.
18 */
19
20+#include <linux/version.h>
21 #include <drm/drm_atomic_helper.h>
22 #include <drm/drm_connector.h>
23 #include <drm/drm_crtc.h>
24@@ -27,7 +28,9 @@
25 #include <drm/drm_of.h>
26 #include <drm/drm_probe_helper.h>
27 #include <drm/drm_sysfs.h>
28+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
29 #include <drm/display/drm_hdmi_helper.h>
30+#endif
31
32 #include <linux/clk.h>
33 #include <linux/delay.h>
34diff --git a/misc/dp159.c b/misc/dp159.c
35index 73e886f..d2c60d9 100644
36--- a/misc/dp159.c
37+++ b/misc/dp159.c
38@@ -28,6 +28,7 @@
39 #include <linux/of.h>
40 #include <linux/of.h>
41 #include <linux/clk-provider.h>
42+#include <linux/version.h>
43
44 MODULE_DESCRIPTION("i2c device driver for dp159 redriver and retimer");
45 MODULE_AUTHOR("Leon Woestenberg");
46@@ -133,7 +134,12 @@ struct clk_ops clk_tx_rate_ops = {
47 .round_rate = &clk_tx_round_rate,
48 };
49
50+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0)
51 static int dp159_probe(struct i2c_client *client)
52+#else
53+static int dp159_probe(struct i2c_client *client,
54+ const struct i2c_device_id *id)
55+#endif
56 {
57 struct clk_tx_linerate *clk_tx;
58 struct clk *clk;
59@@ -191,12 +197,20 @@ static int dp159_probe(struct i2c_client *client)
60 return 0;
61 }
62
63+
64+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
65 static void dp159_remove(struct i2c_client *client)
66+#else
67+static int dp159_remove(struct i2c_client *client)
68+#endif
69 {
70 struct clk_tx_linerate *clk_tx;
71 clk_tx = (struct clk_tx_linerate *)i2c_get_clientdata(client);
72 if (clk_tx)
73 clk_unregister(clk_tx->clk);
74+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)
75+ return 0;
76+#endif
77 }
78
79 static const struct i2c_device_id dp159_id[] = {
80--
812.34.1
82
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.1.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.1.bb
deleted file mode 100644
index ea649bc4..00000000
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
1SUMMARY = "Xilinx HDMI Linux Kernel module"
2DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
3SECTION = "kernel/modules"
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
6
7XLNX_HDMI_VERSION = "5.15.0"
8PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
9
10S = "${WORKDIR}/git"
11
12BRANCH ?= "xlnx_rel_v2022.1"
13REPO ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
14SRCREV = "25b6fe7a26a975be15c002b48cfd4c291486491e"
15
16BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
17SRC_URI = "${REPO};${BRANCHARG}"
18
19inherit module
20
21EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
22COMPATIBLE_MACHINE = "^$"
23COMPATIBLE_MACHINE:zynqmp = "zynqmp"
24COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb
deleted file mode 100644
index c1f66013..00000000
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2022.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
1SUMMARY = "Xilinx HDMI Linux Kernel module"
2DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
3SECTION = "kernel/modules"
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
6
7XLNX_HDMI_VERSION = "5.15.19"
8PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
9
10S = "${WORKDIR}/git"
11
12BRANCH ?= "xlnx_rel_v2022.2"
13REPO ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
14SRCREV = "25b6fe7a26a975be15c002b48cfd4c291486491e"
15
16BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
17SRC_URI = "${REPO};${BRANCHARG}"
18
19inherit module
20
21EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
22COMPATIBLE_MACHINE = "^$"
23COMPATIBLE_MACHINE:zynqmp = "zynqmp"
24COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb
deleted file mode 100644
index 20acb8b3..00000000
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
1SUMMARY = "Xilinx HDMI Linux Kernel module"
2DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
3SECTION = "kernel/modules"
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
6
7XLNX_HDMI_VERSION = "6.1"
8PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
9
10S = "${WORKDIR}/git"
11
12BRANCH ?= "xlnx_rel_v2023.1"
13REPO ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
14SRCREV = "1c6330f02fea68992e22400fdbc8c0d0e63e2958"
15
16BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
17SRC_URI = "${REPO};${BRANCHARG}"
18
19inherit module
20
21EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
22COMPATIBLE_MACHINE = "^$"
23COMPATIBLE_MACHINE:zynqmp = "zynqmp"
24COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.2.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.2.bb
deleted file mode 100644
index bc89f5f3..00000000
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2023.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
1SUMMARY = "Xilinx HDMI Linux Kernel module"
2DESCRIPTION = "Out-of-tree HDMI kernel modules provider for MPSoC EG/EV devices"
3SECTION = "kernel/modules"
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
6
7XLNX_HDMI_VERSION = "6.1"
8PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
9
10S = "${WORKDIR}/git"
11
12BRANCH ?= "xlnx_rel_v2023.2"
13REPO ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
14SRCREV = "82209b0021a7b5d7ef71a859eed4bafeb541ed08"
15
16BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
17SRC_URI = "${REPO};${BRANCHARG}"
18
19inherit module
20
21EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
22COMPATIBLE_MACHINE = "^$"
23COMPATIBLE_MACHINE:zynqmp = "zynqmp"
24COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2024.1.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.10.bb
index 73a22d30..7e25fe1f 100644
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_2024.1.bb
+++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.10.bb
@@ -4,8 +4,7 @@ SECTION = "kernel/modules"
4LICENSE = "GPL-2.0-only" 4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe" 5LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
6 6
7XLNX_HDMI_VERSION = "6.1" 7PV .= "+git"
8PV = "${XLNX_HDMI_VERSION}+xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}"
9 8
10S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
11 10
@@ -16,6 +15,8 @@ SRCREV = "edd297762e0bac3f4c5b64ef67244968e22020e2"
16BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" 15BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
17SRC_URI = "${REPO};${BRANCHARG}" 16SRC_URI = "${REPO};${BRANCHARG}"
18 17
18SRC_URI += "file://0001-Support-both-pre-6.4.0-and-current-kernels.patch"
19
19inherit module 20inherit module
20 21
21EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}" 22EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-07-20 00:08:36 +0000