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 <maarten.lankhorst@xxxxxxxxxxxxxxx> >> Cc: Harry Wentland <harry.wentland@xxxxxxx> >> Cc: Leo Li <sunpeng.li@xxxxxxx> >> Cc: Alex Deucher <alexander.deucher@xxxxxxx> >> Cc: "Christian König" <christian.koenig@xxxxxxx> >> Cc: "David (ChunMing) Zhou" <David1.Zhou@xxxxxxx> >> Cc: David Airlie <airlied@xxxxxxxx> >> Cc: Liviu Dudau <liviu.dudau@xxxxxxx> >> Cc: Brian Starkey <brian.starkey@xxxxxxx> >> Cc: Mali DP Maintainers <malidp@xxxxxxxxxxxx> >> Cc: Boris Brezillon <boris.brezillon@xxxxxxxxxxx> >> Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx> >> Cc: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx> >> Cc: Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx> >> Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> >> Cc: Maxime Ripard <maxime.ripard@xxxxxxxxxxx> >> Cc: Sean Paul <sean@xxxxxxxxxx> >> Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> >> Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> >> Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> >> Cc: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> >> Cc: CK Hu <ck.hu@xxxxxxxxxxxx> >> Cc: Matthias Brugger <matthias.bgg@xxxxxxxxx> >> Cc: Rob Clark <robdclark@xxxxxxxxx> >> Cc: Ben Skeggs <bskeggs@xxxxxxxxxx> >> Cc: Tomi Valkeinen <tomi.valkeinen@xxxxxx> >> Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> >> Cc: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx> >> Cc: Sandy Huang <hjc@xxxxxxxxxxxxxx> >> Cc: "Heiko Stübner" <heiko@xxxxxxxxx> >> Cc: Thierry Reding <thierry.reding@xxxxxxxxx> >> Cc: Jonathan Hunter <jonathanh@xxxxxxxxxx> >> Cc: Eric Anholt <eric@xxxxxxxxxx> >> Cc: VMware Graphics <linux-graphics-maintainer@xxxxxxxxxx> >> Cc: Sinclair Yeh <syeh@xxxxxxxxxx> >> Cc: Thomas Hellstrom <thellstrom@xxxxxxxxxx> >> Cc: Tony Cheng <Tony.Cheng@xxxxxxx> >> Cc: Shirish S <shirish.s@xxxxxxx> >> Cc: Mikita Lipski <mikita.lipski@xxxxxxx> >> Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@xxxxxxx> >> Cc: David Francis <David.Francis@xxxxxxx> >> Cc: Anthony Koo <Anthony.Koo@xxxxxxx> >> Cc: Jeykumar Sankaran <jsanka@xxxxxxxxxxxxxx> >> Cc: Jordan Crouse <jcrouse@xxxxxxxxxxxxxx> >> Cc: Bruce Wang <bzwang@xxxxxxxxxxxx> >> Cc: Sravanthi Kollukuduru <skolluku@xxxxxxxxxxxxxx> >> Cc: Archit Taneja <architt@xxxxxxxxxxxxxx> >> Cc: Steve Kowalik <steven@xxxxxxxxxxxxxxx> >> Cc: Carsten Behling <carsten.behling@xxxxxxxxxxxxxx> >> Cc: Haneen Mohammed <hamohammed.sa@xxxxxxxxx> >> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> >> Cc: Rodrigo Siqueira <rodrigosiqueiramelo@xxxxxxxxx> >> Cc: Mahesh Kumar <mahesh1.kumar@xxxxxxxxx> >> Cc: amd-gfx@xxxxxxxxxxxxxxxxxxxxx >> Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx >> Cc: linux-kernel@xxxxxxxxxxxxxxx >> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx >> Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx >> Cc: linux-mediatek@xxxxxxxxxxxxxxxxxxx >> Cc: linux-arm-msm@xxxxxxxxxxxxxxx >> Cc: freedreno@xxxxxxxxxxxxxxxxxxxxx >> Cc: nouveau@xxxxxxxxxxxxxxxxxxxxx >> Cc: linux-renesas-soc@xxxxxxxxxxxxxxx >> Cc: linux-rockchip@xxxxxxxxxxxxxxxxxxx >> Cc: linux-tegra@xxxxxxxxxxxxxxx >> --- >> .../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 Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
