On 2022-06-20 18:38, Alex Deucher wrote: > This reverts commit 92020e81ddbeac351ea4a19bcf01743f32b9c800. > > This causes stuttering and timeouts with DMCUB for some users > so revert it until we understand why and and safely enable it > to save power. > > Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1887 > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> > Cc: Nicholas Kazlauskas <nicholas.kazlauskas@xxxxxxx> Acked-by: Harry Wentland <harry.wentland@xxxxxxx> Harry > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 1 + > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 --- > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > index b4cf8717f554..89011bae7588 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > @@ -320,6 +320,7 @@ int amdgpu_irq_init(struct amdgpu_device *adev) > if (!amdgpu_device_has_dc_support(adev)) { > if (!adev->enable_virtual_display) > /* Disable vblank IRQs aggressively for power-saving */ > + /* XXX: can this be enabled for DC? */ > adev_to_drm(adev)->vblank_disable_immediate = true; > > r = drm_vblank_init(adev_to_drm(adev), adev->mode_info.num_crtc); > 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 c2bc7db85d7e..24959cb85c48 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -4293,9 +4293,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) > } > } > > - /* Disable vblank IRQs aggressively for power-saving. */ > - adev_to_drm(adev)->vblank_disable_immediate = true; > - > /* loops over all connectors on the board */ > for (i = 0; i < link_cnt; i++) { > struct dc_link *link = NULL;
