Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6bae58d authored by Daniel Vetter's avatar Daniel Vetter Committed by Alex Deucher
Browse files

drm/amdgpu: Switch to drm_vblank_on/off (v2) 



Equivalent change to the radeon driver.

Note that with radeon this caught a bug in the dri3 DDX
implementation, which asked for vblank interrupts when the pipe is
off. That bug needs to be fixed before we can merge this patch (if
amdgpu is affected too). Michel discovered this one.

v2: agd: switch dce8 as well.

Acked-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Cc: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 777e3cbc

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+2 −2
Original line number Diff line number Diff line
@@ -2700,13 +2700,13 @@ static void dce_v10_0_crtc_dpms(struct drm_crtc *crtc, int mode) 
		type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);

		amdgpu_irq_update(adev, &adev->crtc_irq, type);

		amdgpu_irq_update(adev, &adev->pageflip_irq, type);

		drm_vblank_post_modeset(dev, amdgpu_crtc->crtc_id);

		drm_vblank_on(dev, amdgpu_crtc->crtc_id);

		dce_v10_0_crtc_load_lut(crtc);

		break;

	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_OFF:

		drm_vblank_pre_modeset(dev, amdgpu_crtc->crtc_id);

		drm_vblank_off(dev, amdgpu_crtc->crtc_id);

		if (amdgpu_crtc->enabled) {

			dce_v10_0_vga_enable(crtc, true);

			amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+2 −2
Original line number Diff line number Diff line
@@ -2691,13 +2691,13 @@ static void dce_v11_0_crtc_dpms(struct drm_crtc *crtc, int mode) 
		type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);

		amdgpu_irq_update(adev, &adev->crtc_irq, type);

		amdgpu_irq_update(adev, &adev->pageflip_irq, type);

		drm_vblank_post_modeset(dev, amdgpu_crtc->crtc_id);

		drm_vblank_on(dev, amdgpu_crtc->crtc_id);

		dce_v11_0_crtc_load_lut(crtc);

		break;

	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_OFF:

		drm_vblank_pre_modeset(dev, amdgpu_crtc->crtc_id);

		drm_vblank_off(dev, amdgpu_crtc->crtc_id);

		if (amdgpu_crtc->enabled) {

			dce_v11_0_vga_enable(crtc, true);

			amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

+2 −2
Original line number Diff line number Diff line
@@ -2612,13 +2612,13 @@ static void dce_v8_0_crtc_dpms(struct drm_crtc *crtc, int mode) 
		type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);

		amdgpu_irq_update(adev, &adev->crtc_irq, type);

		amdgpu_irq_update(adev, &adev->pageflip_irq, type);

		drm_vblank_post_modeset(dev, amdgpu_crtc->crtc_id);

		drm_vblank_on(dev, amdgpu_crtc->crtc_id);

		dce_v8_0_crtc_load_lut(crtc);

		break;

	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_OFF:

		drm_vblank_pre_modeset(dev, amdgpu_crtc->crtc_id);

		drm_vblank_off(dev, amdgpu_crtc->crtc_id);

		if (amdgpu_crtc->enabled) {

			dce_v8_0_vga_enable(crtc, true);

			amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);