linux (NXP iMX8): rebase patches for linux 6.0-rc6

This commit is contained in:
Rudi Heitbaum 2022-08-23 11:38:21 +00:00
parent b277c31796
commit a1c0e27cf3
2 changed files with 5 additions and 3 deletions

View File

@ -3806,8 +3806,8 @@ index a4a45daf93f2..058bc372f02b 100644
edid->width_cm, edid->height_cm); edid->width_cm, edid->height_cm);
dp->sink_has_audio = drm_detect_monitor_audio(edid); dp->sink_has_audio = drm_detect_monitor_audio(edid);
@@ -279,7 +282,8 @@ static int cdn_dp_connector_mode_valid(struct drm_connector *connector, @@ -279,7 +282,8 @@ cdn_dp_connector_mode_valid(struct drm_connector *connector,
struct drm_display_mode *mode) struct drm_display_mode *mode)
{ {
struct cdn_dp_device *dp = connector_to_dp(connector); struct cdn_dp_device *dp = connector_to_dp(connector);
- struct drm_display_info *display_info = &dp->connector.display_info; - struct drm_display_info *display_info = &dp->connector.display_info;

View File

@ -2114,7 +2114,7 @@ new file mode 100644
index 000000000000..3acbdf575ee2 index 000000000000..3acbdf575ee2
--- /dev/null --- /dev/null
+++ b/drivers/gpu/drm/imx/mhdp/cdns-mhdp-imxdrv.c +++ b/drivers/gpu/drm/imx/mhdp/cdns-mhdp-imxdrv.c
@@ -0,0 +1,257 @@ @@ -0,0 +1,259 @@
+/* +/*
+ * copyright (c) 2019 nxp semiconductor, inc. + * copyright (c) 2019 nxp semiconductor, inc.
+ * + *
@ -2130,6 +2130,8 @@ index 000000000000..3acbdf575ee2
+#include <drm/drm_crtc_helper.h> +#include <drm/drm_crtc_helper.h>
+#include <drm/drm_encoder_slave.h> +#include <drm/drm_encoder_slave.h>
+ +
+#include <uapi/linux/media-bus-format.h>
+
+#include "cdns-mhdp-imx.h" +#include "cdns-mhdp-imx.h"
+#include "cdns-mhdp-phy.h" +#include "cdns-mhdp-phy.h"
+#include "../imx-drm.h" +#include "../imx-drm.h"