DC: Fix page flip timeouts on DCE 6
Subsystems (3)
cover DC: Fix page flip timeouts on DCE 6
Currently when using DC on DCE 6, it produces a page flip timeout after a suspend/resume.
After some investigation, it turns out that the issue is because DC uses different interrupts between DCE 6 and newer HW versions, and it assumes that the VUPDATE interrupt is always present, when in fact it's not. It also assumes that the HW is capable of VRR when a VRR capable monitor is plugged in, when in fact this is not the case.
This series marks VRR as unsupported on DCE 6 even when a VRR capable monitor is plugged in. Furthermore, it fixes the code trying to access the unregistered VUPDATE interrupt.
As a side note, I also attempted to actually use the same interrupts as newer DCE versions, but this didn't work. Apparently DCE 6 was not advertised with VRR support anyway.
Finally, there is also a patch to disable fast boot mode on DCE 6. The rationale is that this already didn't work on DCE 8, and even if it did I have no means to test it.
Timur Kristóf (3):
drm/amd/display: Disable fastboot on DCE 6 too. drm/amd/display: Disable VRR on DCE 6 drm/amd/display: Don't use non-registered VUPDATE on DCE 6
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 26 ++++++++++++------- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 +++++++----- drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 ++++ drivers/gpu/drm/amd/display/dc/dm_services.h | 2 ++ .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 6 ++--- 5 files changed, 35 insertions(+), 20 deletions(-)
Signature · 1 line
2.50.1
PATCH 1/3 drm/amd/display: Disable fastboot on DCE 6 too.
It already didn't work on DCE 8,
so there is no reason to assume it would on DCE 6.
--- drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2 -4
@@ -1923,10 +1923,8 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)get_edp_streams (context, edp_streams, &edp_stream_num); -// Check fastboot support, disable on DCE8 because of blank screens -if (edp_num && edp_stream_num && dc->ctx->dce_version !=DCE_VERSION_8_0 && - dc->ctx->dce_version !=DCE_VERSION_8_1 && - dc->ctx->dce_version !=DCE_VERSION_8_3 ) { +/* Check fastboot support, disable on DCE 6-8 because of blank screens */ +if (edp_num && edp_stream_num && dc->ctx->dce_version <DCE_VERSION_10_0 ) {for (i =0 ; i < edp_num; i++) { edp_link = edp_links[i];if (edp_link != edp_streams[0 ]->link)
Signature · 1 line
2.50.1
Re: [PATCH 1/3] drm/amd/display: Disable fastboot on DCE 6 too.
Quoted 28 lines · Timur Kristóf
It already didn't work on DCE 8,
so there is no reason to assume it would on DCE 6.Signed-off-by Timur Kristóf <[email protected]>--- drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2
-4@@ -1923,10 +1923,8 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)get_edp_streams (context, edp_streams, &edp_stream_num); -// Check fastboot support, disable on DCE8 because of blank screens -if (edp_num && edp_stream_num && dc->ctx->dce_version !=DCE_VERSION_8_0 && - dc->ctx->dce_version !=DCE_VERSION_8_1 && - dc->ctx->dce_version !=DCE_VERSION_8_3 ) { +/* Check fastboot support, disable on DCE 6-8 because of blank screens */ +if (edp_num && edp_stream_num && dc->ctx->dce_version <DCE_VERSION_10_0 ) {for (i =0 ; i < edp_num; i++) { edp_link = edp_links[i];if (edp_link != edp_streams[0 ]->link)Signature · 1 line
2.50.1
As usual, CCed other display folks.
Thanks
Signature · 1 line
Rodrigo Siqueira
PATCH 2/3 drm/amd/display: Disable VRR on DCE 6
In reply to Timur KristófDCE 6 was not advertised as being able to support VRR, so let's mark it as unsupported for now.
The VRR implementation in amdgpu_dm depends on the VUPDATE interrupt which is not registered for DCE 6.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +++- drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 +++++ drivers/gpu/drm/amd/display/dc/dm_services.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -1
@@ -10689,6 +10689,8 @@ static void get_freesync_config_for_crtc( }else { config.state =VRR_STATE_INACTIVE ; } + }else { + config.state =VRR_STATE_UNSUPPORTED ; } out: new_crtc_state->freesync_config = config;
@@ -12590,7 +12592,7 @@ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, dm_con_state =to_dm_connector_state (connector->state); -if (!adev->dm.freesync_module) +if (!adev->dm.freesync_module || !dc_supports_vrr (sink->ctx->dce_version)) goto update; edid =drm_edid_raw (drm_edid);// FIXME: Get rid of drm_edid_raw()
drivers/gpu/drm/amd/display/dc/dc_helper.c +5 -0
@@ -755,3 +755,8 @@ char *dce_version_to_string(const int version)return "Unknown" ; } } + +bool dc_supports_vrr (const enum dce_version v) +{ +return v >=DCE_VERSION_8_0 ; +}
drivers/gpu/drm/amd/display/dc/dm_services.h +2 -0
@@ -311,4 +311,6 @@ void dm_dtn_log_end(struct dc_context *ctx,char *dce_version_to_string (const int version); +bool dc_supports_vrr (const enum dce_version v); +#endif /* __DM_SERVICES_H__ */
Signature · 1 line
2.50.1
Re: [PATCH 2/3] drm/amd/display: Disable VRR on DCE 6
Quoted 62 lines · Timur Kristóf
DCE 6 was not advertised as being able to support VRR, so let's mark it as unsupported for now.
The VRR implementation in
amdgpu_dmdepends on the VUPDATE interrupt which is not registered for DCE 6.Signed-off-by Timur Kristóf <[email protected]>--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +++- drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 +++++ drivers/gpu/drm/amd/display/dc/dm_services.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3
-1@@ -10689,6 +10689,8 @@ static void get_freesync_config_for_crtc( }else { config.state =VRR_STATE_INACTIVE ; } + }else { + config.state =VRR_STATE_UNSUPPORTED ; } out: new_crtc_state->freesync_config = config;@@ -12590,7 +12592,7 @@ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, dm_con_state =to_dm_connector_state (connector->state); -if (!adev->dm.freesync_module) +if (!adev->dm.freesync_module || !dc_supports_vrr (sink->ctx->dce_version)) goto update; edid =drm_edid_raw (drm_edid);// FIXME: Get rid of drm_edid_raw() drivers/gpu/drm/amd/display/dc/dc_helper.c +5
-0@@ -755,3 +755,8 @@ char *dce_version_to_string(const int version)return "Unknown" ; } } + +bool dc_supports_vrr (const enum dce_version v) +{ +return v >=DCE_VERSION_8_0 ; +}drivers/gpu/drm/amd/display/dc/dm_services.h +2
-0@@ -311,4 +311,6 @@ void dm_dtn_log_end(struct dc_context *ctx,char *dce_version_to_string (const int version); +bool dc_supports_vrr (const enum dce_version v); +#endif /* __DM_SERVICES_H__ */ Signature · 1 line
2.50.1
This change also lgtm,
CCed other display folks.
Thanks
Signature · 1 line
Rodrigo Siqueira
Rodrigo Siqueira
reviewerRe: [PATCH 2/3] drm/amd/display: Disable VRR on DCE 6
In reply to Timur KristófQuoted 18 lines · Timur Kristóf
DCE 6 was not advertised as being able to support VRR, so let's mark it as unsupported for now.
The VRR implementation in
amdgpu_dmdepends on the VUPDATE interrupt which is not registered for DCE 6.Signed-off-by Timur Kristóf <[email protected]>--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +++- drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 +++++ drivers/gpu/drm/amd/display/dc/dm_services.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void get_freesync_config_for_crtc( · line 10693
Quoted 5 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-0@@ -10689,6 +10689,8 @@ static void get_freesync_config_for_crtc( }else { config.state =VRR_STATE_INACTIVE ; } + }else { + config.state =VRR_STATE_UNSUPPORTED ;
Just one tiny comment:
How about setting this value before the conditional "if" and removing this "else" part?
Thanks
Quoted 39 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-1} out: new_crtc_state->freesync_config = config;@@ -12590,7 +12592,7 @@ void amdgpu_dm_update_freesync_caps(struct drm_connector *connector, dm_con_state =to_dm_connector_state (connector->state); -if (!adev->dm.freesync_module) +if (!adev->dm.freesync_module || !dc_supports_vrr (sink->ctx->dce_version)) goto update; edid =drm_edid_raw (drm_edid);// FIXME: Get rid of drm_edid_raw() drivers/gpu/drm/amd/display/dc/dc_helper.c +5
-0@@ -755,3 +755,8 @@ char *dce_version_to_string(const int version)return "Unknown" ; } } + +bool dc_supports_vrr (const enum dce_version v) +{ +return v >=DCE_VERSION_8_0 ; +}drivers/gpu/drm/amd/display/dc/dm_services.h +2
-0@@ -311,4 +311,6 @@ void dm_dtn_log_end(struct dc_context *ctx,char *dce_version_to_string (const int version); +bool dc_supports_vrr (const enum dce_version v); +#endif /* __DM_SERVICES_H__ */ Signature · 1 line
2.50.1
Signature · 1 line
Rodrigo Siqueira
PATCH 3/3 drm/amd/display: Don't use non-registered VUPDATE on DCE 6
In reply to Timur KristófThe VUPDATE interrupt isn't registered on DCE 6, so don't try to use that.
This fixes a page flip timeout after sleep/resume on DCE 6.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ++++++++++++------- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 ++++++++------ 2 files changed, 23 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +14 -8
@@ -2981,14 +2981,20 @@ static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev,drm_warn (adev_to_drm (adev),"Failed to %s pflip interrupts\n" , enable ?"enable" :"disable" ); -if (enable) { -if (amdgpu_dm_crtc_vrr_active (to_dm_crtc_state (acrtc->base.state))) - rc =amdgpu_dm_crtc_set_vupdate_irq (&acrtc->base, true); - }else - rc =amdgpu_dm_crtc_set_vupdate_irq (&acrtc->base, false); - -if (rc) -drm_warn (adev_to_drm (adev),"Failed to %sable vupdate interrupt\n" , enable ?"en" :"dis" ); +if (dc_supports_vrr (adev->dm.dc->ctx->dce_version)) { +if (enable) { +if (amdgpu_dm_crtc_vrr_active ( +to_dm_crtc_state (acrtc->base.state))) + rc =amdgpu_dm_crtc_set_vupdate_irq ( + &acrtc->base, true); + }else + rc =amdgpu_dm_crtc_set_vupdate_irq ( + &acrtc->base, false); + +if (rc) +drm_warn (adev_to_drm (adev),"Failed to %sable vupdate interrupt\n" , + enable ?"en" :"dis" ); + } irq_source =IRQ_TYPE_VBLANK + acrtc->otg_inst;/* During gpu-reset we disable and then enable vblank irq, so
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +9 -7
@@ -298,13 +298,15 @@ static inline int amdgpu_dm_crtc_set_vblank(struct drm_crtc *crtc, bool enable) irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, acrtc->crtc_id); -if (enable) { -/* vblank irq on -> Only need vupdate irq in vrr mode */ -if (amdgpu_dm_crtc_vrr_active (acrtc_state)) - rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, true); - }else { -/* vblank irq off -> vupdate irq off */ - rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, false); +if (dc_supports_vrr (dm->dc->ctx->dce_version)) { +if (enable) { +/* vblank irq on -> Only need vupdate irq in vrr mode */ +if (amdgpu_dm_crtc_vrr_active (acrtc_state)) + rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, true); + }else { +/* vblank irq off -> vupdate irq off */ + rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, false); + } }if (rc)
Signature · 1 line
2.50.1
Re: [PATCH 3/3] drm/amd/display: Don't use non-registered VUPDATE on DCE 6
Quoted 74 lines · Timur Kristóf
The VUPDATE interrupt isn't registered on DCE 6, so don't try to use that.
This fixes a page flip timeout after sleep/resume on DCE 6.
Signed-off-by Timur Kristóf <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ++++++++++++------- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 ++++++++------ 2 files changed, 23 insertions(+), 15 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +14
-8@@ -2981,14 +2981,20 @@ static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev,drm_warn (adev_to_drm (adev),"Failed to %s pflip interrupts\n" , enable ?"enable" :"disable" ); -if (enable) { -if (amdgpu_dm_crtc_vrr_active (to_dm_crtc_state (acrtc->base.state))) - rc =amdgpu_dm_crtc_set_vupdate_irq (&acrtc->base, true); - }else - rc =amdgpu_dm_crtc_set_vupdate_irq (&acrtc->base, false); - -if (rc) -drm_warn (adev_to_drm (adev),"Failed to %sable vupdate interrupt\n" , enable ?"en" :"dis" ); +if (dc_supports_vrr (adev->dm.dc->ctx->dce_version)) { +if (enable) { +if (amdgpu_dm_crtc_vrr_active ( +to_dm_crtc_state (acrtc->base.state))) + rc =amdgpu_dm_crtc_set_vupdate_irq ( + &acrtc->base, true); + }else + rc =amdgpu_dm_crtc_set_vupdate_irq ( + &acrtc->base, false); + +if (rc) +drm_warn (adev_to_drm (adev),"Failed to %sable vupdate interrupt\n" , + enable ?"en" :"dis" ); + } irq_source =IRQ_TYPE_VBLANK + acrtc->otg_inst;/* During gpu-reset we disable and then enable vblank irq, so drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +9
-7@@ -298,13 +298,15 @@ static inline int amdgpu_dm_crtc_set_vblank(struct drm_crtc *crtc, bool enable) irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, acrtc->crtc_id); -if (enable) { -/* vblank irq on -> Only need vupdate irq in vrr mode */ -if (amdgpu_dm_crtc_vrr_active (acrtc_state)) - rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, true); - }else { -/* vblank irq off -> vupdate irq off */ - rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, false); +if (dc_supports_vrr (dm->dc->ctx->dce_version)) { +if (enable) { +/* vblank irq on -> Only need vupdate irq in vrr mode */ +if (amdgpu_dm_crtc_vrr_active (acrtc_state)) + rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, true); + }else { +/* vblank irq off -> vupdate irq off */ + rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, false); + } }if (rc)Signature · 1 line
2.50.1
Signature · 1 line
Rodrigo Siqueira
Re: [PATCH 3/3] drm/amd/display: Don't use non-registered VUPDATE on DCE 6
In reply to Timur KristófQuoted 31 lines · Timur Kristóf
The VUPDATE interrupt isn't registered on DCE 6, so don't try to use that.
This fixes a page flip timeout after sleep/resume on DCE 6.
Signed-off-by Timur Kristóf <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ++++++++++++------- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 ++++++++------ 2 files changed, 23 insertions(+), 15 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-8@@ -2981,14 +2981,20 @@ static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev,drm_warn (adev_to_drm (adev),"Failed to %s pflip interrupts\n" , enable ?"enable" :"disable" ); -if (enable) { -if (amdgpu_dm_crtc_vrr_active (to_dm_crtc_state (acrtc->base.state))) - rc =amdgpu_dm_crtc_set_vupdate_irq (&acrtc->base, true); - }else - rc =amdgpu_dm_crtc_set_vupdate_irq (&acrtc->base, false); - -if (rc) -drm_warn (adev_to_drm (adev),"Failed to %sable vupdate interrupt\n" , enable ?"en" :"dis" ); +if (dc_supports_vrr (adev->dm.dc->ctx->dce_version)) { +if (enable) { +if (amdgpu_dm_crtc_vrr_active ( +to_dm_crtc_state (acrtc->base.state)))
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev, · line 2997
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-0+ rc =amdgpu_dm_crtc_set_vupdate_irq ( + &acrtc->base, true); + }else + rc =amdgpu_dm_crtc_set_vupdate_irq ( + &acrtc->base, false); + +if (rc) +drm_warn (adev_to_drm (adev),"Failed to %sable vupdate interrupt\n" , + enable ?"en" :"dis" ); + }
Hi Timur,
There seem to be conflicts to amd-staging-drm-next. Could you please rebase and resend? This helps make sure new change fix the problem you observed.
Really appreciate it. Thanks.
Quoted 30 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0irq_source =IRQ_TYPE_VBLANK + acrtc->otg_inst;/* During gpu-reset we disable and then enable vblank irq, so drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +9
-7@@ -298,13 +298,15 @@ static inline int amdgpu_dm_crtc_set_vblank(struct drm_crtc *crtc, bool enable) irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, acrtc->crtc_id); -if (enable) { -/* vblank irq on -> Only need vupdate irq in vrr mode */ -if (amdgpu_dm_crtc_vrr_active (acrtc_state)) - rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, true); - }else { -/* vblank irq off -> vupdate irq off */ - rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, false); +if (dc_supports_vrr (dm->dc->ctx->dce_version)) { +if (enable) { +/* vblank irq on -> Only need vupdate irq in vrr mode */ +if (amdgpu_dm_crtc_vrr_active (acrtc_state)) + rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, true); + }else { +/* vblank irq off -> vupdate irq off */ + rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, false); + } }if (rc)
Re: [PATCH 3/3] drm/amd/display: Don't use non-registered VUPDATE on DCE 6
Quoted 48 lines · Alex Hung
Quoted 31 lines · Timur Kristóf
The VUPDATE interrupt isn't registered on DCE 6, so don't try to use that.
This fixes a page flip timeout after sleep/resume on DCE 6.
Signed-off-by Timur Kristóf <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ++++++++++++------- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 ++++++++------ 2 files changed, 23 insertions(+), 15 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-8@@ -2981,14 +2981,20 @@ static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev,drm_warn (adev_to_drm (adev),"Failed to %s pflip interrupts\n" , enable ?"enable" :"disable" ); -if (enable) { -if (amdgpu_dm_crtc_vrr_active (to_dm_crtc_state (acrtc->base.state))) - rc =amdgpu_dm_crtc_set_vupdate_irq (&acrtc->base, true); - }else - rc =amdgpu_dm_crtc_set_vupdate_irq (&acrtc->base, false); - -if (rc) -drm_warn (adev_to_drm (adev),"Failed to %sable vupdate interrupt\n" , enable ?"en" :"dis" ); +if (dc_supports_vrr (adev->dm.dc->ctx->dce_version)) { +if (enable) { +if (amdgpu_dm_crtc_vrr_active ( +to_dm_crtc_state (acrtc->base.state)))drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev, · line 2997
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-0+ rc =amdgpu_dm_crtc_set_vupdate_irq ( + &acrtc->base, true); + }else + rc =amdgpu_dm_crtc_set_vupdate_irq ( + &acrtc->base, false); + +if (rc) +drm_warn (adev_to_drm (adev),"Failed to %sable vupdate interrupt\n" , + enable ?"en" :"dis" ); + }Hi Timur,
Quoted 5 lines
There seem to be conflicts to amd-staging-drm-next. Could you please rebase and resend? This helps make sure new change fix the problem you observed.
Really appreciate it. Thanks.
If it's just the first patch, you can skip that one as the conflict solves the issue with DSC.
Alex
Quoted 32 lines
Quoted 31 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0irq_source =IRQ_TYPE_VBLANK + acrtc->otg_inst;/* During gpu-reset we disable and then enable vblank irq, so drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +9
-7@@ -298,13 +298,15 @@ static inline int amdgpu_dm_crtc_set_vblank(struct drm_crtc *crtc, bool enable) irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, acrtc->crtc_id); -if (enable) { -/* vblank irq on -> Only need vupdate irq in vrr mode */ -if (amdgpu_dm_crtc_vrr_active (acrtc_state)) - rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, true); - }else { -/* vblank irq off -> vupdate irq off */ - rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, false); +if (dc_supports_vrr (dm->dc->ctx->dce_version)) { +if (enable) { +/* vblank irq on -> Only need vupdate irq in vrr mode */ +if (amdgpu_dm_crtc_vrr_active (acrtc_state)) + rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, true); + }else { +/* vblank irq off -> vupdate irq off */ + rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, false); + } }if (rc)
Re: [PATCH 3/3] drm/amd/display: Don't use non-registered VUPDATE on DCE 6
Alex Deucher <[email protected]> ezt írta (időpont: 2025. aug. 18., Hét 22:30):
Quoted 68 lines · Alex Hung
Quoted 12 lines · Timur Kristóf
Quoted 8 lines
The VUPDATE interrupt isn't registered on DCE 6, so don't try to use that.
This fixes a page flip timeout after sleep/resume on DCE 6.
Signed-off-by Timur Kristóf <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22++++++++++++-------
Quoted 4 lines
Review
Quoted 4 lines
.../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 ++++++++------ 2 files changed, 23 insertions(+), 15 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.cQuoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void
Quoted 4 lines
index
470f831a17f7..e8d2ba58cbfa100644drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0@@ -2981,14 +2981,20 @@ static voiddm_gpureset_toggle_interrupts(struct
amdgpu_device*adev,Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void · line 2981
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0drm_warn(adev_to_drm(adev), "Failed to%s pflip interrupts\n",
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev,
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-2enable ? "enable" : "disable"); -if (enable) { - if(amdgpu_dm_crtc_vrr_active(to_dm_crtc_state(acrtc->base.state)))
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void · line 2986
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-1- rc =
amdgpu_dm_crtc_set_vupdate_irq(&acrtc->base, true);Quoted 2 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void · line 2988
Quoted 2 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-2- }else - rc =
amdgpu_dm_crtc_set_vupdate_irq(&acrtc->base, false);Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev,
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-3- -if (rc) - drm_warn(adev_to_drm(adev), "Failed to%sable vupdate interrupt\n", enable ? "en" : "dis");
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void · line 2984
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+ if(
dc_supports_vrr(adev->dm.dc->ctx->dce_version)) {Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev, · line 2993
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3
-0+if (enable) { + if (amdgpu_dm_crtc_vrr_active( +
to_dm_crtc_state(acrtc->base.state)))Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void · line 2988
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+ rc =amdgpu_dm_crtc_set_vupdate_irq(
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void · line 2989
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+ &acrtc->base,true);
Quoted 2 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void · line 2991
Quoted 2 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-0+ }else + rc =amdgpu_dm_crtc_set_vupdate_irq(
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void · line 2992
Quoted 1 line
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-0+ &acrtc->base,false);
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev,
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3
-0+ +if (rc) + drm_warn(adev_to_drm(adev),"Failed to %sable vupdate interrupt\n",
Quoted 9 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev, · line 2997
Quoted 2 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2
-0+ enable ? "en" : "dis"); + }Hi Timur,
There seem to be conflicts to amd-staging-drm-next. Could you please rebase and resend? This helps make sure new change fix the problem you observed.
Quoted 7 lines
Quoted 1 line
Really appreciate it. Thanks.
If it's just the first patch, you can skip that one as the conflict solves the issue with DSC.
Alex
Hi Alex,
This is a different series, not the same one that had the patch for the DSC crash. I can send a rebased version tomorrow.
Additionally, I have one more patch that solves another case of page flip timeout on DCE 6, I will add that to the next version of the series too if that's okay.
Thanks,
Timur
Quoted 39 lines
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void · line 2999
Quoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0irq_source =IRQ_TYPE_VBLANK + acrtc->otg_inst;/* During gpu-reset we disable and then enable vblank irq, so
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.cQuoted 4 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c static inline int
Quoted 4 lines
index
2551823382f8..f2208e4224f9100644drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +0
-0@@ -298,13 +298,15 @@ static inline int
amdgpu_dm_crtc_set_vblank(struct drm_crtc *crtc, bool enable)Quoted 2 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c static inline int · line 298
Quoted 2 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +0
-0irq_type = amdgpu_display_crtc_idx_to_irq_type(adev,
acrtc->crtc_id);Quoted 11 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c static inline int amdgpu_dm_crtc_set_vblank(struct drm_crtc *crtc, bool enable)
Quoted 11 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +3
-7-if (enable) { -/* vblank irq on -> Only need vupdate irq in vrr mode */ -if (amdgpu_dm_crtc_vrr_active (acrtc_state)) - rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, true); - }else { -/* vblank irq off -> vupdate irq off */ - rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, false); +if (dc_supports_vrr (dm->dc->ctx->dce_version)) { +if (enable) { +/* vblank irq on -> Only need vupdate irq in vrr mode */
Quoted 2 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c static inline int · line 303
Quoted 2 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +2
-0+if (amdgpu_dm_crtc_vrr_active (acrtc_state)) + rc =
amdgpu_dm_crtc_set_vupdate_irq(crtc, true);Quoted 8 lines
Quoted 7 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +4
-0+ }else { +/* vblank irq off -> vupdate irq off */ + rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, false); + } }if (rc)
Re: [PATCH 3/3] drm/amd/display: Don't use non-registered VUPDATE on DCE 6
Quoted 62 lines · Timur Kristóf
Alex Deucher <[email protected]> ezt írta (időpont: 2025. aug. 18., Hét 22:30):
Quoted 59 lines · Alex Hung
Quoted 48 lines · Timur Kristóf
Quoted 31 lines
The VUPDATE interrupt isn't registered on DCE 6, so don't try to use that.
This fixes a page flip timeout after sleep/resume on DCE 6.
Signed-off-by Timur Kristóf <[email protected]>--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ++++++++++++------- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 ++++++++------ 2 files changed, 23 insertions(+), 15 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4
-8@@ -2981,14 +2981,20 @@ static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev,drm_warn (adev_to_drm (adev),"Failed to %s pflip interrupts\n" , enable ?"enable" :"disable" ); -if (enable) { -if (amdgpu_dm_crtc_vrr_active (to_dm_crtc_state (acrtc->base.state))) - rc =amdgpu_dm_crtc_set_vupdate_irq (&acrtc->base, true); - }else - rc =amdgpu_dm_crtc_set_vupdate_irq (&acrtc->base, false); - -if (rc) -drm_warn (adev_to_drm (adev),"Failed to %sable vupdate interrupt\n" , enable ?"en" :"dis" ); +if (dc_supports_vrr (adev->dm.dc->ctx->dce_version)) { +if (enable) { +if (amdgpu_dm_crtc_vrr_active ( +to_dm_crtc_state (acrtc->base.state)))drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev, · line 2997
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-0+ rc =amdgpu_dm_crtc_set_vupdate_irq ( + &acrtc->base, true); + }else + rc =amdgpu_dm_crtc_set_vupdate_irq ( + &acrtc->base, false); + +if (rc) +drm_warn (adev_to_drm (adev),"Failed to %sable vupdate interrupt\n" , + enable ?"en" :"dis" ); + }Hi Timur,
Quoted 5 lines
There seem to be conflicts to amd-staging-drm-next. Could you please rebase and resend? This helps make sure new change fix the problem you observed.
Really appreciate it. Thanks.
If it's just the first patch, you can skip that one as the conflict solves the issue with DSC.
Quoted 8 lines
Quoted 1 line
Alex
Hi Alex,
This is a different series, not the same one that had the patch for the DSC crash. I can send a rebased version tomorrow.
Additionally, I have one more patch that solves another case of page flip timeout on DCE 6, I will add that to the next version of the series too if that's okay.
Sure. Sorry for the confusion.
Alex
Quoted 38 lines
Thanks,
TimurQuoted 33 lines
Quoted 33 lines
Quoted 32 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0irq_source =IRQ_TYPE_VBLANK + acrtc->otg_inst;/* During gpu-reset we disable and then enable vblank irq, so drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +9
-7@@ -298,13 +298,15 @@ static inline int amdgpu_dm_crtc_set_vblank(struct drm_crtc *crtc, bool enable) irq_type =amdgpu_display_crtc_idx_to_irq_type (adev, acrtc->crtc_id); -if (enable) { -/* vblank irq on -> Only need vupdate irq in vrr mode */ -if (amdgpu_dm_crtc_vrr_active (acrtc_state)) - rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, true); - }else { -/* vblank irq off -> vupdate irq off */ - rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, false); +if (dc_supports_vrr (dm->dc->ctx->dce_version)) { +if (enable) { +/* vblank irq on -> Only need vupdate irq in vrr mode */ +if (amdgpu_dm_crtc_vrr_active (acrtc_state)) + rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, true); + }else { +/* vblank irq off -> vupdate irq off */ + rc =amdgpu_dm_crtc_set_vupdate_irq (crtc, false); + } }if (rc)
Re: [PATCH 3/3] drm/amd/display: Don't use non-registered VUPDATE on DCE 6
In reply to Timur KristófQuoted 85 lines · Timur Kristóf
Alex Deucher <[email protected] <mailto:[email protected]>> ezt írta (időpont: 2025. aug. 18., Hét 22:30):
On Mon, Aug 18, 2025 at 4:11 PM Alex Hung <[email protected] <mailto:[email protected]>> wrote: > > > > On 8/2/25 10:06, Timur Kristóf wrote: > > The VUPDATE interrupt isn't registered on DCE 6, so don't try > > to use that. > > > > This fixes a page flip timeout after sleep/resume on DCE 6. > > > > Signed-off-by: Timur Kristóf <[email protected] <mailto:[email protected]>> > > --- > > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ++++++++++ ++------- > > .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 ++++++++------ > > 2 files changed, 23 insertions(+), 15 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > index 470f831a17f7..e8d2ba58cbfa 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > @@ -2981,14 +2981,20 @@ static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev, > > drm_warn(adev_to_drm(adev), "Failed to %s pflip interrupts\n", > > enable ? "enable" : "disable"); > > > > - if (enable) { > > - if (amdgpu_dm_crtc_vrr_active(to_dm_crtc_state(acrtc->base.state))) > > - rc = amdgpu_dm_crtc_set_vupdate_irq(&acrtc->base, true); > > - } else > > - rc = amdgpu_dm_crtc_set_vupdate_irq(&acrtc->base, false); > > - > > - if (rc) > > - drm_warn(adev_to_drm(adev), "Failed to %sable vupdate interrupt\n", enable ? "en" : "dis"); > > + if (dc_supports_vrr(adev->dm.dc->ctx- >dce_version)) { > > + if (enable) { > > + if (amdgpu_dm_crtc_vrr_active( > > + to_dm_crtc_state(acrtc->base.state))) > > + rc = amdgpu_dm_crtc_set_vupdate_irq( > > + &acrtc- >base, true); > > + } else > > + rc = amdgpu_dm_crtc_set_vupdate_irq( > > + &acrtc- >base, false); > > + > > + if (rc) > > + drm_warn(adev_to_drm(adev), "Failed to %sable vupdate interrupt\n", > > + enable ? "en" : "dis"); > > + } > > Hi Timur, > > There seem to be conflicts to amd-staging-drm-next. Could you please > rebase and resend? This helps make sure new change fix the problem you > observed. > > Really appreciate it. Thanks. If it's just the first patch, you can skip that one as the conflict solves the issue with DSC. Alex
Quoted 8 lines
Hi Alex,
This is a different series, not the same one that had the patch for the DSC crash. I can send a rebased version tomorrow.
Additionally, I have one more patch that solves another case of page flip timeout on DCE 6, I will add that to the next version of the series too if that's okay.
Thanks,
Timur
Sounds good and thanks.
I will send new revision to next promotion test too.
Alex H.
Quoted 47 lines
>
> >
> > irq_source = IRQ_TYPE_VBLANK + acrtc-
>otg_inst;
> > /* During gpu-reset we disable and then
enable vblank irq, so
> > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/
amdgpu_dm_crtc.c b/drivers/gpu/drm/amd/display/amdgpu_dm/
amdgpu_dm_crtc.c
> > index 2551823382f8..f2208e4224f9 100644
> > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
> > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c
> > @@ -298,13 +298,15 @@ static inline int
amdgpu_dm_crtc_set_vblank(struct drm_crtc *crtc, bool enable)
> >
> > irq_type = amdgpu_display_crtc_idx_to_irq_type(adev,
acrtc->crtc_id);
> >
> > - if (enable) {
> > - /* vblank irq on -> Only need vupdate irq in vrr
mode */
> > - if (amdgpu_dm_crtc_vrr_active(acrtc_state))
> > - rc = amdgpu_dm_crtc_set_vupdate_irq(crtc,
true);
> > - } else {
> > - /* vblank irq off -> vupdate irq off */
> > - rc = amdgpu_dm_crtc_set_vupdate_irq(crtc, false);
> > + if (dc_supports_vrr(dm->dc->ctx->dce_version)) {
> > + if (enable) {
> > + /* vblank irq on -> Only need vupdate irq
in vrr mode */
> > + if (amdgpu_dm_crtc_vrr_active(acrtc_state))
> > + rc =
amdgpu_dm_crtc_set_vupdate_irq(crtc, true);
> > + } else {
> > + /* vblank irq off -> vupdate irq off */
> > + rc = amdgpu_dm_crtc_set_vupdate_irq(crtc,
false);
> > + }
> > }
> >
> > if (rc)
>Quoted 19 lines · Timur Kristóf
Currently when using DC on DCE 6, it produces a page flip timeout after a suspend/resume.
After some investigation, it turns out that the issue is because DC uses different interrupts between DCE 6 and newer HW versions, and it assumes that the VUPDATE interrupt is always present, when in fact it's not. It also assumes that the HW is capable of VRR when a VRR capable monitor is plugged in, when in fact this is not the case.
This series marks VRR as unsupported on DCE 6 even when a VRR capable monitor is plugged in. Furthermore, it fixes the code trying to access the unregistered VUPDATE interrupt.
As a side note, I also attempted to actually use the same interrupts as newer DCE versions, but this didn't work. Apparently DCE 6 was not advertised with VRR support anyway.
Quoted 8 lines
Finally, there is also a patch to disable fast boot mode on DCE 6. The rationale is that this already didn't work on DCE 8, and even if it did I have no means to test it.
Timur Kristóf (3):
drm/amd/display: Disable fastboot on DCE 6 too. drm/amd/display: Disable VRR on DCE 6 drm/amd/display: Don't use non-registered VUPDATE on DCE 6
Series looks good to me, but it would be good to get an ack from the display team as well. Series is:
Quoted 11 lines
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 26 ++++++++++++------- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 +++++++----- drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 ++++ drivers/gpu/drm/amd/display/dc/dm_services.h | 2 ++ .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 6 ++--- 5 files changed, 35 insertions(+), 20 deletions(-)--
2.50.1
The series is Reviewed-by: Alex Hung <[email protected]>
The patch series is also tested in promotion test and CI without regression.
Quoted 34 lines · Timur Kristóf
Currently when using DC on DCE 6, it produces a page flip timeout after a suspend/resume.
After some investigation, it turns out that the issue is because DC uses different interrupts between DCE 6 and newer HW versions, and it assumes that the VUPDATE interrupt is always present, when in fact it's not. It also assumes that the HW is capable of VRR when a VRR capable monitor is plugged in, when in fact this is not the case.
This series marks VRR as unsupported on DCE 6 even when a VRR capable monitor is plugged in. Furthermore, it fixes the code trying to access the unregistered VUPDATE interrupt.
As a side note, I also attempted to actually use the same interrupts as newer DCE versions, but this didn't work. Apparently DCE 6 was not advertised with VRR support anyway.
Finally, there is also a patch to disable fast boot mode on DCE 6. The rationale is that this already didn't work on DCE 8, and even if it did I have no means to test it.
Timur Kristóf (3):
drm/amd/display: Disable fastboot on DCE 6 too. drm/amd/display: Disable VRR on DCE 6 drm/amd/display: Don't use non-registered VUPDATE on DCE 6.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 26 ++++++++++++------- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 +++++++----- drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 ++++ drivers/gpu/drm/amd/display/dc/dm_services.h | 2 ++ .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 6 ++--- 5 files changed, 35 insertions(+), 20 deletions(-)
@Alex Hung
can you pick these up as well?
Thanks,
Alex
Quoted 41 lines · Alex Hung
The series is Reviewed-by: Alex Hung <[email protected]>
The patch series is also tested in promotion test and CI without regression.
Quoted 34 lines · Timur Kristóf
Currently when using DC on DCE 6, it produces a page flip timeout after a suspend/resume.
After some investigation, it turns out that the issue is because DC uses different interrupts between DCE 6 and newer HW versions, and it assumes that the VUPDATE interrupt is always present, when in fact it's not. It also assumes that the HW is capable of VRR when a VRR capable monitor is plugged in, when in fact this is not the case.
This series marks VRR as unsupported on DCE 6 even when a VRR capable monitor is plugged in. Furthermore, it fixes the code trying to access the unregistered VUPDATE interrupt.
As a side note, I also attempted to actually use the same interrupts as newer DCE versions, but this didn't work. Apparently DCE 6 was not advertised with VRR support anyway.
Finally, there is also a patch to disable fast boot mode on DCE 6. The rationale is that this already didn't work on DCE 8, and even if it did I have no means to test it.
Timur Kristóf (3):
drm/amd/display: Disable fastboot on DCE 6 too. drm/amd/display: Disable VRR on DCE 6 drm/amd/display: Don't use non-registered VUPDATE on DCE 6.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 26 ++++++++++++------- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 +++++++----- drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 ++++ drivers/gpu/drm/amd/display/dc/dm_services.h | 2 ++ .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 6 ++--- 5 files changed, 35 insertions(+), 20 deletions(-)
[AMD Official Use Only - AMD Internal Distribution Only]
Okay and will do
________________________________
From: amd-gfx <[email protected]> on behalf of Alex Deucher <[email protected]>
Sent: 18 August 2025 11:03
To: Hung, Alex <[email protected]>
Cc: Timur Kristóf <[email protected]>; [email protected] <[email protected]>
Subject: Re: [PATCH 0/3] DC: Fix page flip timeouts on DCE 6
@Alex Hung
can you pick these up as well?
Thanks,
Alex
Quoted 41 lines · Alex Hung
The series is Reviewed-by: Alex Hung <[email protected]>
The patch series is also tested in promotion test and CI without regression.
Quoted 34 lines · Timur Kristóf
Currently when using DC on DCE 6, it produces a page flip timeout after a suspend/resume.
After some investigation, it turns out that the issue is because DC uses different interrupts between DCE 6 and newer HW versions, and it assumes that the VUPDATE interrupt is always present, when in fact it's not. It also assumes that the HW is capable of VRR when a VRR capable monitor is plugged in, when in fact this is not the case.
This series marks VRR as unsupported on DCE 6 even when a VRR capable monitor is plugged in. Furthermore, it fixes the code trying to access the unregistered VUPDATE interrupt.
As a side note, I also attempted to actually use the same interrupts as newer DCE versions, but this didn't work. Apparently DCE 6 was not advertised with VRR support anyway.
Finally, there is also a patch to disable fast boot mode on DCE 6. The rationale is that this already didn't work on DCE 8, and even if it did I have no means to test it.
Timur Kristóf (3):
drm/amd/display: Disable fastboot on DCE 6 too. drm/amd/display: Disable VRR on DCE 6 drm/amd/display: Don't use non-registered VUPDATE on DCE 6.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 26 ++++++++++++------- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 16 +++++++----- drivers/gpu/drm/amd/display/dc/dc_helper.c | 5 ++++ drivers/gpu/drm/amd/display/dc/dm_services.h | 2 ++ .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 6 ++--- 5 files changed, 35 insertions(+), 20 deletions(-)