From 4c4aea183d414ff1a21314f366c3523ab19e32ff Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 7 Jul 2022 23:23:10 +0000 Subject: [PATCH] Revert "drm/amdgpu/display: set vblank_disable_immediate for DC" From Alex Deucher 990132bebcc81aa95c1a1ac4422b0364753d9d39 in linux 5.15.y/5.15.53 a775e4e4941bf2f326aa36c58f67bd6c96cac717 in mainline linux --- sys/dev/pci/drm/amd/amdgpu/amdgpu_irq.c | 1 + sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_irq.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_irq.c index ea10001d87b..2396d266bd4 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_irq.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_irq.c @@ -341,6 +341,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/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c index e214c292087..b5619025863 100644 --- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3840,9 +3840,6 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) } #endif - /* 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; -- 2.20.1