linuxkpi: Use hdmi function from base

Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit e8d1413172a045add555f36ab1f038545b396995)
freebsd · Mar 28, 2023 · 8a6fb58 · 8a6fb58
1 parent 5803de6
commit 8a6fb58
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 0 deletions.
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_freebsd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_freebsd.c
@@ -8,6 +8,9 @@ MODULE_DEPEND(amdgpu, drmn, 2, 2, 2);
 MODULE_DEPEND(amdgpu, ttm, 1, 1, 1);
 MODULE_DEPEND(amdgpu, linuxkpi, 1, 1, 1);
 MODULE_DEPEND(amdgpu, linuxkpi_gplv2, 1, 1, 1);
+#if __FreeBSD_version >= 1400085
+MODULE_DEPEND(amdgpu, linuxkpi_hdmi, 1, 1, 1);
+#endif
 MODULE_DEPEND(amdgpu, dmabuf, 1, 1, 1);
 MODULE_DEPEND(amdgpu, firmware, 1, 1, 1);
 #ifdef CONFIG_DEBUG_FS

diff --git a/drivers/gpu/drm/drm_os_freebsd.c b/drivers/gpu/drm/drm_os_freebsd.c
@@ -216,6 +216,9 @@ MODULE_DEPEND(drmn, pci, 1, 1, 1);
 MODULE_DEPEND(drmn, mem, 1, 1, 1);
 MODULE_DEPEND(drmn, linuxkpi, 1, 1, 1);
 MODULE_DEPEND(drmn, linuxkpi_gplv2, 1, 1, 1);
+#if __FreeBSD_version >= 1400085
+MODULE_DEPEND(drmn, linuxkpi_hdmi, 1, 1, 1);
+#endif
 MODULE_DEPEND(drmn, dmabuf, 1, 1, 1);
 #ifdef CONFIG_DEBUG_FS
 MODULE_DEPEND(drmn, debugfs, 1, 1, 1);

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
@@ -1180,6 +1180,9 @@ MODULE_DEPEND(i915kms, drmn, 2, 2, 2);
 MODULE_DEPEND(i915kms, agp, 1, 1, 1);
 MODULE_DEPEND(i915kms, linuxkpi, 1, 1, 1);
 MODULE_DEPEND(i915kms, linuxkpi_gplv2, 1, 1, 1);
+#if __FreeBSD_version >= 1400085
+MODULE_DEPEND(i915kms, linuxkpi_hdmi, 1, 1, 1);
+#endif
 MODULE_DEPEND(i915kms, dmabuf, 1, 1, 1);
 MODULE_DEPEND(i915kms, firmware, 1, 1, 1);
 #ifdef CONFIG_DEBUG_FS

diff --git a/drivers/gpu/drm/radeon/radeon_freebsd.c b/drivers/gpu/drm/radeon/radeon_freebsd.c
@@ -8,6 +8,9 @@ MODULE_DEPEND(radeonkms, drmn, 2, 2, 2);
 MODULE_DEPEND(radeonkms, ttm, 1, 1, 1);
 MODULE_DEPEND(radeonkms, linuxkpi, 1, 1, 1);
 MODULE_DEPEND(radeonkms, linuxkpi_gplv2, 1, 1, 1);
+#if __FreeBSD_version >= 1400085
+MODULE_DEPEND(radeonkms, linuxkpi_hdmi, 1, 1, 1);
+#endif
 MODULE_DEPEND(radeonkms, dmabuf, 1, 1, 1);
 MODULE_DEPEND(radeonkms, firmware, 1, 1, 1);
 #ifdef CONFIG_DEBUG_FS

diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c
@@ -111,5 +111,8 @@ MODULE_DEPEND(ttm, agp, 1, 1, 1);
 MODULE_DEPEND(ttm, drmn, 2, 2, 2);
 MODULE_DEPEND(ttm, linuxkpi, 1, 1, 1);
 MODULE_DEPEND(ttm, linuxkpi_gplv2, 1, 1, 1);
+#if __FreeBSD_version >= 1400085
+MODULE_DEPEND(ttm, linuxkpi_hdmi, 1, 1, 1);
+#endif
 MODULE_DEPEND(ttm, dmabuf, 1, 1, 1);
 #endif
diff --git a/linuxkpi/bsd/include/linux/hdmi.h b/linuxkpi/bsd/include/linux/hdmi.h
@@ -1,3 +1,7 @@
+#include <sys/param.h>
+#if __FreeBSD_version >= 1400085
+#include_next <linux/hdmi.h>
+#else
 /*
  * Copyright (C) 2012 Avionic Design GmbH
  *
@@ -439,3 +443,4 @@ void hdmi_infoframe_log(const char *level, struct device *dev,
 			const union hdmi_infoframe *frame);
 
 #endif /* _DRM_HDMI_H */
+#endif
diff --git a/linuxkpi/gplv2/src/linux_hdmi.c b/linuxkpi/gplv2/src/linux_hdmi.c
@@ -24,6 +24,8 @@
 
 #include <sys/param.h>
 
+#if __FreeBSD_version < 1400085
+
 #include <linux/bitops.h>
 #include <linux/bug.h>
 #include <linux/errno.h>
@@ -1907,3 +1909,4 @@ int hdmi_infoframe_unpack(union hdmi_infoframe *frame,
 	return ret;
 }
 EXPORT_SYMBOL(hdmi_infoframe_unpack);
+#endif
diff --git a/linuxkpi/gplv2/src/linux_kmod_gplv2.c b/linuxkpi/gplv2/src/linux_kmod_gplv2.c
@@ -35,3 +35,6 @@ MODULE_DEPEND(linuxkpi_gplv2, backlight, 1, 1, 1);
 MODULE_DEPEND(linuxkpi_gplv2, dmabuf, 1, 1, 1);
 MODULE_DEPEND(linuxkpi_gplv2, firmware, 1, 1, 1);
 MODULE_DEPEND(linuxkpi_gplv2, linuxkpi, 1, 1, 1);
+#if __FreeBSD_version >= 1400085
+MODULE_DEPEND(linuxkpi_gplv2, linuxkpi_hdmi, 1, 1, 1);
+#endif