From 84c0132ebe8b5d9766d5139643bbe34cee4a581b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 27 Jun 2022 12:22:13 +0000 Subject: [PATCH] linux (NXP iMX8): rebase patches for 5.19 --- ...p-Add-cdns-mhdp-driver-bridge-driver.patch | 32 ++++++++++--------- ...bridge-cdns-Add-callback-function-fo.patch | 2 +- ...bridge-mhdp_hdcp-add-HDMI-TX-HDCP-dr.patch | 7 ++-- ...dp-dp-hdmi-driver-for-imx8x-platform.patch | 2 +- .../0050-drm-display-drm-hdmi-helper-h.patch | 21 ++++++++++++ 5 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 projects/NXP/devices/iMX8/patches/linux/0050-drm-display-drm-hdmi-helper-h.patch diff --git a/projects/NXP/devices/iMX8/patches/linux/0001-drm-bridge-mhdp-Add-cdns-mhdp-driver-bridge-driver.patch b/projects/NXP/devices/iMX8/patches/linux/0001-drm-bridge-mhdp-Add-cdns-mhdp-driver-bridge-driver.patch index 2d4896210b..173c23ed33 100644 --- a/projects/NXP/devices/iMX8/patches/linux/0001-drm-bridge-mhdp-Add-cdns-mhdp-driver-bridge-driver.patch +++ b/projects/NXP/devices/iMX8/patches/linux/0001-drm-bridge-mhdp-Add-cdns-mhdp-driver-bridge-driver.patch @@ -44,7 +44,7 @@ diff --git a/drivers/gpu/drm/bridge/cadence/Kconfig b/drivers/gpu/drm/bridge/cad index ef8c230e0f62..bb1865b15aca 100644 --- a/drivers/gpu/drm/bridge/cadence/Kconfig +++ b/drivers/gpu/drm/bridge/cadence/Kconfig -@@ -22,3 +22,29 @@ config DRM_CDNS_MHDP8546_J721E +@@ -22,3 +22,31 @@ config DRM_CDNS_MHDP8546_J721E initializes the J721E Display Port and sets up the clock and data muxes. endif @@ -60,6 +60,8 @@ index ef8c230e0f62..bb1865b15aca 100644 +config DRM_CDNS_HDMI + tristate "Cadence HDMI DRM driver" + depends on DRM_CDNS_MHDP ++ select DRM_DISPLAY_HDCP_HELPER ++ select DRM_DISPLAY_HDMI_HELPER + +config DRM_CDNS_DP + tristate "Cadence DP DRM driver" @@ -696,7 +698,7 @@ index 000000000000..da40f62617ef +#include +#include +#include -+#include ++#include +#include +#include +#include @@ -3452,7 +3454,7 @@ index 000000000000..399c3f6f86ad +#ifndef CDNS_MHDP_H +#define CDNS_MHDP_H + -+#include ++#include + +#define CDNS_APB_CFG 0x00000 +#define CDNS_APB_CTRL (CDNS_APB_CFG + 0x00) @@ -3653,8 +3655,8 @@ index 17a9e7eb2130..bd013659404f 100644 --- a/drivers/gpu/drm/rockchip/Makefile +++ b/drivers/gpu/drm/rockchip/Makefile @@ -8,7 +8,7 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \ - rockchip_drm_gem.o rockchip_drm_vop.o rockchip_vop_reg.o - + rockchipdrm-$(CONFIG_ROCKCHIP_VOP2) += rockchip_drm_vop2.o rockchip_vop2_reg.o + rockchipdrm-$(CONFIG_ROCKCHIP_VOP) += rockchip_drm_vop.o rockchip_vop_reg.o rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o -rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o +rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o @@ -3672,12 +3674,12 @@ index a4a45daf93f2..058bc372f02b 100644 -#include "cdn-dp-reg.h" #include "rockchip_drm_vop.h" - #define connector_to_dp(c) \ -- container_of(c, struct cdn_dp_device, connector) -+ container_of(c, struct cdn_dp_device, mhdp.connector.base) + static inline struct cdn_dp_device *connector_to_dp(struct drm_connector *connector) + { +- return container_of(connector, struct cdn_dp_device, connector); ++ return container_of(connector, struct cdn_dp_device, mhdp.connector.base); + } - #define encoder_to_dp(c) \ - container_of(c, struct cdn_dp_device, encoder) @@ -62,17 +61,18 @@ MODULE_DEVICE_TABLE(of, cdn_dp_dt_ids); static int cdn_dp_grf_write(struct cdn_dp_device *dp, unsigned int reg, unsigned int val) @@ -4364,7 +4366,7 @@ index a4a45daf93f2..058bc372f02b 100644 @@ -1088,7 +1103,7 @@ static void cdn_dp_unbind(struct device *dev, struct device *master, void *data) { struct cdn_dp_device *dp = dev_get_drvdata(dev); - struct drm_encoder *encoder = &dp->encoder; + struct drm_encoder *encoder = &dp->encoder.encoder; - struct drm_connector *connector = &dp->connector; + struct drm_connector *connector = &dp->mhdp.connector.base; @@ -4408,7 +4410,7 @@ index 81ac9b658a70..8b1b15b92503 100644 #define _CDN_DP_CORE_H +#include - #include + #include #include #include @@ -15,35 +16,6 @@ @@ -4455,7 +4457,7 @@ index 81ac9b658a70..8b1b15b92503 100644 + struct cdns_mhdp_device mhdp; struct drm_device *drm_dev; - struct drm_connector connector; - struct drm_encoder encoder; + struct rockchip_encoder encoder; - struct drm_display_mode mode; - struct platform_device *audio_pdev; struct work_struct event_work; @@ -5488,8 +5490,8 @@ index 441248b7a79e..d76716d4edc6 100644 +#include +#include -+#include -+#include ++#include ++#include +#include #include diff --git a/projects/NXP/devices/iMX8/patches/linux/0014-MLK-24611-2-drm-bridge-cdns-Add-callback-function-fo.patch b/projects/NXP/devices/iMX8/patches/linux/0014-MLK-24611-2-drm-bridge-cdns-Add-callback-function-fo.patch index 4791da4dc2..1b2c1413b0 100644 --- a/projects/NXP/devices/iMX8/patches/linux/0014-MLK-24611-2-drm-bridge-cdns-Add-callback-function-fo.patch +++ b/projects/NXP/devices/iMX8/patches/linux/0014-MLK-24611-2-drm-bridge-cdns-Add-callback-function-fo.patch @@ -126,7 +126,7 @@ index 1f8fd024cdfa..6bfd82a3d9a2 100644 --- a/include/drm/bridge/cdns-mhdp.h +++ b/include/drm/bridge/cdns-mhdp.h @@ -22,6 +22,7 @@ - #include + #include #include #include +#include diff --git a/projects/NXP/devices/iMX8/patches/linux/0020-MLK-25199-5-drm-bridge-mhdp_hdcp-add-HDMI-TX-HDCP-dr.patch b/projects/NXP/devices/iMX8/patches/linux/0020-MLK-25199-5-drm-bridge-mhdp_hdcp-add-HDMI-TX-HDCP-dr.patch index 9143889888..47c75be296 100644 --- a/projects/NXP/devices/iMX8/patches/linux/0020-MLK-25199-5-drm-bridge-mhdp_hdcp-add-HDMI-TX-HDCP-dr.patch +++ b/projects/NXP/devices/iMX8/patches/linux/0020-MLK-25199-5-drm-bridge-mhdp_hdcp-add-HDMI-TX-HDCP-dr.patch @@ -31,13 +31,14 @@ diff --git a/drivers/gpu/drm/bridge/cadence/Kconfig b/drivers/gpu/drm/bridge/cad index c271ab24a99a..4c27836eb367 100644 --- a/drivers/gpu/drm/bridge/cadence/Kconfig +++ b/drivers/gpu/drm/bridge/cadence/Kconfig -@@ -43,6 +43,10 @@ config DRM_CDNS_AUDIO +@@ -43,6 +43,11 @@ config DRM_CDNS_AUDIO tristate "Cadence MHDP Audio driver" depends on DRM_CDNS_MHDP +config DRM_CDNS_HDMI_HDCP + tristate "Cadence MHDP HDMI HDCP driver" + depends on DRM_CDNS_HDMI ++ select DRM_DISPLAY_HDCP_HELPER + config DRM_CDNS_HDMI_CEC tristate "Cadence MHDP HDMI CEC driver" @@ -71,7 +72,7 @@ index 84c175997740..dc393f6b75e7 100644 #include #include #include -+#include ++#include #include #include #include @@ -346,7 +347,7 @@ index 000000000000..e2a3bc7fb42b + * + */ +#include -+#include ++#include +#include +#include + diff --git a/projects/NXP/devices/iMX8/patches/linux/0030-drm-imx-Add-mhdp-dp-hdmi-driver-for-imx8x-platform.patch b/projects/NXP/devices/iMX8/patches/linux/0030-drm-imx-Add-mhdp-dp-hdmi-driver-for-imx8x-platform.patch index b942707e44..a44d66ec6e 100644 --- a/projects/NXP/devices/iMX8/patches/linux/0030-drm-imx-Add-mhdp-dp-hdmi-driver-for-imx8x-platform.patch +++ b/projects/NXP/devices/iMX8/patches/linux/0030-drm-imx-Add-mhdp-dp-hdmi-driver-for-imx8x-platform.patch @@ -96,7 +96,7 @@ index 000000000000..a6d03c94d196 + */ +#include +#include -+#include ++#include +#include +#include "cdns-mhdp-phy.h" + diff --git a/projects/NXP/devices/iMX8/patches/linux/0050-drm-display-drm-hdmi-helper-h.patch b/projects/NXP/devices/iMX8/patches/linux/0050-drm-display-drm-hdmi-helper-h.patch new file mode 100644 index 0000000000..9d4a322234 --- /dev/null +++ b/projects/NXP/devices/iMX8/patches/linux/0050-drm-display-drm-hdmi-helper-h.patch @@ -0,0 +1,21 @@ +--- a/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c 2022-06-28 15:48:27.254022595 +0000 ++++ b/drivers/gpu/drm/bridge/cadence/cdns-hdmi-core.c 2022-06-28 15:46:14.919939083 +0000 +@@ -14,6 +14,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +--- a/drivers/gpu/drm/bridge/cadence/cdns-hdmi-hdcp.c 2022-06-28 15:53:59.618466556 +0000 ++++ b/drivers/gpu/drm/bridge/cadence/cdns-hdmi-hdcp.c 2022-06-28 15:56:01.987635836 +0000 +@@ -11,6 +11,7 @@ + */ + #include + #include ++#include + #include + #include +