drm: introduce KMS recovery mechanism
Subsystems (4)
PATCH v2 1/2 drm: introduce KMS recovery mechanism
There should be a mechanism for drivers to respond to flip_done timeouts. Since, as it stands it is possible for the display to stall indefinitely, necessitating a hard reset. So, introduce a new mechanism that tries various methods of recovery with increasing aggression, in the following order:
1. Force a full modeset (have the compositor reprogram the state from scratch).
3. As a last resort, have the driver attempt a vendor specific reset (assuming it provides an implementation to drm_crtc_funcs.page_flip_timeout()).
---
v2: new to the series
--- drivers/gpu/drm/drm_atomic_helper.c | 36 ++++++++++++++++++++++++++--- include/drm/drm_crtc.h | 9 ++++++++ include/drm/drm_device.h | 24 +++++++++++++++++++ 3 files changed, 66 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +33 -3
@@ -42,6 +42,7 @@#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_panic.h> #include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> #include <drm/drm_self_refresh_helper.h> #include <drm/drm_vblank.h> #include <drm/drm_writeback.h>
@@ -1881,11 +1882,40 @@ void drm_atomic_helper_wait_for_flip_done(struct drm_device *dev,continue ; ret =wait_for_completion_timeout (&commit->flip_done,10 *HZ ); -if (ret ==0 ) -drm_err (dev,"[CRTC:%d:%s] flip_done timed out\n" , - crtc->base.id, crtc->name); +if (!ret) { +switch (dev->reset_phase) { +case DRM_KMS_RESET_NONE : +drm_err (dev,"[CRTC:%d:%s] flip_done timed out\n" , + crtc->base.id, crtc->name); + dev->reset_phase =DRM_KMS_RESET_FORCE_MODESET ; +drm_kms_helper_hotplug_event (dev); +break ; +case DRM_KMS_RESET_FORCE_MODESET : +drm_err (dev,"[CRTC:%d:%s] force full modeset failed\n" , + crtc->base.id, crtc->name); + dev->reset_phase =DRM_KMS_RESET_VENDOR ; +if (crtc->funcs->page_flip_timeout) + crtc->funcs->page_flip_timeout (crtc); +break ; +case DRM_KMS_RESET_VENDOR : +drm_err (dev,"[CRTC:%d:%s] KMS recovery failed!\n" , + crtc->base.id, crtc->name); + dev->reset_phase =DRM_KMS_RESET_GIVE_UP ; +break ; +default : +break ; + } + + goto exit; + } + } + +if (dev->reset_phase) { +drm_info (dev,"KMS recovery succeeded!\n" ); + dev->reset_phase =DRM_KMS_RESET_NONE ; } +exit:if (state->fake_commit)complete_all (&state->fake_commit->flip_done); }
include/drm/drm_crtc.h +9 -0
@@ -609,6 +609,15 @@ struct drm_crtc_funcs { uint32_t flags, uint32_t target, struct drm_modeset_acquire_ctx *ctx); +/** +* @page_flip_timeout: +* +* This optional hook is called if &drm_crtc_commit.flip_done times out, +* and can be used by drivers to attempt to recover from a page flip +* timeout. +*/ +void (*page_flip_timeout)(struct drm_crtc *crtc); +/** * @set_property: *
include/drm/drm_device.h +24 -0
@@ -66,6 +66,23 @@ enum switch_power_state { DRM_SWITCH_POWER_DYNAMIC_OFF = 3, }; +/** +* enum drm_kms_reset_phase - reset phase of drm device +*/ +enum drm_kms_reset_phase { +/** @DRM_KMS_RESET_NONE: Not currently attempting recovery */ +DRM_KMS_RESET_NONE , + +/** @DRM_KMS_RESET_FORCE_MODESET: Force a full modeset */ +DRM_KMS_RESET_FORCE_MODESET , + +/** @DRM_KMS_RESET_VENDOR: Attempt a vendor reset */ +DRM_KMS_RESET_VENDOR , + +/** @DRM_KMS_RESET_GIVE_UP: All recovery methods failed */ +DRM_KMS_RESET_GIVE_UP , +}; +/** * struct drm_device - DRM device structure *
@@ -375,6 +392,13 @@ struct drm_device {* Root directory for debugfs files. */ struct dentry *debugfs_root; + +/** +* @reset_phase: +* +* Reset phase that the device is in. +*/ +enum drm_kms_reset_phase reset_phase; };void drm_dev_set_dma_dev (struct drm_device *dev,struct device *dma_dev);
Signature · 1 line
2.52.0
PATCH v2 2/2 drm/amdgpu: implement page_flip_timeout() support
We now have a means to respond to page flip timeouts. So, hook up support for the new page_flip_timeout() callback.
---
v2: send a wedged event instead of attempting a GPU reset.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +8 -0
@@ -23,6 +23,7 @@* Authors: AMD * */ +#include <drm/drm_drv.h> #include <drm/drm_vblank.h> #include <drm/drm_atomic_helper.h>
@@ -578,12 +579,19 @@ amdgpu_dm_atomic_crtc_get_property(struct drm_crtc *crtc, }#endif +static void amdgpu_dm_crtc_handle_timeout (struct drm_crtc *crtc) +{ +drm_dev_wedged_event (crtc->dev,DRM_WEDGE_RECOVERY_REBIND | +DRM_WEDGE_RECOVERY_BUS_RESET ,NULL ); +} +/* Implemented only the options currently available for the driver */ static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = { .reset = amdgpu_dm_crtc_reset_state, .destroy = amdgpu_dm_crtc_destroy, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, + .page_flip_timeout = amdgpu_dm_crtc_handle_timeout, .atomic_duplicate_state = amdgpu_dm_crtc_duplicate_state, .atomic_destroy_state = amdgpu_dm_crtc_destroy_state, .set_crc_source = amdgpu_dm_crtc_set_crc_source,
Signature · 1 line
2.52.0
Christian König
maintainerRe: [PATCH v2 2/2] drm/amdgpu: implement page_flip_timeout() support
Quoted 23 lines · Hamza Mahfooz
We now have a means to respond to page flip timeouts. So, hook up support for the new
page_flip_timeout()callback.Signed-off-by Hamza Mahfooz <[email protected]>---
v2: send a wedged event instead of attempting a GPU reset.--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +1
-0@@ -23,6 +23,7 @@* Authors: AMD * */ +#include <drm/drm_drv.h> #include <drm/drm_vblank.h> #include <drm/drm_atomic_helper.h>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c amdgpu_dm_atomic_crtc_get_property(struct drm_crtc *crtc, · line 585
Quoted 7 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +4
-0@@ -578,12 +579,19 @@ amdgpu_dm_atomic_crtc_get_property(struct drm_crtc *crtc, }#endif +static void amdgpu_dm_crtc_handle_timeout (struct drm_crtc *crtc) +{ +drm_dev_wedged_event (crtc->dev,DRM_WEDGE_RECOVERY_REBIND | +DRM_WEDGE_RECOVERY_BUS_RESET ,NULL );
Well that might work but is even worse than a GPU reset.
Have you tried to just signal the page flip as done?
Regards,
Christian.
Quoted 12 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +3
-0+} +/* Implemented only the options currently available for the driver */ static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = { .reset = amdgpu_dm_crtc_reset_state, .destroy = amdgpu_dm_crtc_destroy, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, + .page_flip_timeout = amdgpu_dm_crtc_handle_timeout, .atomic_duplicate_state = amdgpu_dm_crtc_duplicate_state, .atomic_destroy_state = amdgpu_dm_crtc_destroy_state, .set_crc_source = amdgpu_dm_crtc_set_crc_source,
Re: [PATCH v2 2/2] drm/amdgpu: implement page_flip_timeout() supporty
Quoted 4 lines · Christian König
Well that might work but is even worse than a GPU reset.
Have you tried to just signal the page flip as done?
I have tried that actually and it didn't work in my case (outside of your contrived scenario [1], though forcing a full modeset should take care of that case regardless).
Though, I strongly suspect a firmware hang with the issue that I'm seeing since I get DMCUB errors before the timeout. i.e.:
amdgpu 0000:06:00.0: [drm] *ERROR* dc_dmub_srv_log_diagnostic_data: DMCUB error - collecting diagnostic data [...]
amdgpu 0000:06:00.0: [drm] *ERROR* [CRTC:364:crtc-0] flip_done timed out
Christian König
maintainerQuoted 83 lines · Hamza Mahfooz
There should be a mechanism for drivers to respond to
flip_donetimeouts. Since, as it stands it is possible for the display to stall indefinitely, necessitating a hard reset. So, introduce a new mechanism that tries various methods of recovery with increasing aggression, in the following order:1. Force a full modeset (have the compositor reprogram the state from scratch).
3. As a last resort, have the driver attempt a vendor specific reset (assuming it provides an implementation todrm_crtc_funcs.page_flip_timeout()).Signed-off-by Hamza Mahfooz <[email protected]>---
v2: new to the series--- drivers/gpu/drm/drm_atomic_helper.c | 36 ++++++++++++++++++++++++++--- include/drm/drm_crtc.h | 9 ++++++++ include/drm/drm_device.h | 24 +++++++++++++++++++ 3 files changed, 66 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_atomic_helper.c +33
-3@@ -42,6 +42,7 @@#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_panic.h> #include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> #include <drm/drm_self_refresh_helper.h> #include <drm/drm_vblank.h> #include <drm/drm_writeback.h> @@ -1881,11 +1882,40 @@ void drm_atomic_helper_wait_for_flip_done(struct drm_device *dev,continue ; ret =wait_for_completion_timeout (&commit->flip_done,10 *HZ ); -if (ret ==0 ) -drm_err (dev,"[CRTC:%d:%s] flip_done timed out\n" , - crtc->base.id, crtc->name); +if (!ret) { +switch (dev->reset_phase) { +case DRM_KMS_RESET_NONE : +drm_err (dev,"[CRTC:%d:%s] flip_done timed out\n" , + crtc->base.id, crtc->name); + dev->reset_phase =DRM_KMS_RESET_FORCE_MODESET ; +drm_kms_helper_hotplug_event (dev); +break ; +case DRM_KMS_RESET_FORCE_MODESET : +drm_err (dev,"[CRTC:%d:%s] force full modeset failed\n" , + crtc->base.id, crtc->name); + dev->reset_phase =DRM_KMS_RESET_VENDOR ; +if (crtc->funcs->page_flip_timeout) + crtc->funcs->page_flip_timeout (crtc); +break ; +case DRM_KMS_RESET_VENDOR : +drm_err (dev,"[CRTC:%d:%s] KMS recovery failed!\n" , + crtc->base.id, crtc->name); + dev->reset_phase =DRM_KMS_RESET_GIVE_UP ; +break ; +default : +break ; + } + + goto exit; + } + } + +if (dev->reset_phase) { +drm_info (dev,"KMS recovery succeeded!\n" ); + dev->reset_phase =DRM_KMS_RESET_NONE ; } +exit:if (state->fake_commit)complete_all (&state->fake_commit->flip_done); }include/drm/drm_crtc.h +0
-0@@ -609,6 +609,15 @@ struct drm_crtc_funcs { uint32_t flags, uint32_t target,
include/drm/drm_crtc.h struct drm_crtc_funcs { · line 619
Quoted 10 lines
include/drm/drm_crtc.h +8
-0struct drm_modeset_acquire_ctx *ctx); +/** +* @page_flip_timeout: +* +* This optional hook is called if &drm_crtc_commit.flip_done times out, +* and can be used by drivers to attempt to recover from a page flip +* timeout. +*/ +void (*page_flip_timeout)(struct drm_crtc *crtc);
As far as I can see a callback is clearly not the right approach.
The drm_atomic_helper_wait_for_flip_done() helper is called by the driver, isn't it?
So what we need is just to give an error code back to the driver.
Regards,
Christian.
Quoted 46 lines
include/drm/drm_crtc.h +1
-0+/** * @set_property: * include/drm/drm_device.h +24
-0@@ -66,6 +66,23 @@ enum switch_power_state { DRM_SWITCH_POWER_DYNAMIC_OFF = 3, }; +/** +* enum drm_kms_reset_phase - reset phase of drm device +*/ +enum drm_kms_reset_phase { +/** @DRM_KMS_RESET_NONE: Not currently attempting recovery */ +DRM_KMS_RESET_NONE , + +/** @DRM_KMS_RESET_FORCE_MODESET: Force a full modeset */ +DRM_KMS_RESET_FORCE_MODESET , + +/** @DRM_KMS_RESET_VENDOR: Attempt a vendor reset */ +DRM_KMS_RESET_VENDOR , + +/** @DRM_KMS_RESET_GIVE_UP: All recovery methods failed */ +DRM_KMS_RESET_GIVE_UP , +}; +/** * struct drm_device - DRM device structure * @@ -375,6 +392,13 @@ struct drm_device {* Root directory for debugfs files. */ struct dentry *debugfs_root; + +/** +* @reset_phase: +* +* Reset phase that the device is in. +*/ +enum drm_kms_reset_phase reset_phase; };void drm_dev_set_dma_dev (struct drm_device *dev,struct device *dma_dev);
Quoted 11 lines · Christian König
include/drm/drm_crtc.h struct drm_crtc_funcs { · line 619
Quoted 8 lines
include/drm/drm_crtc.h +8
-0+/** +* @page_flip_timeout: +* +* This optional hook is called if &drm_crtc_commit.flip_done times out, +* and can be used by drivers to attempt to recover from a page flip +* timeout. +*/ +void (*page_flip_timeout)(struct drm_crtc *crtc);As far as I can see a callback is clearly not the right approach.
Quoted 4 lines
The
drm_atomic_helper_wait_for_flip_done()helper is called by the driver, isn't it?So what we need is just to give an error code back to the driver.
I guess we could just have the function return -ETIMEOUT, but then drivers wouldn't know which crtc is timing out and AFAIK drivers aren't supposed to touch drm_crtc_commits so they don't really have a sanctioned means to figure that out on their own.
Christian König
maintainerQuoted 14 lines · Hamza Mahfooz
Quoted 13 lines · Christian König
include/drm/drm_crtc.h struct drm_crtc_funcs { · line 619
Quoted 8 lines
include/drm/drm_crtc.h +8
-0+/** +* @page_flip_timeout: +* +* This optional hook is called if &drm_crtc_commit.flip_done times out, +* and can be used by drivers to attempt to recover from a page flip +* timeout. +*/ +void (*page_flip_timeout)(struct drm_crtc *crtc);As far as I can see a callback is clearly not the right approach.
The
drm_atomic_helper_wait_for_flip_done()helper is called by the driver, isn't it?
Quoted 7 lines
Quoted 2 lines
So what we need is just to give an error code back to the driver.
I guess we could just have the function return
-ETIMEOUT, but then drivers wouldn't know which crtc is timing out and AFAIK drivers aren't supposed to touchdrm_crtc_commits so they don't really have a sanctioned means to figure that out on their own.
Well we can add a helper to allow the driver to query each crtc for pending flips.
What you do here is usually called mid-layering (e.g. driver calls function, function calls back into driver) and is a clear no-go for acceptable upstream code.
Regards,
Christian.