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

drm/amdgpu: rename amdgpu_crtc_idx_to_irq_type

Add display to the name for consistency.

Signed-off-by: Samuel Li <Samuel.Li@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Samuel Li and committed by
Alex Deucher
734dd01d aa8e286a

+22 -14
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
··· 876 876 return ret; 877 877 } 878 878 879 - int amdgpu_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc) 879 + int amdgpu_display_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc) 880 880 { 881 881 if (crtc < 0 || crtc >= adev->mode_info.num_crtc) 882 882 return AMDGPU_CRTC_IRQ_NONE;
+2 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
··· 1025 1025 int amdgpu_enable_vblank_kms(struct drm_device *dev, unsigned int pipe) 1026 1026 { 1027 1027 struct amdgpu_device *adev = dev->dev_private; 1028 - int idx = amdgpu_crtc_idx_to_irq_type(adev, pipe); 1028 + int idx = amdgpu_display_crtc_idx_to_irq_type(adev, pipe); 1029 1029 1030 1030 return amdgpu_irq_get(adev, &adev->crtc_irq, idx); 1031 1031 } ··· 1041 1041 void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe) 1042 1042 { 1043 1043 struct amdgpu_device *adev = dev->dev_private; 1044 - int idx = amdgpu_crtc_idx_to_irq_type(adev, pipe); 1044 + int idx = amdgpu_display_crtc_idx_to_irq_type(adev, pipe); 1045 1045 1046 1046 amdgpu_irq_put(adev, &adev->crtc_irq, idx); 1047 1047 }
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
··· 651 651 struct drm_display_mode *adjusted_mode); 652 652 void amdgpu_panel_mode_fixup(struct drm_encoder *encoder, 653 653 struct drm_display_mode *adjusted_mode); 654 - int amdgpu_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc); 654 + int amdgpu_display_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc); 655 655 656 656 /* fbdev layer */ 657 657 int amdgpu_fbdev_init(struct amdgpu_device *adev);
+3 -2
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
··· 2537 2537 amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE); 2538 2538 dce_v10_0_vga_enable(crtc, false); 2539 2539 /* Make sure VBLANK and PFLIP interrupts are still enabled */ 2540 - type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id); 2540 + type = amdgpu_display_crtc_idx_to_irq_type(adev, 2541 + amdgpu_crtc->crtc_id); 2541 2542 amdgpu_irq_update(adev, &adev->crtc_irq, type); 2542 2543 amdgpu_irq_update(adev, &adev->pageflip_irq, type); 2543 2544 drm_crtc_vblank_on(crtc); ··· 3250 3249 { 3251 3250 unsigned crtc = entry->src_id - 1; 3252 3251 uint32_t disp_int = RREG32(interrupt_status_offsets[crtc].reg); 3253 - unsigned irq_type = amdgpu_crtc_idx_to_irq_type(adev, crtc); 3252 + unsigned int irq_type = amdgpu_display_crtc_idx_to_irq_type(adev, crtc); 3254 3253 3255 3254 switch (entry->src_data[0]) { 3256 3255 case 0: /* vblank */
+4 -2
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
··· 2612 2612 amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE); 2613 2613 dce_v11_0_vga_enable(crtc, false); 2614 2614 /* Make sure VBLANK and PFLIP interrupts are still enabled */ 2615 - type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id); 2615 + type = amdgpu_display_crtc_idx_to_irq_type(adev, 2616 + amdgpu_crtc->crtc_id); 2616 2617 amdgpu_irq_update(adev, &adev->crtc_irq, type); 2617 2618 amdgpu_irq_update(adev, &adev->pageflip_irq, type); 2618 2619 drm_crtc_vblank_on(crtc); ··· 3369 3368 { 3370 3369 unsigned crtc = entry->src_id - 1; 3371 3370 uint32_t disp_int = RREG32(interrupt_status_offsets[crtc].reg); 3372 - unsigned irq_type = amdgpu_crtc_idx_to_irq_type(adev, crtc); 3371 + unsigned int irq_type = amdgpu_display_crtc_idx_to_irq_type(adev, 3372 + crtc); 3373 3373 3374 3374 switch (entry->src_data[0]) { 3375 3375 case 0: /* vblank */
+4 -2
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
··· 2425 2425 amdgpu_atombios_crtc_enable(crtc, ATOM_ENABLE); 2426 2426 amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE); 2427 2427 /* Make sure VBLANK and PFLIP interrupts are still enabled */ 2428 - type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id); 2428 + type = amdgpu_display_crtc_idx_to_irq_type(adev, 2429 + amdgpu_crtc->crtc_id); 2429 2430 amdgpu_irq_update(adev, &adev->crtc_irq, type); 2430 2431 amdgpu_irq_update(adev, &adev->pageflip_irq, type); 2431 2432 drm_crtc_vblank_on(crtc); ··· 2967 2966 { 2968 2967 unsigned crtc = entry->src_id - 1; 2969 2968 uint32_t disp_int = RREG32(interrupt_status_offsets[crtc].reg); 2970 - unsigned irq_type = amdgpu_crtc_idx_to_irq_type(adev, crtc); 2969 + unsigned int irq_type = amdgpu_display_crtc_idx_to_irq_type(adev, 2970 + crtc); 2971 2971 2972 2972 switch (entry->src_data[0]) { 2973 2973 case 0: /* vblank */
+4 -2
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
··· 2441 2441 amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE); 2442 2442 dce_v8_0_vga_enable(crtc, false); 2443 2443 /* Make sure VBLANK and PFLIP interrupts are still enabled */ 2444 - type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id); 2444 + type = amdgpu_display_crtc_idx_to_irq_type(adev, 2445 + amdgpu_crtc->crtc_id); 2445 2446 amdgpu_irq_update(adev, &adev->crtc_irq, type); 2446 2447 amdgpu_irq_update(adev, &adev->pageflip_irq, type); 2447 2448 drm_crtc_vblank_on(crtc); ··· 3064 3063 { 3065 3064 unsigned crtc = entry->src_id - 1; 3066 3065 uint32_t disp_int = RREG32(interrupt_status_offsets[crtc].reg); 3067 - unsigned irq_type = amdgpu_crtc_idx_to_irq_type(adev, crtc); 3066 + unsigned int irq_type = amdgpu_display_crtc_idx_to_irq_type(adev, 3067 + crtc); 3068 3068 3069 3069 switch (entry->src_data[0]) { 3070 3070 case 0: /* vblank */
+2 -1
drivers/gpu/drm/amd/amdgpu/dce_virtual.c
··· 149 149 case DRM_MODE_DPMS_ON: 150 150 amdgpu_crtc->enabled = true; 151 151 /* Make sure VBLANK interrupts are still enabled */ 152 - type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id); 152 + type = amdgpu_display_crtc_idx_to_irq_type(adev, 153 + amdgpu_crtc->crtc_id); 153 154 amdgpu_irq_update(adev, &adev->crtc_irq, type); 154 155 drm_crtc_vblank_on(crtc); 155 156 break;
+1 -1
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
··· 3687 3687 * constant is the same as PFLIP 3688 3688 */ 3689 3689 int irq_type = 3690 - amdgpu_crtc_idx_to_irq_type( 3690 + amdgpu_display_crtc_idx_to_irq_type( 3691 3691 adev, 3692 3692 acrtc->crtc_id); 3693 3693