drop drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch

It breaks the build on 6.0 and 5.19

diff --git a/queue-5.10/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch b/queue-5.10/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
deleted file mode 100644 (file)
index ffe4447..0000000
--- a/queue-5.10/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 5496827f630a0e92e757181b39b66bd65b0daeb5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 27 Sep 2022 15:01:46 -0400
-Subject: drm/amd/display: fix array-bounds error in
- dc_stream_remove_writeback()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Hamza Mahfooz <hamza.mahfooz@amd.com>
-
-[ Upstream commit 5d8c3e836fc224dfe633e41f7f2856753b39a905 ]
-
-Address the following error:
-drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c: In function ‘dc_stream_remove_writeback’:
-drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:527:55: error: array subscript [0, 0] is outside array bounds of ‘struct dc_writeback_info[1]’ [-Werror=array-bounds]
-  527 |                                 stream->writeback_info[j] = stream->writeback_info[i];
-      |                                 ~~~~~~~~~~~~~~~~~~~~~~^~~
-In file included from ./drivers/gpu/drm/amd/amdgpu/../display/dc/dc.h:1269,
-                 from ./drivers/gpu/drm/amd/amdgpu/../display/dc/inc/core_types.h:29,
-                 from ./drivers/gpu/drm/amd/amdgpu/../display/dc/basics/dc_common.h:29,
-                 from drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:27:
-./drivers/gpu/drm/amd/amdgpu/../display/dc/dc_stream.h:241:34: note: while referencing ‘writeback_info’
-  241 |         struct dc_writeback_info writeback_info[MAX_DWB_PIPES];
-      |
-
-Currently, we aren't checking to see if j remains within
-writeback_info[]'s bounds. So, add a check to make sure that we aren't
-overflowing the buffer.
-
-Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
-Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-index d48fd87d3b95..867b8b66293a 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-@@ -491,7 +491,7 @@ bool dc_stream_remove_writeback(struct dc *dc,
-       }
- 
-       /* remove writeback info for disabled writeback pipes from stream */
--      for (i = 0, j = 0; i < stream->num_wb_info; i++) {
-+      for (i = 0, j = 0; i < stream->num_wb_info && j < MAX_DWB_PIPES; i++) {
-               if (stream->writeback_info[i].wb_enabled) {
-                       if (i != j)
-                               /* trim the array */
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index c54e4099f4bb621b493b5864c92ee09612d41f86..198bee172d83cf7c144a37397da3c59e463cc700 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -409,7 +409,6 @@ 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
-drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
 arm64-dts-qcom-sdm845-narrow-llcc-address-space.patch
 arm-dts-imx7d-sdb-config-the-max-pressure-for-tsc204.patch
 arm-dts-imx6q-add-missing-properties-for-sram.patch

diff --git a/queue-5.15/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch b/queue-5.15/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
deleted file mode 100644 (file)
index 9e929ca..0000000
--- a/queue-5.15/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6d15b9c041d3eb54917da6b57815a2827730074c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 27 Sep 2022 15:01:46 -0400
-Subject: drm/amd/display: fix array-bounds error in
- dc_stream_remove_writeback()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Hamza Mahfooz <hamza.mahfooz@amd.com>
-
-[ Upstream commit 5d8c3e836fc224dfe633e41f7f2856753b39a905 ]
-
-Address the following error:
-drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c: In function ‘dc_stream_remove_writeback’:
-drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:527:55: error: array subscript [0, 0] is outside array bounds of ‘struct dc_writeback_info[1]’ [-Werror=array-bounds]
-  527 |                                 stream->writeback_info[j] = stream->writeback_info[i];
-      |                                 ~~~~~~~~~~~~~~~~~~~~~~^~~
-In file included from ./drivers/gpu/drm/amd/amdgpu/../display/dc/dc.h:1269,
-                 from ./drivers/gpu/drm/amd/amdgpu/../display/dc/inc/core_types.h:29,
-                 from ./drivers/gpu/drm/amd/amdgpu/../display/dc/basics/dc_common.h:29,
-                 from drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:27:
-./drivers/gpu/drm/amd/amdgpu/../display/dc/dc_stream.h:241:34: note: while referencing ‘writeback_info’
-  241 |         struct dc_writeback_info writeback_info[MAX_DWB_PIPES];
-      |
-
-Currently, we aren't checking to see if j remains within
-writeback_info[]'s bounds. So, add a check to make sure that we aren't
-overflowing the buffer.
-
-Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
-Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-index f0f54f4d3d9b..1f1f3d3c8884 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-@@ -519,7 +519,7 @@ bool dc_stream_remove_writeback(struct dc *dc,
-       }
- 
-       /* remove writeback info for disabled writeback pipes from stream */
--      for (i = 0, j = 0; i < stream->num_wb_info; i++) {
-+      for (i = 0, j = 0; i < stream->num_wb_info && j < MAX_DWB_PIPES; i++) {
-               if (stream->writeback_info[i].wb_enabled) {
-                       if (i != j)
-                               /* trim the array */
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 33c52f1cef4e73c1618111f1fdd211468144568b..4f31d6f1d06fefc06151e6c882d1ce25cefa7c76 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -546,7 +546,6 @@ 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
-drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
 arm64-dts-qcom-sdm845-narrow-llcc-address-space.patch
 arm-dts-imx7d-sdb-config-the-max-pressure-for-tsc204.patch
 arm64-dts-qcom-sc7280-idp-correct-adc-channel-node-n.patch

diff --git a/queue-5.19/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch b/queue-5.19/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
deleted file mode 100644 (file)
index da58683..0000000
--- a/queue-5.19/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0ccf890efd910a6bc77d06b49198e789a09733d7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 27 Sep 2022 15:01:46 -0400
-Subject: drm/amd/display: fix array-bounds error in
- dc_stream_remove_writeback()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Hamza Mahfooz <hamza.mahfooz@amd.com>
-
-[ Upstream commit 5d8c3e836fc224dfe633e41f7f2856753b39a905 ]
-
-Address the following error:
-drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c: In function ‘dc_stream_remove_writeback’:
-drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:527:55: error: array subscript [0, 0] is outside array bounds of ‘struct dc_writeback_info[1]’ [-Werror=array-bounds]
-  527 |                                 stream->writeback_info[j] = stream->writeback_info[i];
-      |                                 ~~~~~~~~~~~~~~~~~~~~~~^~~
-In file included from ./drivers/gpu/drm/amd/amdgpu/../display/dc/dc.h:1269,
-                 from ./drivers/gpu/drm/amd/amdgpu/../display/dc/inc/core_types.h:29,
-                 from ./drivers/gpu/drm/amd/amdgpu/../display/dc/basics/dc_common.h:29,
-                 from drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:27:
-./drivers/gpu/drm/amd/amdgpu/../display/dc/dc_stream.h:241:34: note: while referencing ‘writeback_info’
-  241 |         struct dc_writeback_info writeback_info[MAX_DWB_PIPES];
-      |
-
-Currently, we aren't checking to see if j remains within
-writeback_info[]'s bounds. So, add a check to make sure that we aren't
-overflowing the buffer.
-
-Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
-Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-index de8b214132a2..5e460b16d650 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-@@ -516,7 +516,7 @@ bool dc_stream_remove_writeback(struct dc *dc,
-       }
- 
-       /* remove writeback info for disabled writeback pipes from stream */
--      for (i = 0, j = 0; i < stream->num_wb_info; i++) {
-+      for (i = 0, j = 0; i < stream->num_wb_info && j < MAX_DWB_PIPES; i++) {
-               if (stream->writeback_info[i].wb_enabled) {
-                       if (i != j)
-                               /* trim the array */
--- 
-2.35.1
-

diff --git a/queue-5.19/series b/queue-5.19/series
index 577f7437811df1fd128e106dbc86b9bf4a07e843..e4c77ab12144243174025875c0ab2cab59ded73c 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -736,7 +736,6 @@ 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
-drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
 drm-amdkfd-fix-ubsan-shift-out-of-bounds-warning.patch
 arm64-dts-qcom-sdm845-narrow-llcc-address-space.patch
 arm-dts-imx6-delete-interrupts-property-if-interrupt.patch

diff --git a/queue-5.4/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch b/queue-5.4/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
deleted file mode 100644 (file)
index 354100e..0000000
--- a/queue-5.4/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7003c583e1d247137329b96240c27451d5ef3629 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 27 Sep 2022 15:01:46 -0400
-Subject: drm/amd/display: fix array-bounds error in
- dc_stream_remove_writeback()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Hamza Mahfooz <hamza.mahfooz@amd.com>
-
-[ Upstream commit 5d8c3e836fc224dfe633e41f7f2856753b39a905 ]
-
-Address the following error:
-drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c: In function ‘dc_stream_remove_writeback’:
-drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:527:55: error: array subscript [0, 0] is outside array bounds of ‘struct dc_writeback_info[1]’ [-Werror=array-bounds]
-  527 |                                 stream->writeback_info[j] = stream->writeback_info[i];
-      |                                 ~~~~~~~~~~~~~~~~~~~~~~^~~
-In file included from ./drivers/gpu/drm/amd/amdgpu/../display/dc/dc.h:1269,
-                 from ./drivers/gpu/drm/amd/amdgpu/../display/dc/inc/core_types.h:29,
-                 from ./drivers/gpu/drm/amd/amdgpu/../display/dc/basics/dc_common.h:29,
-                 from drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:27:
-./drivers/gpu/drm/amd/amdgpu/../display/dc/dc_stream.h:241:34: note: while referencing ‘writeback_info’
-  241 |         struct dc_writeback_info writeback_info[MAX_DWB_PIPES];
-      |
-
-Currently, we aren't checking to see if j remains within
-writeback_info[]'s bounds. So, add a check to make sure that we aren't
-overflowing the buffer.
-
-Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
-Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-index bb09243758fe..95d36cb79e28 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-@@ -458,7 +458,7 @@ bool dc_stream_remove_writeback(struct dc *dc,
-       }
- 
-       /* remove writeback info for disabled writeback pipes from stream */
--      for (i = 0, j = 0; i < stream->num_wb_info; i++) {
-+      for (i = 0, j = 0; i < stream->num_wb_info && j < MAX_DWB_PIPES; i++) {
-               if (stream->writeback_info[i].wb_enabled) {
-                       if (i != j)
-                               /* trim the array */
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 81f46b830d55eb9331296a00974fce2388a33d5d..5e6a485f874db131997c7fb929d11a1c3e696b91 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -233,7 +233,6 @@ 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
-drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
 arm64-dts-qcom-sdm845-narrow-llcc-address-space.patch
 arm-dts-imx7d-sdb-config-the-max-pressure-for-tsc204.patch
 arm-dts-imx6q-add-missing-properties-for-sram.patch

diff --git a/queue-6.0/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch b/queue-6.0/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
deleted file mode 100644 (file)
index 67ceb71..0000000
--- a/queue-6.0/drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 276170299bcd3f6cbea11dcb0bd6a576a1ac7a83 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 27 Sep 2022 15:01:46 -0400
-Subject: drm/amd/display: fix array-bounds error in
- dc_stream_remove_writeback()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Hamza Mahfooz <hamza.mahfooz@amd.com>
-
-[ Upstream commit 5d8c3e836fc224dfe633e41f7f2856753b39a905 ]
-
-Address the following error:
-drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c: In function ‘dc_stream_remove_writeback’:
-drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:527:55: error: array subscript [0, 0] is outside array bounds of ‘struct dc_writeback_info[1]’ [-Werror=array-bounds]
-  527 |                                 stream->writeback_info[j] = stream->writeback_info[i];
-      |                                 ~~~~~~~~~~~~~~~~~~~~~~^~~
-In file included from ./drivers/gpu/drm/amd/amdgpu/../display/dc/dc.h:1269,
-                 from ./drivers/gpu/drm/amd/amdgpu/../display/dc/inc/core_types.h:29,
-                 from ./drivers/gpu/drm/amd/amdgpu/../display/dc/basics/dc_common.h:29,
-                 from drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_stream.c:27:
-./drivers/gpu/drm/amd/amdgpu/../display/dc/dc_stream.h:241:34: note: while referencing ‘writeback_info’
-  241 |         struct dc_writeback_info writeback_info[MAX_DWB_PIPES];
-      |
-
-Currently, we aren't checking to see if j remains within
-writeback_info[]'s bounds. So, add a check to make sure that we aren't
-overflowing the buffer.
-
-Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
-Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-index 0c85ab5933b4..f0a8bd924f43 100644
---- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-+++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c
-@@ -519,7 +519,7 @@ bool dc_stream_remove_writeback(struct dc *dc,
-       }
- 
-       /* remove writeback info for disabled writeback pipes from stream */
--      for (i = 0, j = 0; i < stream->num_wb_info; i++) {
-+      for (i = 0, j = 0; i < stream->num_wb_info && j < MAX_DWB_PIPES; i++) {
-               if (stream->writeback_info[i].wb_enabled) {
-                       if (i != j)
-                               /* trim the array */
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 5e970c7754f5d7dd6e86279f174d751d973fe13d..487121f0d5e2e2a67209ab2528389a7d7ce6e0a7 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -833,7 +833,6 @@ 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
 drm-amd-display-polling-vid-stream-status-in-hpo-dp-.patch
-drm-amd-display-fix-array-bounds-error-in-dc_stream_.patch
 drm-amdkfd-fix-ubsan-shift-out-of-bounds-warning.patch
 arm-dts-imx6-delete-interrupts-property-if-interrupt.patch
 arm-dts-imx7d-sdb-config-the-max-pressure-for-tsc204.patch