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"

Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index df401aded6621c4e334230c06995b4f1db7e34e5..bf7c22f81cda343134a5352975193bedbd1a08da 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -3075,7 +3075,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;
        }
 
@@ -3227,7 +3227,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;
        }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 80f01c3989cdf9bd9c36a0b24767abfdeb0009e7..47e05783c4a0e36ab58a6162e473d7fe6c39ee06 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -3206,7 +3206,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;
        }
 
@@ -3358,7 +3358,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;
        }
 
@@ -3488,8 +3488,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)
 {

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
index 2d85ea7159de84513697c7be814d0cc63e00b2e1..2a48f8bc6b7cb3e878dca4800e913353baab87f8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
@@ -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;
        }
 
@@ -3007,26 +3007,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;

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index 07358546581fc85f4634ec06078c4562fb21e01f..fe8671577525597de61734517df42c4f49d71e20 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -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;
        }
 
@@ -3029,7 +3029,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;
        }
 

diff --git a/drivers/gpu/drm/amd/display/dc/link/link_factory.c b/drivers/gpu/drm/amd/display/dc/link/link_factory.c
index f6b6b19e748149dd46c8267298dbf253c4cc6ec0..70f54bdbbc64ece17baa7c9139947b63bc0ece9d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/link/link_factory.c
+++ b/drivers/gpu/drm/amd/display/dc/link/link_factory.c
@@ -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))