Op 12-11-18 om 17:11 schreef Sean Paul: > On Mon, Nov 12, 2018 at 04:01:14PM +0100, Maarten Lankhorst wrote: >> We already have __drm_atomic_helper_connector_reset() and >> __drm_atomic_helper_plane_reset(), extend this to crtc as well. >> >> Most drivers already have a gpu reset hook, correct it. >> Nouveau already implemented its own __drm_atomic_helper_crtc_reset(), >> convert it to the common one. >> >> Signed-off-by: Maarten Lankhorst <[email protected]> >> Cc: Harry Wentland <[email protected]> >> Cc: Leo Li <[email protected]> >> Cc: Alex Deucher <[email protected]> >> Cc: "Christian König" <[email protected]> >> Cc: "David (ChunMing) Zhou" <[email protected]> >> Cc: David Airlie <[email protected]> >> Cc: Liviu Dudau <[email protected]> >> Cc: Brian Starkey <[email protected]> >> Cc: Mali DP Maintainers <[email protected]> >> Cc: Boris Brezillon <[email protected]> >> Cc: Nicolas Ferre <[email protected]> >> Cc: Alexandre Belloni <[email protected]> >> Cc: Ludovic Desroches <[email protected]> >> Cc: Maarten Lankhorst <[email protected]> >> Cc: Maxime Ripard <[email protected]> >> Cc: Sean Paul <[email protected]> >> Cc: Jani Nikula <[email protected]> >> Cc: Joonas Lahtinen <[email protected]> >> Cc: Rodrigo Vivi <[email protected]> >> Cc: Philipp Zabel <[email protected]> >> Cc: CK Hu <[email protected]> >> Cc: Matthias Brugger <[email protected]> >> Cc: Rob Clark <[email protected]> >> Cc: Ben Skeggs <[email protected]> >> Cc: Tomi Valkeinen <[email protected]> >> Cc: Laurent Pinchart <[email protected]> >> Cc: Kieran Bingham <[email protected]> >> Cc: Sandy Huang <[email protected]> >> Cc: "Heiko Stübner" <[email protected]> >> Cc: Thierry Reding <[email protected]> >> Cc: Jonathan Hunter <[email protected]> >> Cc: Eric Anholt <[email protected]> >> Cc: VMware Graphics <[email protected]> >> Cc: Sinclair Yeh <[email protected]> >> Cc: Thomas Hellstrom <[email protected]> >> Cc: Tony Cheng <[email protected]> >> Cc: Shirish S <[email protected]> >> Cc: Mikita Lipski <[email protected]> >> Cc: Bhawanpreet Lakha <[email protected]> >> Cc: David Francis <[email protected]> >> Cc: Anthony Koo <[email protected]> >> Cc: Jeykumar Sankaran <[email protected]> >> Cc: Jordan Crouse <[email protected]> >> Cc: Bruce Wang <[email protected]> >> Cc: Sravanthi Kollukuduru <[email protected]> >> Cc: Archit Taneja <[email protected]> >> Cc: Steve Kowalik <[email protected]> >> Cc: Carsten Behling <[email protected]> >> Cc: Haneen Mohammed <[email protected]> >> Cc: Daniel Vetter <[email protected]> >> Cc: Rodrigo Siqueira <[email protected]> >> Cc: Mahesh Kumar <[email protected]> >> Cc: [email protected] >> Cc: [email protected] >> Cc: [email protected] >> Cc: [email protected] >> Cc: [email protected] >> Cc: [email protected] >> Cc: [email protected] >> Cc: [email protected] >> Cc: [email protected] >> Cc: [email protected] >> Cc: [email protected] >> Cc: [email protected] >> --- >> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 +-- >> drivers/gpu/drm/arm/malidp_crtc.c | 5 +-- >> .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 5 +-- >> drivers/gpu/drm/drm_atomic_state_helper.c | 31 ++++++++++++++++--- >> drivers/gpu/drm/i915/intel_display.c | 2 +- >> drivers/gpu/drm/imx/ipuv3-crtc.c | 5 +-- >> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 5 +-- >> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 12 ++----- >> drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 6 +--- >> drivers/gpu/drm/nouveau/dispnv50/head.c | 13 ++------ >> drivers/gpu/drm/omapdrm/omap_crtc.c | 7 ++--- >> drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 4 +-- >> drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 7 +++-- >> drivers/gpu/drm/tegra/dc.c | 5 +-- >> drivers/gpu/drm/vc4/vc4_crtc.c | 8 ++--- >> drivers/gpu/drm/vkms/vkms_crtc.c | 7 +---- >> drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 9 +----- >> include/drm/drm_atomic_state_helper.h | 2 ++ >> 18 files changed, 56 insertions(+), 81 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 5064768642f3..770a71726cd1 100644 >> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >> @@ -2802,9 +2802,7 @@ static void dm_crtc_reset_state(struct drm_crtc *crtc) >> if (WARN_ON(!state)) > Can you give this the same treatment as the other allocation checks?
Yeah sure, the reason I didn't was because all of the amdgpu reset functions worked like that. I'll send a preparation patch to fix that up. ~Maarten _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
