Commit 734dd01d authored by Samuel Li's avatar Samuel Li Committed by Alex Deucher
Browse files

drm/amdgpu: rename amdgpu_crtc_idx_to_irq_type 



Add display to the name for consistency.

Signed-off-by: default avatarSamuel Li <Samuel.Li@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent aa8e286a

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

+1 −1
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ int amdgpu_display_get_crtc_scanoutpos(struct drm_device *dev, 
	return ret;

}



int amdgpu_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc)

int amdgpu_display_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc)

{

	if (crtc < 0 || crtc >= adev->mode_info.num_crtc)

		return AMDGPU_CRTC_IRQ_NONE;

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

+2 −2
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe) 
int amdgpu_enable_vblank_kms(struct drm_device *dev, unsigned int pipe)

{

	struct amdgpu_device *adev = dev->dev_private;

	int idx = amdgpu_crtc_idx_to_irq_type(adev, pipe);

	int idx = amdgpu_display_crtc_idx_to_irq_type(adev, pipe);



	return amdgpu_irq_get(adev, &adev->crtc_irq, idx);

}
@@ -1041,7 +1041,7 @@ int amdgpu_enable_vblank_kms(struct drm_device *dev, unsigned int pipe) 
void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe)

{

	struct amdgpu_device *adev = dev->dev_private;

	int idx = amdgpu_crtc_idx_to_irq_type(adev, pipe);

	int idx = amdgpu_display_crtc_idx_to_irq_type(adev, pipe);



	amdgpu_irq_put(adev, &adev->crtc_irq, idx);

}

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ bool amdgpu_display_crtc_scaling_mode_fixup(struct drm_crtc *crtc, 
				struct drm_display_mode *adjusted_mode);

void amdgpu_panel_mode_fixup(struct drm_encoder *encoder,

			     struct drm_display_mode *adjusted_mode);

int amdgpu_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc);

int amdgpu_display_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc);



/* fbdev layer */

int amdgpu_fbdev_init(struct amdgpu_device *adev);

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

+3 −2
Original line number Diff line number Diff line
@@ -2537,7 +2537,8 @@ static void dce_v10_0_crtc_dpms(struct drm_crtc *crtc, int mode) 
		amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE);

		dce_v10_0_vga_enable(crtc, false);

		/* Make sure VBLANK and PFLIP interrupts are still enabled */

		type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);

		type = amdgpu_display_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_crtc_vblank_on(crtc);
@@ -3249,7 +3250,7 @@ static int dce_v10_0_crtc_irq(struct amdgpu_device *adev, 
{

	unsigned crtc = entry->src_id - 1;

	uint32_t disp_int = RREG32(interrupt_status_offsets[crtc].reg);

	unsigned irq_type = amdgpu_crtc_idx_to_irq_type(adev, crtc);

	unsigned int irq_type = amdgpu_display_crtc_idx_to_irq_type(adev, crtc);



	switch (entry->src_data[0]) {

	case 0: /* vblank */

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

+4 −2
Original line number Diff line number Diff line
@@ -2612,7 +2612,8 @@ static void dce_v11_0_crtc_dpms(struct drm_crtc *crtc, int mode) 
		amdgpu_atombios_crtc_blank(crtc, ATOM_DISABLE);

		dce_v11_0_vga_enable(crtc, false);

		/* Make sure VBLANK and PFLIP interrupts are still enabled */

		type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);

		type = amdgpu_display_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_crtc_vblank_on(crtc);
@@ -3368,7 +3369,8 @@ static int dce_v11_0_crtc_irq(struct amdgpu_device *adev, 
{

	unsigned crtc = entry->src_id - 1;

	uint32_t disp_int = RREG32(interrupt_status_offsets[crtc].reg);

	unsigned irq_type = amdgpu_crtc_idx_to_irq_type(adev, crtc);

	unsigned int irq_type = amdgpu_display_crtc_idx_to_irq_type(adev,

								    crtc);



	switch (entry->src_data[0]) {

	case 0: /* vblank */

CRA Git | Maintained and supported by SUSTech CRA and CCSE