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.lankho...@linux.intel.com> >> Cc: Harry Wentland <harry.wentl...@amd.com> >> Cc: Leo Li <sunpeng...@amd.com> >> Cc: Alex Deucher <alexander.deuc...@amd.com> >> Cc: "Christian König" <christian.koe...@amd.com> >> Cc: "David (ChunMing) Zhou" <david1.z...@amd.com> >> Cc: David Airlie <airl...@linux.ie> >> Cc: Liviu Dudau <liviu.du...@arm.com> >> Cc: Brian Starkey <brian.star...@arm.com> >> Cc: Mali DP Maintainers <mal...@foss.arm.com> >> Cc: Boris Brezillon <boris.brezil...@bootlin.com> >> Cc: Nicolas Ferre <nicolas.fe...@microchip.com> >> Cc: Alexandre Belloni <alexandre.bell...@bootlin.com> >> Cc: Ludovic Desroches <ludovic.desroc...@microchip.com> >> Cc: Maarten Lankhorst <maarten.lankho...@linux.intel.com> >> Cc: Maxime Ripard <maxime.rip...@bootlin.com> >> Cc: Sean Paul <s...@poorly.run> >> Cc: Jani Nikula <jani.nik...@linux.intel.com> >> Cc: Joonas Lahtinen <joonas.lahti...@linux.intel.com> >> Cc: Rodrigo Vivi <rodrigo.v...@intel.com> >> Cc: Philipp Zabel <p.za...@pengutronix.de> >> Cc: CK Hu <ck...@mediatek.com> >> Cc: Matthias Brugger <matthias....@gmail.com> >> Cc: Rob Clark <robdcl...@gmail.com> >> Cc: Ben Skeggs <bske...@redhat.com> >> Cc: Tomi Valkeinen <tomi.valkei...@ti.com> >> Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com> >> Cc: Kieran Bingham <kieran.bingham+rene...@ideasonboard.com> >> Cc: Sandy Huang <h...@rock-chips.com> >> Cc: "Heiko Stübner" <he...@sntech.de> >> Cc: Thierry Reding <thierry.red...@gmail.com> >> Cc: Jonathan Hunter <jonath...@nvidia.com> >> Cc: Eric Anholt <e...@anholt.net> >> Cc: VMware Graphics <linux-graphics-maintai...@vmware.com> >> Cc: Sinclair Yeh <s...@vmware.com> >> Cc: Thomas Hellstrom <thellst...@vmware.com> >> Cc: Tony Cheng <tony.ch...@amd.com> >> Cc: Shirish S <shiris...@amd.com> >> Cc: Mikita Lipski <mikita.lip...@amd.com> >> Cc: Bhawanpreet Lakha <bhawanpreet.la...@amd.com> >> Cc: David Francis <david.fran...@amd.com> >> Cc: Anthony Koo <anthony....@amd.com> >> Cc: Jeykumar Sankaran <jsa...@codeaurora.org> >> Cc: Jordan Crouse <jcro...@codeaurora.org> >> Cc: Bruce Wang <bzw...@chromium.org> >> Cc: Sravanthi Kollukuduru <skoll...@codeaurora.org> >> Cc: Archit Taneja <arch...@codeaurora.org> >> Cc: Steve Kowalik <ste...@wedontsleep.org> >> Cc: Carsten Behling <carsten.behl...@googlemail.com> >> Cc: Haneen Mohammed <hamohammed...@gmail.com> >> Cc: Daniel Vetter <daniel.vet...@ffwll.ch> >> Cc: Rodrigo Siqueira <rodrigosiqueiram...@gmail.com> >> Cc: Mahesh Kumar <mahesh1.ku...@intel.com> >> Cc: amd-gfx@lists.freedesktop.org >> Cc: dri-de...@lists.freedesktop.org >> Cc: linux-ker...@vger.kernel.org >> Cc: linux-arm-ker...@lists.infradead.org >> Cc: intel-...@lists.freedesktop.org >> Cc: linux-media...@lists.infradead.org >> Cc: linux-arm-...@vger.kernel.org >> Cc: freedr...@lists.freedesktop.org >> Cc: nouv...@lists.freedesktop.org >> Cc: linux-renesas-...@vger.kernel.org >> Cc: linux-rockc...@lists.infradead.org >> Cc: linux-te...@vger.kernel.org >> --- >> .../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 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
