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 855403f61a..a61e0b180b 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 @@ -78,9 +78,10 @@ diff --git a/drivers/gpu/drm/bridge/cadence/Makefile b/drivers/gpu/drm/bridge/ca index 8f647991b374..618290870ba5 100644 --- a/drivers/gpu/drm/bridge/cadence/Makefile +++ b/drivers/gpu/drm/bridge/cadence/Makefile -@@ -2,3 +2,12 @@ +@@ -1,4 +1,13 @@ + # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_DRM_CDNS_MHDP8546) += cdns-mhdp8546.o - cdns-mhdp8546-y := cdns-mhdp8546-core.o + cdns-mhdp8546-y := cdns-mhdp8546-core.o cdns-mhdp8546-hdcp.o cdns-mhdp8546-$(CONFIG_DRM_CDNS_MHDP8546_J721E) += cdns-mhdp8546-j721e.o + +cdns_mhdp_drmcore-y := cdns-mhdp-common.o cdns-mhdp-dp.o cdns-mhdp-hdmi.o diff --git a/projects/NXP/devices/iMX8/patches/linux/0029-clk-imx8mq-add-27MHz-PHY-ref-clock.patch b/projects/NXP/devices/iMX8/patches/linux/0029-clk-imx8mq-add-27MHz-PHY-ref-clock.patch index fdfa29b214..ee9efc0bad 100644 --- a/projects/NXP/devices/iMX8/patches/linux/0029-clk-imx8mq-add-27MHz-PHY-ref-clock.patch +++ b/projects/NXP/devices/iMX8/patches/linux/0029-clk-imx8mq-add-27MHz-PHY-ref-clock.patch @@ -37,14 +37,13 @@ diff --git a/include/dt-bindings/clock/imx8mq-clock.h b/include/dt-bindings/cloc index 9b8045d75b8b..2a81f96b7c74 100644 --- a/include/dt-bindings/clock/imx8mq-clock.h +++ b/include/dt-bindings/clock/imx8mq-clock.h -@@ -431,6 +431,8 @@ +@@ -431,6 +431,7 @@ + #define IMX8MQ_CLK_MON_SEL 301 + #define IMX8MQ_CLK_MON_CLK2_OUT 302 ++#define IMX8MQ_CLK_PHY_27MHZ 303 - #define IMX8MQ_CLK_A53_CORE 289 - --#define IMX8MQ_CLK_END 290 -+#define IMX8MQ_CLK_PHY_27MHZ 290 -+ -+#define IMX8MQ_CLK_END 291 +-#define IMX8MQ_CLK_END 303 ++#define IMX8MQ_CLK_END 304 #endif /* __DT_BINDINGS_CLOCK_IMX8MQ_H */ -- 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 0215193b42..fd980240ef 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 @@ -2038,7 +2038,7 @@ index 000000000000..a3ba3da4b05d + goto out; + + if (!imx_mhdp->fw) { -+ ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_NOHOTPLUG, ++ ret = request_firmware_nowait(THIS_MODULE, FW_ACTION_NOUEVENT, + imx_mhdp->firmware_name, + imx_mhdp->mhdp.dev, GFP_KERNEL, + imx_mhdp, diff --git a/projects/NXP/devices/iMX8/patches/linux/0039-drm-imx-dcss-fix-unused-but-set-variable-warnings.patch b/projects/NXP/devices/iMX8/patches/linux/0039-drm-imx-dcss-fix-unused-but-set-variable-warnings.patch deleted file mode 100644 index 6b7a19f3d5..0000000000 --- a/projects/NXP/devices/iMX8/patches/linux/0039-drm-imx-dcss-fix-unused-but-set-variable-warnings.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6b147fc07b475ede9ede99cf381f1706be5de6f9 Mon Sep 17 00:00:00 2001 -From: Wang ShaoBo -Date: Fri, 11 Sep 2020 09:44:14 +0800 -Subject: [PATCH 39/49] drm/imx/dcss: fix unused but set variable warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix unused but set variable warning building with `make W=1`: - -drivers/gpu/drm/imx/dcss/dcss-plane.c:270:6: warning: - variable ‘pixel_format’ set but not used [-Wunused-but-set-variable] - u32 pixel_format; - ^~~~~~~~~~~~ - -Fixes: 9021c317b770 ("drm/imx: Add initial support for DCSS on iMX8MQ") -Reported-by: Hulk Robot -Signed-off-by: Wang ShaoBo -Reviewed-by: Laurentiu Palcu -Signed-off-by: Lucas Stach -Link: https://patchwork.freedesktop.org/patch/msgid/20200911014414.4663-1-bobo.shaobowang@huawei.com ---- - drivers/gpu/drm/imx/dcss/dcss-plane.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/gpu/drm/imx/dcss/dcss-plane.c b/drivers/gpu/drm/imx/dcss/dcss-plane.c -index 961d671f171b..e13652e3a115 100644 ---- a/drivers/gpu/drm/imx/dcss/dcss-plane.c -+++ b/drivers/gpu/drm/imx/dcss/dcss-plane.c -@@ -267,7 +267,6 @@ static void dcss_plane_atomic_update(struct drm_plane *plane, - struct dcss_plane *dcss_plane = to_dcss_plane(plane); - struct dcss_dev *dcss = plane->dev->dev_private; - struct drm_framebuffer *fb = state->fb; -- u32 pixel_format; - struct drm_crtc_state *crtc_state; - bool modifiers_present; - u32 src_w, src_h, dst_w, dst_h; -@@ -277,7 +276,6 @@ static void dcss_plane_atomic_update(struct drm_plane *plane, - if (!fb || !state->crtc || !state->visible) - return; - -- pixel_format = state->fb->format->format; - crtc_state = state->crtc->state; - modifiers_present = !!(fb->flags & DRM_MODE_FB_MODIFIERS); - --- -2.29.2 - diff --git a/projects/NXP/devices/iMX8/patches/linux/0042-drm-imx-dcss-fix-coccinelle-warning.patch b/projects/NXP/devices/iMX8/patches/linux/0042-drm-imx-dcss-fix-coccinelle-warning.patch deleted file mode 100644 index bb636d3299..0000000000 --- a/projects/NXP/devices/iMX8/patches/linux/0042-drm-imx-dcss-fix-coccinelle-warning.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c869538d2a0e04edf0ad9abf89ef6ff70502ed86 Mon Sep 17 00:00:00 2001 -From: Laurentiu Palcu -Date: Thu, 5 Nov 2020 16:01:26 +0200 -Subject: [PATCH 42/49] drm/imx/dcss: fix coccinelle warning - -This small patch fixes a warning that I got while running coccinelle: - - CHECK drivers/gpu/drm/imx/dcss/dcss-plane.c - drivers/gpu/drm/imx/dcss/dcss-plane.c:107:21-23: WARNING !A || A && B is equivalent to !A || B - -Fixes: 9021c317b770 ("drm/imx: Add initial support for DCSS on iMX8MQ") -Signed-off-by: Laurentiu Palcu ---- - drivers/gpu/drm/imx/dcss/dcss-plane.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/imx/dcss/dcss-plane.c b/drivers/gpu/drm/imx/dcss/dcss-plane.c -index e13652e3a115..c8dc6f4436e1 100644 ---- a/drivers/gpu/drm/imx/dcss/dcss-plane.c -+++ b/drivers/gpu/drm/imx/dcss/dcss-plane.c -@@ -103,8 +103,7 @@ static bool dcss_plane_can_rotate(const struct drm_format_info *format, - bool mod_present, u64 modifier, - unsigned int rotation) - { -- bool linear_format = !mod_present || -- (mod_present && modifier == DRM_FORMAT_MOD_LINEAR); -+ bool linear_format = !mod_present || modifier == DRM_FORMAT_MOD_LINEAR; - u32 supported_rotation = DRM_MODE_ROTATE_0; - - if (!format->is_yuv && linear_format) --- -2.29.2 -