Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: use drm_crtc_vblank_{on,off}()

Replace the legacy drm_vblank_{on,off}() with the new helper functions.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465308482-15104-6-git-send-email-gustavo@padovan.org

authored by

Gustavo Padovan and committed by
Daniel Vetter
9a7841e9 ceb74152

+6 -6
+2 -2
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
··· 2719 2719 type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id); 2720 2720 amdgpu_irq_update(adev, &adev->crtc_irq, type); 2721 2721 amdgpu_irq_update(adev, &adev->pageflip_irq, type); 2722 - drm_vblank_on(dev, amdgpu_crtc->crtc_id); 2722 + drm_crtc_vblank_on(crtc); 2723 2723 dce_v10_0_crtc_load_lut(crtc); 2724 2724 break; 2725 2725 case DRM_MODE_DPMS_STANDBY: 2726 2726 case DRM_MODE_DPMS_SUSPEND: 2727 2727 case DRM_MODE_DPMS_OFF: 2728 - drm_vblank_off(dev, amdgpu_crtc->crtc_id); 2728 + drm_crtc_vblank_off(crtc); 2729 2729 if (amdgpu_crtc->enabled) { 2730 2730 dce_v10_0_vga_enable(crtc, true); 2731 2731 amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);
+2 -2
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
··· 2730 2730 type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id); 2731 2731 amdgpu_irq_update(adev, &adev->crtc_irq, type); 2732 2732 amdgpu_irq_update(adev, &adev->pageflip_irq, type); 2733 - drm_vblank_on(dev, amdgpu_crtc->crtc_id); 2733 + drm_crtc_vblank_on(crtc); 2734 2734 dce_v11_0_crtc_load_lut(crtc); 2735 2735 break; 2736 2736 case DRM_MODE_DPMS_STANDBY: 2737 2737 case DRM_MODE_DPMS_SUSPEND: 2738 2738 case DRM_MODE_DPMS_OFF: 2739 - drm_vblank_off(dev, amdgpu_crtc->crtc_id); 2739 + drm_crtc_vblank_off(crtc); 2740 2740 if (amdgpu_crtc->enabled) { 2741 2741 dce_v11_0_vga_enable(crtc, true); 2742 2742 amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);
+2 -2
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
··· 2626 2626 type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id); 2627 2627 amdgpu_irq_update(adev, &adev->crtc_irq, type); 2628 2628 amdgpu_irq_update(adev, &adev->pageflip_irq, type); 2629 - drm_vblank_on(dev, amdgpu_crtc->crtc_id); 2629 + drm_crtc_vblank_on(crtc); 2630 2630 dce_v8_0_crtc_load_lut(crtc); 2631 2631 break; 2632 2632 case DRM_MODE_DPMS_STANDBY: 2633 2633 case DRM_MODE_DPMS_SUSPEND: 2634 2634 case DRM_MODE_DPMS_OFF: 2635 - drm_vblank_off(dev, amdgpu_crtc->crtc_id); 2635 + drm_crtc_vblank_off(crtc); 2636 2636 if (amdgpu_crtc->enabled) { 2637 2637 dce_v8_0_vga_enable(crtc, true); 2638 2638 amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);