mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-16 00:58:42 -05:00
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>
This commit is contained in:
committed by
Alex Deucher
parent
9e7b08d239
commit
160e6f5108
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user