From: Greg Kroah-Hartman Date: Tue, 19 Apr 2022 07:29:54 +0000 (+0200) Subject: fix up queue-5.15/drm-amd-display-add-pstate-verification-and-recovery-for-dcn31... X-Git-Tag: v4.9.311~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fac4f9d4c9d7af6f97d50a90d1b501fe8e3fb70d;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-5.15/drm-amd-display-add-pstate-verification-and-recovery-for-dcn31.patch --- diff --git a/queue-5.15/drm-amd-display-add-pstate-verification-and-recovery-for-dcn31.patch b/queue-5.15/drm-amd-display-add-pstate-verification-and-recovery-for-dcn31.patch index 1f3e88343ab..eaffe01d13f 100644 --- a/queue-5.15/drm-amd-display-add-pstate-verification-and-recovery-for-dcn31.patch +++ b/queue-5.15/drm-amd-display-add-pstate-verification-and-recovery-for-dcn31.patch @@ -27,10 +27,10 @@ Signed-off-by: Greg Kroah-Hartman drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 10 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 1 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c | 1 - drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 60 ++++++++++++++ + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 61 ++++++++++++++ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 2 drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 - 7 files changed, 73 insertions(+), 4 deletions(-) + 7 files changed, 74 insertions(+), 4 deletions(-) --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c @@ -92,7 +92,15 @@ Signed-off-by: Greg Kroah-Hartman .hubbub_read_state = hubbub2_read_state, --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c -@@ -949,6 +949,65 @@ static void hubbub31_get_dchub_ref_freq( +@@ -24,6 +24,7 @@ + */ + + ++#include + #include "dcn30/dcn30_hubbub.h" + #include "dcn31_hubbub.h" + #include "dm_services.h" +@@ -949,6 +950,65 @@ static void hubbub31_get_dchub_ref_freq( } } @@ -158,7 +166,7 @@ Signed-off-by: Greg Kroah-Hartman static const struct hubbub_funcs hubbub31_funcs = { .update_dchub = hubbub2_update_dchub, .init_dchub_sys_ctx = hubbub31_init_dchub_sys_ctx, -@@ -961,6 +1020,7 @@ static const struct hubbub_funcs hubbub3 +@@ -961,6 +1021,7 @@ static const struct hubbub_funcs hubbub3 .program_watermarks = hubbub31_program_watermarks, .allow_self_refresh_control = hubbub1_allow_self_refresh_control, .is_allow_self_refresh_enabled = hubbub1_is_allow_self_refresh_enabled, diff --git a/queue-5.15/drm-amd-display-fix-p-state-allow-debug-index-on-dcn31.patch b/queue-5.15/drm-amd-display-fix-p-state-allow-debug-index-on-dcn31.patch index 89f1328cd68..3ca01cb4d7d 100644 --- a/queue-5.15/drm-amd-display-fix-p-state-allow-debug-index-on-dcn31.patch +++ b/queue-5.15/drm-amd-display-fix-p-state-allow-debug-index-on-dcn31.patch @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c -@@ -1042,5 +1042,7 @@ void hubbub31_construct(struct dcn20_hub +@@ -1043,5 +1043,7 @@ void hubbub31_construct(struct dcn20_hub hubbub31->detile_buf_size = det_size_kb * 1024; hubbub31->pixel_chunk_size = pixel_chunk_size_kb * 1024; hubbub31->crb_size_segs = config_return_buffer_size_kb / DCN31_CRB_SEGMENT_SIZE_KB;