summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2022-07-07 23:23:12 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2022-07-07 23:23:12 +0000
commit5c055726d1eb2748295d1b92fd2dbeb0bad86a5f (patch)
tree86c9c1c6ea2f83aaac54a2fc3fdfe01294b27c25 /sys/dev/pci
parentd02085aeb75a14ea26aa4a537516f6d55774a192 (diff)
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
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/drm/amd/amdgpu/amdgpu_irq.c1
-rw-r--r--sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c3
2 files changed, 1 insertions, 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;