drm/amdgpu: typos and standardization
Subsystems (3)
cover drm/amdgpu: typos and standardization
Typos were found in DCE, where hpd should have been used.
DCE6/8: standardize the "interrupt" vs "irq" usage in function names with DCE10/11.
Alexandre Demers (2):
drm/amdgpu: fix typos in DCEs
drm/amdgpu: use "irq" in place of "interrupt" in DCE6/8 as in DCE10/11
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 7 ++--- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 28 +++++++++---------- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 16 +++++------ .../drm/amd/display/dc/link/link_factory.c | 2 +- 5 files changed, 28 insertions(+), 29 deletions(-)
Signature · 1 line
2.49.0
PATCH 1/2 drm/amdgpu: fix typos in DCEs
In DCE6, DCE8, DCE10, DCE11, "hdp" is replaced by "hpd" and replace "type" by "hpd" for a uniform parameter naming usage across DCEs.
In link_factory.c, there is a missing "p" to "types"
--- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 7 +++---- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 16 ++++++++-------- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 ++-- .../gpu/drm/amd/display/dc/link/link_factory.c | 2 +- 5 files changed, 16 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +2 -2
@@ -3048,7 +3048,7 @@ static int dce_v10_0_set_hpd_irq_state(struct amdgpu_device *adev,u32 tmp;if (hpd >= adev->mode_info.num_hpd) { -DRM_DEBUG ("invalid hdp %d\n" , hpd); +DRM_DEBUG ("invalid hpd %d\n" , hpd);return 0 ; }
@@ -3200,7 +3200,7 @@ static void dce_v10_0_hpd_int_ack(struct amdgpu_device *adev,u32 tmp;if (hpd >= adev->mode_info.num_hpd) { -DRM_DEBUG ("invalid hdp %d\n" , hpd); +DRM_DEBUG ("invalid hpd %d\n" , hpd);return ; }
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +3 -4
@@ -3179,7 +3179,7 @@ static int dce_v11_0_set_hpd_irq_state(struct amdgpu_device *adev,u32 tmp;if (hpd >= adev->mode_info.num_hpd) { -DRM_DEBUG ("invalid hdp %d\n" , hpd); +DRM_DEBUG ("invalid hpd %d\n" , hpd);return 0 ; }
@@ -3331,7 +3331,7 @@ static void dce_v11_0_hpd_int_ack(struct amdgpu_device *adev,u32 tmp;if (hpd >= adev->mode_info.num_hpd) { -DRM_DEBUG ("invalid hdp %d\n" , hpd); +DRM_DEBUG ("invalid hpd %d\n" , hpd);return ; }
@@ -3461,8 +3461,7 @@ static const struct amd_ip_funcs dce_v11_0_ip_funcs = { .set_powergating_state = dce_v11_0_set_powergating_state, }; -static void -dce_v11_0_encoder_mode_set (struct drm_encoder *encoder, +static void dce_v11_0_encoder_mode_set (struct drm_encoder *encoder,struct drm_display_mode *mode,struct drm_display_mode *adjusted_mode) {
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +8 -8
@@ -287,7 +287,7 @@ static void dce_v6_0_hpd_int_ack(struct amdgpu_device *adev,u32 tmp;if (hpd >= adev->mode_info.num_hpd) { -DRM_DEBUG ("invalid hdp %d\n" , hpd); +DRM_DEBUG ("invalid hpd %d\n" , hpd);return ; }
@@ -2929,26 +2929,26 @@ static void dce_v6_0_set_crtc_vline_interrupt_state(struct amdgpu_device *adev,static int dce_v6_0_set_hpd_interrupt_state (struct amdgpu_device *adev,struct amdgpu_irq_src *src, -unsigned type, +unsigned hpd,enum amdgpu_interrupt_state state) {u32 dc_hpd_int_cntl; -if (type >= adev->mode_info.num_hpd) { -DRM_DEBUG ("invalid hdp %d\n" , type); +if (hpd >= adev->mode_info.num_hpd) { +DRM_DEBUG ("invalid hpd %d\n" , hpd);return 0 ; }switch (state) {case AMDGPU_IRQ_STATE_DISABLE : - dc_hpd_int_cntl =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[type]); + dc_hpd_int_cntl =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); dc_hpd_int_cntl &= ~DC_HPD1_INT_CONTROL__DC_HPD1_INT_EN_MASK ; -WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[type], dc_hpd_int_cntl); +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], dc_hpd_int_cntl);break ;case AMDGPU_IRQ_STATE_ENABLE : - dc_hpd_int_cntl =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[type]); + dc_hpd_int_cntl =RREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd]); dc_hpd_int_cntl |=DC_HPD1_INT_CONTROL__DC_HPD1_INT_EN_MASK ; -WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[type], dc_hpd_int_cntl); +WREG32 (mmDC_HPD1_INT_CONTROL + hpd_offsets[hpd], dc_hpd_int_cntl);break ;default :break ;
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +2 -2
@@ -271,7 +271,7 @@ static void dce_v8_0_hpd_int_ack(struct amdgpu_device *adev,u32 tmp;if (hpd >= adev->mode_info.num_hpd) { -DRM_DEBUG ("invalid hdp %d\n" , hpd); +DRM_DEBUG ("invalid hpd %d\n" , hpd);return ; }
@@ -3003,7 +3003,7 @@ static int dce_v8_0_set_hpd_interrupt_state(struct amdgpu_device *adev,u32 dc_hpd_int_cntl;if (type >= adev->mode_info.num_hpd) { -DRM_DEBUG ("invalid hdp %d\n" , type); +DRM_DEBUG ("invalid hpd %d\n" , type);return 0 ; }
drivers/gpu/drm/amd/display/dc/link/link_factory.c +1 -1
@@ -653,7 +653,7 @@ static bool construct_phy(struct dc_link *link, }/* Look for device tag that matches connector signal, -* CRT for rgb, LCD for other supported signal tyes +* CRT for rgb, LCD for other supported signal types */ if (!bp_funcs->is_device_id_supported (dc_ctx->dc_bios, link->device_tag.dev_id))
Signature · 1 line
2.49.0
PATCH 2/2 drm/amdgpu: use "irq" in place of "interrupt" in DCE6/8 as in DCE10/11
In reply to Alexandre Demers"interrupt" becomes "irq" in:dce_vX_0_set_hpd_interrupt_state()dce_vX_0_set_crtc_interrupt_state()dce_vX_0_set_pageflip_interrupt_state()
It is easier when going through the code to just change the DCE number in the functions' name to find and compare them across DCE versions.
Also, it standardizes function mapping inside a given structure where .set and .process are both set to functions with a "_irq" suffix.
--- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 12 ++++++------ drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +6 -6
@@ -2927,7 +2927,7 @@ static void dce_v6_0_set_crtc_vline_interrupt_state(struct amdgpu_device *adev, } -static int dce_v6_0_set_hpd_interrupt_state (struct amdgpu_device *adev, +static int dce_v6_0_set_hpd_irq_state (struct amdgpu_device *adev,struct amdgpu_irq_src *src,unsigned hpd,enum amdgpu_interrupt_state state)
@@ -2957,7 +2957,7 @@ static int dce_v6_0_set_hpd_interrupt_state(struct amdgpu_device *adev,return 0 ; } -static int dce_v6_0_set_crtc_interrupt_state (struct amdgpu_device *adev, +static int dce_v6_0_set_crtc_irq_state (struct amdgpu_device *adev,struct amdgpu_irq_src *src,unsigned type,enum amdgpu_interrupt_state state)
@@ -3042,7 +3042,7 @@ static int dce_v6_0_crtc_irq(struct amdgpu_device *adev,return 0 ; } -static int dce_v6_0_set_pageflip_interrupt_state (struct amdgpu_device *adev, +static int dce_v6_0_set_pageflip_irq_state (struct amdgpu_device *adev,struct amdgpu_irq_src *src,unsigned type,enum amdgpu_interrupt_state state)
@@ -3457,17 +3457,17 @@ static void dce_v6_0_set_display_funcs(struct amdgpu_device *adev) }static const struct amdgpu_irq_src_funcs dce_v6_0_crtc_irq_funcs = { - .set = dce_v6_0_set_crtc_interrupt_state, + .set = dce_v6_0_set_crtc_irq_state, .process = dce_v6_0_crtc_irq, };static const struct amdgpu_irq_src_funcs dce_v6_0_pageflip_irq_funcs = { - .set = dce_v6_0_set_pageflip_interrupt_state, + .set = dce_v6_0_set_pageflip_irq_state, .process = dce_v6_0_pageflip_irq, };static const struct amdgpu_irq_src_funcs dce_v6_0_hpd_irq_funcs = { - .set = dce_v6_0_set_hpd_interrupt_state, + .set = dce_v6_0_set_hpd_irq_state, .process = dce_v6_0_hpd_irq, };
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +6 -6
@@ -2995,7 +2995,7 @@ static void dce_v8_0_set_crtc_vline_interrupt_state(struct amdgpu_device *adev, } } -static int dce_v8_0_set_hpd_interrupt_state (struct amdgpu_device *adev, +static int dce_v8_0_set_hpd_irq_state (struct amdgpu_device *adev,struct amdgpu_irq_src *src,unsigned type,enum amdgpu_interrupt_state state)
@@ -3025,7 +3025,7 @@ static int dce_v8_0_set_hpd_interrupt_state(struct amdgpu_device *adev,return 0 ; } -static int dce_v8_0_set_crtc_interrupt_state (struct amdgpu_device *adev, +static int dce_v8_0_set_crtc_irq_state (struct amdgpu_device *adev,struct amdgpu_irq_src *src,unsigned type,enum amdgpu_interrupt_state state)
@@ -3110,7 +3110,7 @@ static int dce_v8_0_crtc_irq(struct amdgpu_device *adev,return 0 ; } -static int dce_v8_0_set_pageflip_interrupt_state (struct amdgpu_device *adev, +static int dce_v8_0_set_pageflip_irq_state (struct amdgpu_device *adev,struct amdgpu_irq_src *src,unsigned type,enum amdgpu_interrupt_state state)
@@ -3521,17 +3521,17 @@ static void dce_v8_0_set_display_funcs(struct amdgpu_device *adev) }static const struct amdgpu_irq_src_funcs dce_v8_0_crtc_irq_funcs = { - .set = dce_v8_0_set_crtc_interrupt_state, + .set = dce_v8_0_set_crtc_irq_state, .process = dce_v8_0_crtc_irq, };static const struct amdgpu_irq_src_funcs dce_v8_0_pageflip_irq_funcs = { - .set = dce_v8_0_set_pageflip_interrupt_state, + .set = dce_v8_0_set_pageflip_irq_state, .process = dce_v8_0_pageflip_irq, };static const struct amdgpu_irq_src_funcs dce_v8_0_hpd_irq_funcs = { - .set = dce_v8_0_set_hpd_interrupt_state, + .set = dce_v8_0_set_hpd_irq_state, .process = dce_v8_0_hpd_irq, };
Signature · 1 line
2.49.0
Alex Deucher
AppliedApplied. Thanks!
Quoted 20 lines · Alexandre Demers
Typos were found in DCE, where hpd should have been used.
DCE6/8: standardize the "interrupt" vs "irq" usage in function names with DCE10/11.
Alexandre Demers (2):
drm/amdgpu: fix typos in DCEs
drm/amdgpu: use "irq" in place of "interrupt" in DCE6/8 as in DCE10/11drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 +-- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 7 ++--- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 28 +++++++++---------- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 16 +++++------ .../drm/amd/display/dc/link/link_factory.c | 2 +- 5 files changed, 28 insertions(+), 29 deletions(-)--
2.49.0