Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2019-09-30 15:47:07 +0200
committerThomas Zimmermann <tzimmermann@suse.de>2019-09-30 16:29:06 +0200
commit6bc74000d7031bce335f3fc37a1c68289205e8ef (patch)
tree3e51cc62623e51b81e5d5166ed8c3e3ae5ddc76c
parent13bba8ccba15daa60099b084452a38e4149602fe (diff)
Revert "drm/amd/display: Fix underscan not using proper scaling" (bsc#1152472)
-rw-r--r--patches.suse/0004-Revert-drm-amd-display-Fix-underscan-not-using-prope.patch58
-rw-r--r--series.conf1
2 files changed, 59 insertions, 0 deletions
diff --git a/patches.suse/0004-Revert-drm-amd-display-Fix-underscan-not-using-prope.patch b/patches.suse/0004-Revert-drm-amd-display-Fix-underscan-not-using-prope.patch
new file mode 100644
index 0000000000..d46f834945
--- /dev/null
+++ b/patches.suse/0004-Revert-drm-amd-display-Fix-underscan-not-using-prope.patch
@@ -0,0 +1,58 @@
+From 5cb99d46f7bdf02cacf08ea9d4301aff0cd311a6 Mon Sep 17 00:00:00 2001
+From: David Francis <David.Francis@amd.com>
+Date: Thu, 23 May 2019 14:25:35 -0400
+Subject: Revert "drm/amd/display: Fix underscan not using proper scaling"
+Git-commit: 5cb99d46f7bdf02cacf08ea9d4301aff0cd311a6
+Patch-mainline: v5.4-rc1
+References: bsc#1152472
+
+This reverts commit 80e80ec817f161560b4159608fb41bd289abede3.
+
+This commit fixed an issue with underscan commits not updating all
+needed timing values, but through various refactors it is no longer
+necessary. It causes corruption on odm combine by
+overwriting the halved h_active in the stream timing
+
+Signed-off-by: David Francis <David.Francis@amd.com>
+Reviewed-by: Roman Li <Roman.Li@amd.com>
+Reviewed-by: Harry Wentland <harry.wentland@amd.com>
+Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
+---
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
+index 4a2c7e9c56c0..55505b9f8ab4 100644
+--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
+@@ -2130,7 +2130,7 @@ void dc_commit_updates_for_stream(struct dc *dc,
+ enum surface_update_type update_type;
+ struct dc_state *context;
+ struct dc_context *dc_ctx = dc->ctx;
+- int i, j;
++ int i;
+
+ stream_status = dc_stream_get_status(stream);
+ context = dc->current_state;
+@@ -2168,16 +2168,6 @@ void dc_commit_updates_for_stream(struct dc *dc,
+
+ copy_surface_update_to_plane(surface, &srf_updates[i]);
+
+- if (update_type >= UPDATE_TYPE_MED) {
+- for (j = 0; j < dc->res_pool->pipe_count; j++) {
+- struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];
+-
+- if (pipe_ctx->plane_state != surface)
+- continue;
+-
+- resource_build_scaling_params(pipe_ctx);
+- }
+- }
+ }
+
+ copy_stream_update_to_stream(dc, context, stream, stream_update);
+--
+2.23.0
+
diff --git a/series.conf b/series.conf
index a907ed778e..94d446295d 100644
--- a/series.conf
+++ b/series.conf
@@ -104,6 +104,7 @@
patches.suse/0001-Revert-drm-amd-display-skip-dsc-config-for-navi10-br.patch
patches.suse/0002-Revert-drm-amd-display-navi10-bring-up-skip-dsc-enco.patch
patches.suse/0003-Revert-drm-amd-display-add-global-master-update-lock.patch
+ patches.suse/0004-Revert-drm-amd-display-Fix-underscan-not-using-prope.patch
patches.suse/powerpc-pseries-Fix-cpu_hotplug_lock-acquisition-in-.patch
patches.suse/powerpc-powernv-ioda-Fix-race-in-TCE-level-allocatio.patch
patches.suse/powerpc-xmon-Check-for-HV-mode-when-dumping-XIVE-inf.patch