drop drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch

no kcfi in stable kernels yet.

diff --git a/queue-4.19/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch b/queue-4.19/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
deleted file mode 100644 (file)
index 089781f..0000000
--- a/queue-4.19/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From cd60f484a067ff2066b2cfc1b5fa6e50ff1e3dcc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 26 Sep 2022 09:31:00 +0900
-Subject: drm/exynos: Fix return type for mixer_mode_valid and hdmi_mode_valid
-
-From: Nathan Huckleberry <nhuck@google.com>
-
-[ Upstream commit 1261255531088208daeca818e2b486030b5339e5 ]
-
-The field mode_valid in exynos_drm_crtc_ops is expected to be of type enum
-drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc,
-                                   const struct drm_display_mode *mode);
-
-Likewise for mode_valid in drm_connector_helper_funcs.
-
-The mismatched return type breaks forward edge kCFI since the underlying
-function definition does not match the function hook definition.
-
-The return type of mixer_mode_valid and hdmi_mode_valid should be changed
-from int to enum drm_mode_status.
-
-Reported-by: Dan Carpenter <error27@gmail.com>
-Link: https://protect2.fireeye.com/v1/url?k=3e644738-5fef521d-3e65cc77-
-74fe485cbff6-36ad29bf912d3c9f&q=1&e=5cc06174-77dd-4abd-ab50-
-155da5711aa3&u=https%3A%2F%2Fgithub.com%2FClangBuiltLinux%2Flinux%2Fissues%2F
-1703
-Cc: llvm@lists.linux.dev
-Signed-off-by: Nathan Huckleberry <nhuck@google.com>
-Signed-off-by: Inki Dae <inki.dae@samsung.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/exynos/exynos_hdmi.c  | 4 ++--
- drivers/gpu/drm/exynos/exynos_mixer.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
-index 2092a650df7d..227856f0a3c4 100644
---- a/drivers/gpu/drm/exynos/exynos_hdmi.c
-+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
-@@ -911,8 +911,8 @@ static int hdmi_find_phy_conf(struct hdmi_context *hdata, u32 pixel_clock)
-       return -EINVAL;
- }
- 
--static int hdmi_mode_valid(struct drm_connector *connector,
--                      struct drm_display_mode *mode)
-+static enum drm_mode_status hdmi_mode_valid(struct drm_connector *connector,
-+                                          struct drm_display_mode *mode)
- {
-       struct hdmi_context *hdata = connector_to_hdmi(connector);
-       int ret;
-diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
-index 522d6c46d7b1..16a7624021a8 100644
---- a/drivers/gpu/drm/exynos/exynos_mixer.c
-+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
-@@ -1018,7 +1018,7 @@ static void mixer_disable(struct exynos_drm_crtc *crtc)
-       clear_bit(MXR_BIT_POWERED, &ctx->flags);
- }
- 
--static int mixer_mode_valid(struct exynos_drm_crtc *crtc,
-+static enum drm_mode_status mixer_mode_valid(struct exynos_drm_crtc *crtc,
-               const struct drm_display_mode *mode)
- {
-       struct mixer_context *ctx = crtc->ctx;
--- 
-2.35.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index f44ba4551132e33c679c9fc5a6341463a782bf44..9947f1e3595c38d339f38cdd63f00a5f417a6705 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -212,7 +212,6 @@ drm-vc4-vec-fix-timings-for-vec-modes.patch
 drm-panel-orientation-quirks-add-quirk-for-anbernic-.patch
 platform-x86-msi-laptop-change-dmi-match-alias-strin.patch
 drm-amdgpu-fix-initial-connector-audio-value.patch
-drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
 arm-dts-imx7d-sdb-config-the-max-pressure-for-tsc204.patch
 arm-dts-imx6q-add-missing-properties-for-sram.patch
 arm-dts-imx6dl-add-missing-properties-for-sram.patch

diff --git a/queue-5.10/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch b/queue-5.10/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
deleted file mode 100644 (file)
index 0f1986d..0000000
--- a/queue-5.10/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bf2b251395831c692a1e11929038779027e8bbd3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 26 Sep 2022 09:31:00 +0900
-Subject: drm/exynos: Fix return type for mixer_mode_valid and hdmi_mode_valid
-
-From: Nathan Huckleberry <nhuck@google.com>
-
-[ Upstream commit 1261255531088208daeca818e2b486030b5339e5 ]
-
-The field mode_valid in exynos_drm_crtc_ops is expected to be of type enum
-drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc,
-                                   const struct drm_display_mode *mode);
-
-Likewise for mode_valid in drm_connector_helper_funcs.
-
-The mismatched return type breaks forward edge kCFI since the underlying
-function definition does not match the function hook definition.
-
-The return type of mixer_mode_valid and hdmi_mode_valid should be changed
-from int to enum drm_mode_status.
-
-Reported-by: Dan Carpenter <error27@gmail.com>
-Link: https://protect2.fireeye.com/v1/url?k=3e644738-5fef521d-3e65cc77-
-74fe485cbff6-36ad29bf912d3c9f&q=1&e=5cc06174-77dd-4abd-ab50-
-155da5711aa3&u=https%3A%2F%2Fgithub.com%2FClangBuiltLinux%2Flinux%2Fissues%2F
-1703
-Cc: llvm@lists.linux.dev
-Signed-off-by: Nathan Huckleberry <nhuck@google.com>
-Signed-off-by: Inki Dae <inki.dae@samsung.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/exynos/exynos_hdmi.c  | 4 ++--
- drivers/gpu/drm/exynos/exynos_mixer.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
-index dc01c188c0e0..d864082b2592 100644
---- a/drivers/gpu/drm/exynos/exynos_hdmi.c
-+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
-@@ -913,8 +913,8 @@ static int hdmi_find_phy_conf(struct hdmi_context *hdata, u32 pixel_clock)
-       return -EINVAL;
- }
- 
--static int hdmi_mode_valid(struct drm_connector *connector,
--                      struct drm_display_mode *mode)
-+static enum drm_mode_status hdmi_mode_valid(struct drm_connector *connector,
-+                                          struct drm_display_mode *mode)
- {
-       struct hdmi_context *hdata = connector_to_hdmi(connector);
-       int ret;
-diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
-index af192e5a16ef..dd038b30e7e9 100644
---- a/drivers/gpu/drm/exynos/exynos_mixer.c
-+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
-@@ -1039,7 +1039,7 @@ static void mixer_atomic_disable(struct exynos_drm_crtc *crtc)
-       clear_bit(MXR_BIT_POWERED, &ctx->flags);
- }
- 
--static int mixer_mode_valid(struct exynos_drm_crtc *crtc,
-+static enum drm_mode_status mixer_mode_valid(struct exynos_drm_crtc *crtc,
-               const struct drm_display_mode *mode)
- {
-       struct mixer_context *ctx = crtc->ctx;
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 4a8e5998c037b8fb8c1f2576e30d306110bffd8b..59f4c3c6b3ce617d970d688e732eb4de7cb0d24d 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -397,7 +397,6 @@ platform-x86-msi-laptop-change-dmi-match-alias-strin.patch
 asoc-sof-pci-change-dmi-match-info-to-support-all-ch.patch
 drm-amdgpu-fix-initial-connector-audio-value.patch
 drm-meson-explicitly-remove-aggregate-driver-at-modu.patch
-drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
 mmc-sdhci-msm-add-compatible-string-check-for-sdm670.patch
 drm-dp-don-t-rewrite-link-config-when-setting-phy-te.patch
 drm-amd-display-remove-interface-for-periodic-interr.patch

diff --git a/queue-5.15/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch b/queue-5.15/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
deleted file mode 100644 (file)
index 90344bc..0000000
--- a/queue-5.15/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bed7cbab0bd9ffeee46378ea15746cba495d4a0d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 26 Sep 2022 09:31:00 +0900
-Subject: drm/exynos: Fix return type for mixer_mode_valid and hdmi_mode_valid
-
-From: Nathan Huckleberry <nhuck@google.com>
-
-[ Upstream commit 1261255531088208daeca818e2b486030b5339e5 ]
-
-The field mode_valid in exynos_drm_crtc_ops is expected to be of type enum
-drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc,
-                                   const struct drm_display_mode *mode);
-
-Likewise for mode_valid in drm_connector_helper_funcs.
-
-The mismatched return type breaks forward edge kCFI since the underlying
-function definition does not match the function hook definition.
-
-The return type of mixer_mode_valid and hdmi_mode_valid should be changed
-from int to enum drm_mode_status.
-
-Reported-by: Dan Carpenter <error27@gmail.com>
-Link: https://protect2.fireeye.com/v1/url?k=3e644738-5fef521d-3e65cc77-
-74fe485cbff6-36ad29bf912d3c9f&q=1&e=5cc06174-77dd-4abd-ab50-
-155da5711aa3&u=https%3A%2F%2Fgithub.com%2FClangBuiltLinux%2Flinux%2Fissues%2F
-1703
-Cc: llvm@lists.linux.dev
-Signed-off-by: Nathan Huckleberry <nhuck@google.com>
-Signed-off-by: Inki Dae <inki.dae@samsung.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/exynos/exynos_hdmi.c  | 4 ++--
- drivers/gpu/drm/exynos/exynos_mixer.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
-index 7655142a4651..912a7df9f8c4 100644
---- a/drivers/gpu/drm/exynos/exynos_hdmi.c
-+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
-@@ -922,8 +922,8 @@ static int hdmi_find_phy_conf(struct hdmi_context *hdata, u32 pixel_clock)
-       return -EINVAL;
- }
- 
--static int hdmi_mode_valid(struct drm_connector *connector,
--                      struct drm_display_mode *mode)
-+static enum drm_mode_status hdmi_mode_valid(struct drm_connector *connector,
-+                                          struct drm_display_mode *mode)
- {
-       struct hdmi_context *hdata = connector_to_hdmi(connector);
-       int ret;
-diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
-index 41c54f1f60bc..8d01e1068245 100644
---- a/drivers/gpu/drm/exynos/exynos_mixer.c
-+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
-@@ -1044,7 +1044,7 @@ static void mixer_atomic_disable(struct exynos_drm_crtc *crtc)
-       clear_bit(MXR_BIT_POWERED, &ctx->flags);
- }
- 
--static int mixer_mode_valid(struct exynos_drm_crtc *crtc,
-+static enum drm_mode_status mixer_mode_valid(struct exynos_drm_crtc *crtc,
-               const struct drm_display_mode *mode)
- {
-       struct mixer_context *ctx = crtc->ctx;
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index f2d98bcbce6cea4f5425976fa264452db2c3c64d..ed83af87686c71c2599757f2752b30ee872a4fa2 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -537,7 +537,6 @@ asoc-sof-pci-change-dmi-match-info-to-support-all-ch.patch
 drm-amdgpu-fix-initial-connector-audio-value.patch
 drm-meson-reorder-driver-deinit-sequence-to-fix-use-.patch
 drm-meson-explicitly-remove-aggregate-driver-at-modu.patch
-drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
 mmc-sdhci-msm-add-compatible-string-check-for-sdm670.patch
 drm-dp-don-t-rewrite-link-config-when-setting-phy-te.patch
 drm-amd-display-remove-interface-for-periodic-interr.patch

diff --git a/queue-5.19/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch b/queue-5.19/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
deleted file mode 100644 (file)
index e92c356..0000000
--- a/queue-5.19/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 18fd514d3c59e2b12fa3ca1a494a9d6a4050459f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 26 Sep 2022 09:31:00 +0900
-Subject: drm/exynos: Fix return type for mixer_mode_valid and hdmi_mode_valid
-
-From: Nathan Huckleberry <nhuck@google.com>
-
-[ Upstream commit 1261255531088208daeca818e2b486030b5339e5 ]
-
-The field mode_valid in exynos_drm_crtc_ops is expected to be of type enum
-drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc,
-                                   const struct drm_display_mode *mode);
-
-Likewise for mode_valid in drm_connector_helper_funcs.
-
-The mismatched return type breaks forward edge kCFI since the underlying
-function definition does not match the function hook definition.
-
-The return type of mixer_mode_valid and hdmi_mode_valid should be changed
-from int to enum drm_mode_status.
-
-Reported-by: Dan Carpenter <error27@gmail.com>
-Link: https://protect2.fireeye.com/v1/url?k=3e644738-5fef521d-3e65cc77-
-74fe485cbff6-36ad29bf912d3c9f&q=1&e=5cc06174-77dd-4abd-ab50-
-155da5711aa3&u=https%3A%2F%2Fgithub.com%2FClangBuiltLinux%2Flinux%2Fissues%2F
-1703
-Cc: llvm@lists.linux.dev
-Signed-off-by: Nathan Huckleberry <nhuck@google.com>
-Signed-off-by: Inki Dae <inki.dae@samsung.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/exynos/exynos_hdmi.c  | 4 ++--
- drivers/gpu/drm/exynos/exynos_mixer.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
-index 7655142a4651..912a7df9f8c4 100644
---- a/drivers/gpu/drm/exynos/exynos_hdmi.c
-+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
-@@ -922,8 +922,8 @@ static int hdmi_find_phy_conf(struct hdmi_context *hdata, u32 pixel_clock)
-       return -EINVAL;
- }
- 
--static int hdmi_mode_valid(struct drm_connector *connector,
--                      struct drm_display_mode *mode)
-+static enum drm_mode_status hdmi_mode_valid(struct drm_connector *connector,
-+                                          struct drm_display_mode *mode)
- {
-       struct hdmi_context *hdata = connector_to_hdmi(connector);
-       int ret;
-diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
-index e5204be86093..c46bee9176da 100644
---- a/drivers/gpu/drm/exynos/exynos_mixer.c
-+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
-@@ -1042,7 +1042,7 @@ static void mixer_atomic_disable(struct exynos_drm_crtc *crtc)
-       clear_bit(MXR_BIT_POWERED, &ctx->flags);
- }
- 
--static int mixer_mode_valid(struct exynos_drm_crtc *crtc,
-+static enum drm_mode_status mixer_mode_valid(struct exynos_drm_crtc *crtc,
-               const struct drm_display_mode *mode)
- {
-       struct mixer_context *ctx = crtc->ctx;
--- 
-2.35.1
-

diff --git a/queue-5.19/series b/queue-5.19/series
index feffa2480156b544f432c4088cb98d26bd5cc95c..d61ce997f89114424a4c02767e56ed20d4664812 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -731,7 +731,6 @@ drm-amdgpu-fix-initial-connector-audio-value.patch
 drm-meson-reorder-driver-deinit-sequence-to-fix-use-.patch
 drm-meson-explicitly-remove-aggregate-driver-at-modu.patch
 drm-meson-remove-drm-bridges-at-aggregate-driver-unb.patch
-drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
 drm-dp-don-t-rewrite-link-config-when-setting-phy-te.patch
 drm-amd-display-remove-interface-for-periodic-interr.patch
 drm-amd-display-polling-vid-stream-status-in-hpo-dp-.patch

diff --git a/queue-5.4/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch b/queue-5.4/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
deleted file mode 100644 (file)
index 8fdf3d4..0000000
--- a/queue-5.4/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From e84838c4715e250d30827da81790093adbb49cd7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 26 Sep 2022 09:31:00 +0900
-Subject: drm/exynos: Fix return type for mixer_mode_valid and hdmi_mode_valid
-
-From: Nathan Huckleberry <nhuck@google.com>
-
-[ Upstream commit 1261255531088208daeca818e2b486030b5339e5 ]
-
-The field mode_valid in exynos_drm_crtc_ops is expected to be of type enum
-drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc,
-                                   const struct drm_display_mode *mode);
-
-Likewise for mode_valid in drm_connector_helper_funcs.
-
-The mismatched return type breaks forward edge kCFI since the underlying
-function definition does not match the function hook definition.
-
-The return type of mixer_mode_valid and hdmi_mode_valid should be changed
-from int to enum drm_mode_status.
-
-Reported-by: Dan Carpenter <error27@gmail.com>
-Link: https://protect2.fireeye.com/v1/url?k=3e644738-5fef521d-3e65cc77-
-74fe485cbff6-36ad29bf912d3c9f&q=1&e=5cc06174-77dd-4abd-ab50-
-155da5711aa3&u=https%3A%2F%2Fgithub.com%2FClangBuiltLinux%2Flinux%2Fissues%2F
-1703
-Cc: llvm@lists.linux.dev
-Signed-off-by: Nathan Huckleberry <nhuck@google.com>
-Signed-off-by: Inki Dae <inki.dae@samsung.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/exynos/exynos_hdmi.c  | 4 ++--
- drivers/gpu/drm/exynos/exynos_mixer.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
-index 0073a2b3b80a..838a638fb03a 100644
---- a/drivers/gpu/drm/exynos/exynos_hdmi.c
-+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
-@@ -911,8 +911,8 @@ static int hdmi_find_phy_conf(struct hdmi_context *hdata, u32 pixel_clock)
-       return -EINVAL;
- }
- 
--static int hdmi_mode_valid(struct drm_connector *connector,
--                      struct drm_display_mode *mode)
-+static enum drm_mode_status hdmi_mode_valid(struct drm_connector *connector,
-+                                          struct drm_display_mode *mode)
- {
-       struct hdmi_context *hdata = connector_to_hdmi(connector);
-       int ret;
-diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
-index 22f494145411..07c59e647fc2 100644
---- a/drivers/gpu/drm/exynos/exynos_mixer.c
-+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
-@@ -1039,7 +1039,7 @@ static void mixer_disable(struct exynos_drm_crtc *crtc)
-       clear_bit(MXR_BIT_POWERED, &ctx->flags);
- }
- 
--static int mixer_mode_valid(struct exynos_drm_crtc *crtc,
-+static enum drm_mode_status mixer_mode_valid(struct exynos_drm_crtc *crtc,
-               const struct drm_display_mode *mode)
- {
-       struct mixer_context *ctx = crtc->ctx;
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 218989748b3c2bed4e668e36dde2c2039099661f..d6f5616106ac93934a7bc3527f2c3bb8f40a901d 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -231,7 +231,6 @@ drm-vc4-vec-fix-timings-for-vec-modes.patch
 drm-panel-orientation-quirks-add-quirk-for-anbernic-.patch
 platform-x86-msi-laptop-change-dmi-match-alias-strin.patch
 drm-amdgpu-fix-initial-connector-audio-value.patch
-drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
 mmc-sdhci-msm-add-compatible-string-check-for-sdm670.patch
 arm64-dts-qcom-sdm845-narrow-llcc-address-space.patch
 arm-dts-imx7d-sdb-config-the-max-pressure-for-tsc204.patch

diff --git a/queue-6.0/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch b/queue-6.0/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
deleted file mode 100644 (file)
index f829732..0000000
--- a/queue-6.0/drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 8bf2b90038f49a6a81e60d49118000b00a271056 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 26 Sep 2022 09:31:00 +0900
-Subject: drm/exynos: Fix return type for mixer_mode_valid and hdmi_mode_valid
-
-From: Nathan Huckleberry <nhuck@google.com>
-
-[ Upstream commit 1261255531088208daeca818e2b486030b5339e5 ]
-
-The field mode_valid in exynos_drm_crtc_ops is expected to be of type enum
-drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc,
-                                   const struct drm_display_mode *mode);
-
-Likewise for mode_valid in drm_connector_helper_funcs.
-
-The mismatched return type breaks forward edge kCFI since the underlying
-function definition does not match the function hook definition.
-
-The return type of mixer_mode_valid and hdmi_mode_valid should be changed
-from int to enum drm_mode_status.
-
-Reported-by: Dan Carpenter <error27@gmail.com>
-Link: https://protect2.fireeye.com/v1/url?k=3e644738-5fef521d-3e65cc77-
-74fe485cbff6-36ad29bf912d3c9f&q=1&e=5cc06174-77dd-4abd-ab50-
-155da5711aa3&u=https%3A%2F%2Fgithub.com%2FClangBuiltLinux%2Flinux%2Fissues%2F
-1703
-Cc: llvm@lists.linux.dev
-Signed-off-by: Nathan Huckleberry <nhuck@google.com>
-Signed-off-by: Inki Dae <inki.dae@samsung.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/exynos/exynos_hdmi.c  | 4 ++--
- drivers/gpu/drm/exynos/exynos_mixer.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
-index 10b0036f8a2e..8453359c92e8 100644
---- a/drivers/gpu/drm/exynos/exynos_hdmi.c
-+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
-@@ -922,8 +922,8 @@ static int hdmi_find_phy_conf(struct hdmi_context *hdata, u32 pixel_clock)
-       return -EINVAL;
- }
- 
--static int hdmi_mode_valid(struct drm_connector *connector,
--                      struct drm_display_mode *mode)
-+static enum drm_mode_status hdmi_mode_valid(struct drm_connector *connector,
-+                                          struct drm_display_mode *mode)
- {
-       struct hdmi_context *hdata = connector_to_hdmi(connector);
-       int ret;
-diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
-index 65260a658684..8d333db813b7 100644
---- a/drivers/gpu/drm/exynos/exynos_mixer.c
-+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
-@@ -1045,7 +1045,7 @@ static void mixer_atomic_disable(struct exynos_drm_crtc *crtc)
-       clear_bit(MXR_BIT_POWERED, &ctx->flags);
- }
- 
--static int mixer_mode_valid(struct exynos_drm_crtc *crtc,
-+static enum drm_mode_status mixer_mode_valid(struct exynos_drm_crtc *crtc,
-               const struct drm_display_mode *mode)
- {
-       struct mixer_context *ctx = crtc->ctx;
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 493c74d7de17b231908b3fc2f9d57b1d445aa54f..b6034f788252302fd5fb918fa851b73c7ea53d00 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -825,7 +825,6 @@ asoc-amd-yc-add-lenovo-yoga-slim-7-pro-x-to-quirks-t.patch
 drm-meson-reorder-driver-deinit-sequence-to-fix-use-.patch
 drm-meson-explicitly-remove-aggregate-driver-at-modu.patch
 drm-meson-remove-drm-bridges-at-aggregate-driver-unb.patch
-drm-exynos-fix-return-type-for-mixer_mode_valid-and-.patch
 mmc-sdhci-msm-add-compatible-string-check-for-sdm670.patch
 drm-dp-don-t-rewrite-link-config-when-setting-phy-te.patch
 drm-amd-display-remove-interface-for-periodic-interr.patch