This is a follow-up to the plane reset removal series, and part of a larger effort to remove the reset hook from all KMS objects.
The CRTC reset hook is overloaded: it is called both at probe time to create the initial software state and during suspend/resume to reset hardware and software state. These two roles have different requirements, and the reset hook is not fallible, making error handling difficult for the initial state allocation path. While reset has the semantics to reset both the software and hardware state, the vast majority of implementations and all the helpers only reset the software state, making them equivalent to atomic_create_state in practice. The atomic_create_state hook makes this explicit: it only allocates and initializes a pristine state without any side effect, and returns the state pointer or an ERR_PTR on failure. This series converts all CRTC drivers tree-wide from the reset hook to atomic_create_state, then removes the reset hook from struct drm_crtc_funcs entirely. Two drivers (tilcdc and loongson) had actual hardware reset logic mixed into their reset hook; those are moved to CRTC creation instead. The conversions were done using a combination of Coccinelle semantic patches and manual adjustments. Signed-off-by: Maxime Ripard <[email protected]> --- Changes in v2: - Fix indentation in logicvc - Fix hardware reset at probe and suspend for loonsoon and tilcldc - Fix state creation for amdgpu - Rebase on current drm-misc-next - Fix commit message for st7920 - Fix merge conflict for mediatek - Link to v1: https://lore.kernel.org/r/[email protected] --- Maxime Ripard (13): drm/crtc: Introduce hw_reset helper hook drm/amdgpu: vkms: Switch to drm_atomic_helper_crtc_create_state drm/logicvc: Switch to drm_atomic_helper_crtc_create_state drm/tilcdc: Move hardware reset to CRTC creation drm/tilcdc: Switch to drm_atomic_helper_crtc_create_state drm/atomic-helper: Remove drm_atomic_helper_crtc_reset drm/amdgpu: dm: Convert to atomic_create_state drm/loongson: Move hardware reset to CRTC creation drm/loongson: Convert to atomic_create_state drm/mediatek: Convert to atomic_create_state drm/sitronix: st7920: Convert to atomic_create_state drm/atomic-helper: Remove __drm_atomic_helper_crtc_reset drm/crtc: Remove reset drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 28 +++++++++----- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h | 2 +- .../display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c | 20 +++++----- drivers/gpu/drm/drm_atomic_state_helper.c | 45 ---------------------- drivers/gpu/drm/drm_mode_config.c | 17 ++++++-- drivers/gpu/drm/logicvc/logicvc_crtc.c | 2 +- drivers/gpu/drm/loongson/lsdc_crtc.c | 30 ++++++++------- drivers/gpu/drm/mediatek/mtk_crtc.c | 18 ++++----- drivers/gpu/drm/sitronix/st7920.c | 12 +++--- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 7 ++-- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 + include/drm/drm_atomic_state_helper.h | 3 -- include/drm/drm_crtc.h | 12 ------ include/drm/drm_modeset_helper_vtables.h | 14 +++++++ 15 files changed, 94 insertions(+), 120 deletions(-) --- base-commit: 07c66ce1e6446f5cc6a4ace99a8d46880f45c527 change-id: 20260709-drm-no-more-crtc-reset-14a4d5bc8d41 Best regards, -- Maxime Ripard <[email protected]>
