From 5320cacc5218e37d6d5e9889dec9581a1604541b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 23 Aug 2022 22:03:26 +0000 Subject: [PATCH] linux (NXP iMX8): drop upstream patches for 5.19.4-rc1 --- ...-dcss-add-component-framework-functionality.patch | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/projects/NXP/devices/iMX8/patches/linux/0041-drm-imx-dcss-add-component-framework-functionality.patch b/projects/NXP/devices/iMX8/patches/linux/0041-drm-imx-dcss-add-component-framework-functionality.patch index 38697f26b3..4b15c1da0a 100644 --- a/projects/NXP/devices/iMX8/patches/linux/0041-drm-imx-dcss-add-component-framework-functionality.patch +++ b/projects/NXP/devices/iMX8/patches/linux/0041-drm-imx-dcss-add-component-framework-functionality.patch @@ -177,9 +177,9 @@ index 135a62366ab8..cafb09df6c75 100644 { struct dcss_kms_dev *kms; struct drm_device *drm; -@@ -148,19 +149,23 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss) +@@ -148,13 +149,16 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss) - drm->irq_enabled = true; + goto cleanup_mode_config; - ret = dcss_kms_bridge_connector_init(kms); + ret = dcss_crtc_init(crtc, drm); @@ -197,14 +197,6 @@ index 135a62366ab8..cafb09df6c75 100644 drm_mode_config_reset(drm); - drm_kms_helper_poll_init(drm); - -- drm_bridge_connector_enable_hpd(kms->connector); -+ if (!componentized) -+ drm_bridge_connector_enable_hpd(kms->connector); - - ret = drm_dev_register(drm, 0); - if (ret) @@ -171,7 +176,8 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss) return kms;