drm/radeon: Ensure vblank interrupt is enabled on DPMS transition to on
Subsystems (2)
PATCH 1/1 drm/radeon: Ensure vblank interrupt is enabled on DPMS transition to on
From: Michel Dänzer <[email protected]>
Fixes the vblank interrupt being disabled when it should be on, which can cause at least the following symptoms:
* Hangs when running 'xset dpms force off' in a GNOME session with gnome-shell using DRI2.
* RandR 1.4 slave outputs freezing with garbage displayed using xf86-video-ati 7.8.0 or newer.
NOTE: This patch only applies to 4.5.y or older kernels. With newer kernels, this problem cannot happen because the driver now uses drm_crtc_vblank_on/off instead of drm_vblank_pre/post_modeset. I consider this patch safer for older kernels than backporting the API change, because drm_crtc_vblank_on/off had various issues in older kernels, and I'm not sure all fixes for those have been backported to all stable branches where this patch could be applied.
--- drivers/gpu/drm/radeon/atombios_crtc.c | 2 ++ drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/gpu/drm/radeon/atombios_crtc.c +2 -0
@@ -275,6 +275,8 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)atombios_enable_crtc_memreq (crtc,ATOM_ENABLE );atombios_blank_crtc (crtc,ATOM_DISABLE );drm_vblank_post_modeset (dev, radeon_crtc->crtc_id); +/* Make sure vblank interrupt is still enabled if needed */ +radeon_irq_set (rdev);radeon_crtc_load_lut (crtc);break ;case DRM_MODE_DPMS_STANDBY :
drivers/gpu/drm/radeon/radeon_legacy_crtc.c +2 -0
@@ -331,6 +331,8 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode)WREG32_P (RADEON_CRTC_EXT_CNTL , crtc_ext_cntl, ~(mask | crtc_ext_cntl)); }drm_vblank_post_modeset (dev, radeon_crtc->crtc_id); +/* Make sure vblank interrupt is still enabled if needed */ +radeon_irq_set (rdev);radeon_crtc_load_lut (crtc);break ;case DRM_MODE_DPMS_STANDBY :
Signature · 6 lines
2.10.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 10 lines · Michel Dänzer
From: Michel Dänzer <[email protected]>
Fixes the vblank interrupt being disabled when it should be on, which can cause at least the following symptoms:
* Hangs when running 'xset dpms force off' in a GNOME session with gnome-shell using DRI2.
* RandR 1.4 slave outputs freezing with garbage displayed using xf86-video-ati 7.8.0 or newer.
Quoted 7 lines
NOTE: This patch only applies to 4.5.y or older kernels. With newer kernels, this problem cannot happen because the driver now uses drm_crtc_vblank_on/off instead of drm_vblank_pre/post_modeset. I consider this patch safer for older kernels than backporting the API change, because drm_crtc_vblank_on/off had various issues in older kernels, and I'm not sure all fixes for those have been backported to all stable branches where this patch could be applied.
Yeah, makes sense to opt for the conservative option for backporting. I guess for stable this needs some reference to the corresponding upstream fix, which is:
commit 777e3cbc791f131806d9bf24b3325637c7fc228d
Author: Daniel Vetter <[email protected]> Date: Thu Jan 21 11:08:57 2016 +0100
drm/radeon: Switch to drm_vblank_on/off
Quoted 41 lines
Reported-and-Tested-by Max Staudt <[email protected]>Signed-off-by Michel Dänzer <[email protected]>--- drivers/gpu/drm/radeon/atombios_crtc.c | 2 ++ drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 2 ++ 2 files changed, 4 insertions(+)drivers/gpu/drm/radeon/atombios_crtc.c +2
-0@@ -275,6 +275,8 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)atombios_enable_crtc_memreq (crtc,ATOM_ENABLE );atombios_blank_crtc (crtc,ATOM_DISABLE );drm_vblank_post_modeset (dev, radeon_crtc->crtc_id); +/* Make sure vblank interrupt is still enabled if needed */ +radeon_irq_set (rdev);radeon_crtc_load_lut (crtc);break ;case DRM_MODE_DPMS_STANDBY :drivers/gpu/drm/radeon/radeon_legacy_crtc.c +2
-0@@ -331,6 +331,8 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode)WREG32_P (RADEON_CRTC_EXT_CNTL , crtc_ext_cntl, ~(mask | crtc_ext_cntl)); }drm_vblank_post_modeset (dev, radeon_crtc->crtc_id); +/* Make sure vblank interrupt is still enabled if needed */ +radeon_irq_set (rdev);radeon_crtc_load_lut (crtc);break ;case DRM_MODE_DPMS_STANDBY :Signature · 6 lines
2.10.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 20161122083512.1597-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org
Alex Deucher
Reviewed-byQuoted 18 lines · Michel Dänzer
From: Michel Dänzer <[email protected]>
Fixes the vblank interrupt being disabled when it should be on, which can cause at least the following symptoms:
* Hangs when running 'xset dpms force off' in a GNOME session with gnome-shell using DRI2.
* RandR 1.4 slave outputs freezing with garbage displayed using xf86-video-ati 7.8.0 or newer.NOTE: This patch only applies to 4.5.y or older kernels. With newer kernels, this problem cannot happen because the driver now uses drm_crtc_vblank_on/off instead of drm_vblank_pre/post_modeset. I consider this patch safer for older kernels than backporting the API change, because drm_crtc_vblank_on/off had various issues in older kernels, and I'm not sure all fixes for those have been backported to all stable branches where this patch could be applied.
Quoted 2 lines
Reported-and-Tested-by Max Staudt <[email protected]>Signed-off-by Michel Dänzer <[email protected]>
Quoted 34 lines
--- drivers/gpu/drm/radeon/atombios_crtc.c | 2 ++ drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 2 ++ 2 files changed, 4 insertions(+)drivers/gpu/drm/radeon/atombios_crtc.c +2
-0@@ -275,6 +275,8 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)atombios_enable_crtc_memreq (crtc,ATOM_ENABLE );atombios_blank_crtc (crtc,ATOM_DISABLE );drm_vblank_post_modeset (dev, radeon_crtc->crtc_id); +/* Make sure vblank interrupt is still enabled if needed */ +radeon_irq_set (rdev);radeon_crtc_load_lut (crtc);break ;case DRM_MODE_DPMS_STANDBY :drivers/gpu/drm/radeon/radeon_legacy_crtc.c +2
-1@@ -331,6 +331,8 @@ static void radeon_crtc_dpms(struct drm_crtc *crtc, int mode)WREG32_P (RADEON_CRTC_EXT_CNTL , crtc_ext_cntl, ~(mask | crtc_ext_cntl)); }drm_vblank_post_modeset (dev, radeon_crtc->crtc_id); +/* Make sure vblank interrupt is still enabled if needed */ +radeon_irq_set (rdev);radeon_crtc_load_lut (crtc);break ;case DRM_MODE_DPMS_STANDBY : --2.10.2
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx