drop drm debugging patch that was breaking the build in 32 bit systems.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/queue-4.19/drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch b/queue-4.19/drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch
deleted file mode 100644 (file)
index c1e2d02..0000000
--- a/queue-4.19/drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2ebcdf1746947b46f70ed9520a98c88353ec3b32 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 5 Dec 2023 12:01:05 -0500
-Subject: drm/amd/display: make flip_timestamp_in_us a 64-bit variable
-
-From: Josip Pavic <josip.pavic@amd.com>
-
-[ Upstream commit 6fb12518ca58412dc51054e2a7400afb41328d85 ]
-
-[Why]
-This variable currently overflows after about 71 minutes. This doesn't
-cause any known functional issues but it does make debugging more
-difficult.
-
-[How]
-Make it a 64-bit variable.
-
-Reviewed-by: Aric Cyr <aric.cyr@amd.com>
-Acked-by: Wayne Lin <wayne.lin@amd.com>
-Signed-off-by: Josip Pavic <josip.pavic@amd.com>
-Tested-by: Daniel Wheeler <daniel.wheeler@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/dc_hw_types.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-index b789cb2b354b..c96ff10365d2 100644
---- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-@@ -357,7 +357,7 @@ union dc_tiling_info {
-       } gfx8;
- 
-       struct {
--              unsigned int num_pipes;
-+              unsigned long long num_pipes;
-               unsigned int num_banks;
-               unsigned int pipe_interleave;
-               unsigned int num_shader_engines;
--- 
-2.43.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 5c42e693f3dace790964265abface9e64ca49728..f673809ca78a9f0c8c088527be50d2a5a342a283 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -110,7 +110,6 @@ media-ddbridge-fix-an-error-code-problem-in-ddb_prob.patch
 drm-msm-dpu-ratelimit-framedone-timeout-msgs.patch
 clk-hi3620-fix-memory-leak-in-hi3620_mmc_clk_init.patch
 clk-mmp-pxa168-fix-memory-leak-in-pxa168_clk_init.patch
-drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch
 drm-amdgpu-let-kfd-sync-with-vm-fences.patch
 drm-amdgpu-drop-fence-check-in-to_amdgpu_amdkfd_fenc.patch
 leds-trigger-panic-don-t-register-panic-notifier-if-.patch

diff --git a/queue-5.10/drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch b/queue-5.10/drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch
deleted file mode 100644 (file)
index a770383..0000000
--- a/queue-5.10/drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 47d1ee1c6eba8de17ed4b1994f7f052339ea904f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 5 Dec 2023 12:01:05 -0500
-Subject: drm/amd/display: make flip_timestamp_in_us a 64-bit variable
-
-From: Josip Pavic <josip.pavic@amd.com>
-
-[ Upstream commit 6fb12518ca58412dc51054e2a7400afb41328d85 ]
-
-[Why]
-This variable currently overflows after about 71 minutes. This doesn't
-cause any known functional issues but it does make debugging more
-difficult.
-
-[How]
-Make it a 64-bit variable.
-
-Reviewed-by: Aric Cyr <aric.cyr@amd.com>
-Acked-by: Wayne Lin <wayne.lin@amd.com>
-Signed-off-by: Josip Pavic <josip.pavic@amd.com>
-Tested-by: Daniel Wheeler <daniel.wheeler@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/dc_hw_types.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-index 1a87bc3da826..b36d4c5d0eca 100644
---- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-@@ -426,7 +426,7 @@ struct dc_cursor_position {
- };
- 
- struct dc_cursor_mi_param {
--      unsigned int pixel_clk_khz;
-+      unsigned long long pixel_clk_khz;
-       unsigned int ref_clk_khz;
-       struct rect viewport;
-       struct fixed31_32 h_scale_ratio;
--- 
-2.43.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index abe8bbb793ac9b60ec9c67f295808291b9c27f77..fdcd6e996d38459a1f5a125bae21d904dce28a54 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -192,7 +192,6 @@ drm-msm-dpu-ratelimit-framedone-timeout-msgs.patch
 clk-hi3620-fix-memory-leak-in-hi3620_mmc_clk_init.patch
 clk-mmp-pxa168-fix-memory-leak-in-pxa168_clk_init.patch
 watchdog-it87_wdt-keep-wdtctrl-bit-3-unmodified-for-.patch
-drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch
 drm-amdgpu-let-kfd-sync-with-vm-fences.patch
 drm-amdgpu-drop-fence-check-in-to_amdgpu_amdkfd_fenc.patch
 leds-trigger-panic-don-t-register-panic-notifier-if-.patch

diff --git a/queue-5.15/drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch b/queue-5.15/drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch
deleted file mode 100644 (file)
index a3f6e7d..0000000
--- a/queue-5.15/drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6307a698822ec95ce1228f083ee60f6fc40707f9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 5 Dec 2023 12:01:05 -0500
-Subject: drm/amd/display: make flip_timestamp_in_us a 64-bit variable
-
-From: Josip Pavic <josip.pavic@amd.com>
-
-[ Upstream commit 6fb12518ca58412dc51054e2a7400afb41328d85 ]
-
-[Why]
-This variable currently overflows after about 71 minutes. This doesn't
-cause any known functional issues but it does make debugging more
-difficult.
-
-[How]
-Make it a 64-bit variable.
-
-Reviewed-by: Aric Cyr <aric.cyr@amd.com>
-Acked-by: Wayne Lin <wayne.lin@amd.com>
-Signed-off-by: Josip Pavic <josip.pavic@amd.com>
-Tested-by: Daniel Wheeler <daniel.wheeler@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/dc_hw_types.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-index 52355fe6994c..51df38a210e8 100644
---- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-@@ -417,7 +417,7 @@ struct dc_cursor_position {
- };
- 
- struct dc_cursor_mi_param {
--      unsigned int pixel_clk_khz;
-+      unsigned long long pixel_clk_khz;
-       unsigned int ref_clk_khz;
-       struct rect viewport;
-       struct fixed31_32 h_scale_ratio;
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 337e5db21ab31fde71aaa8d62aafba790d2eab59..69739daa82bee345a4abb3ab0e771c58fd6c1efe 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -229,7 +229,6 @@ drm-amdgpu-fix-ftrace-event-amdgpu_bo_move-always-mo.patch
 clk-hi3620-fix-memory-leak-in-hi3620_mmc_clk_init.patch
 clk-mmp-pxa168-fix-memory-leak-in-pxa168_clk_init.patch
 watchdog-it87_wdt-keep-wdtctrl-bit-3-unmodified-for-.patch
-drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch
 clk-imx-scu-fix-memory-leak-in-__imx_clk_gpr_scu.patch
 clk-imx-clk-imx8qxp-fix-lvds-bypass-pixel-and-phy-cl.patch
 drm-amdgpu-let-kfd-sync-with-vm-fences.patch

diff --git a/queue-5.4/drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch b/queue-5.4/drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch
deleted file mode 100644 (file)
index ae3a2c0..0000000
--- a/queue-5.4/drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8a65ffba14c5269ee808358b12b782374492e690 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 5 Dec 2023 12:01:05 -0500
-Subject: drm/amd/display: make flip_timestamp_in_us a 64-bit variable
-
-From: Josip Pavic <josip.pavic@amd.com>
-
-[ Upstream commit 6fb12518ca58412dc51054e2a7400afb41328d85 ]
-
-[Why]
-This variable currently overflows after about 71 minutes. This doesn't
-cause any known functional issues but it does make debugging more
-difficult.
-
-[How]
-Make it a 64-bit variable.
-
-Reviewed-by: Aric Cyr <aric.cyr@amd.com>
-Acked-by: Wayne Lin <wayne.lin@amd.com>
-Signed-off-by: Josip Pavic <josip.pavic@amd.com>
-Tested-by: Daniel Wheeler <daniel.wheeler@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/dc_hw_types.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-index 0b8700a8a94a..c6281d4a18ce 100644
---- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-+++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h
-@@ -423,7 +423,7 @@ struct dc_cursor_position {
- };
- 
- struct dc_cursor_mi_param {
--      unsigned int pixel_clk_khz;
-+      unsigned long long pixel_clk_khz;
-       unsigned int ref_clk_khz;
-       struct rect viewport;
-       struct fixed31_32 h_scale_ratio;
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index eb192f505b62d4be9dbce81a5d42f1aec5cd1ace..5834d53d43fd4daf2aa97177eb4d0107e32ed89a 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -132,7 +132,6 @@ media-ddbridge-fix-an-error-code-problem-in-ddb_prob.patch
 drm-msm-dpu-ratelimit-framedone-timeout-msgs.patch
 clk-hi3620-fix-memory-leak-in-hi3620_mmc_clk_init.patch
 clk-mmp-pxa168-fix-memory-leak-in-pxa168_clk_init.patch
-drm-amd-display-make-flip_timestamp_in_us-a-64-bit-v.patch
 drm-amdgpu-let-kfd-sync-with-vm-fences.patch
 drm-amdgpu-drop-fence-check-in-to_amdgpu_amdkfd_fenc.patch
 leds-trigger-panic-don-t-register-panic-notifier-if-.patch