RE: [PATCH] drm/amd/display: Fix a typo when computing dsc configuration
> -Original Message-
> From: amd-gfx On Behalf Of
> mikita.lip...@amd.com
> Sent: 2020/January/31, Friday 10:00 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander ; Lipski, Mikita
> ; Wentland, Harry
> Subject: [PATCH] drm/amd/display: Fix a typo when computing dsc
> configuration
>
> From: Mikita Lipski
Reviewed-by: Zhan Liu
>
> [why]
> Remove a backslash symbol accidentally left in increase bpp function when
> computing mst dsc configuration.
>
> Signed-off-by: Mikita Lipski
> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git
> a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> index 96b391e4b3e7..5672f7765919 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> @@ -632,7 +632,7 @@ static void increase_dsc_bpp(struct
> drm_atomic_state *state,
> if (drm_dp_atomic_find_vcpi_slots(state,
>
> params[next_index].port->mgr,
>
> params[next_index].port,
> -
> vars[next_index].pbn,\
> +
> vars[next_index].pbn,
>
> dm_mst_get_pbn_divider(dc_link)) < 0)
> return;
> if (!drm_dp_mst_atomic_check(state)) {
> --
> 2.17.1
>
> ___
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[PATCH] drm/amd/display: Fix a typo when computing dsc configuration
From: Mikita Lipski
[why]
Remove a backslash symbol accidentally left in increase bpp function
when computing mst dsc configuration.
Signed-off-by: Mikita Lipski
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 96b391e4b3e7..5672f7765919 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -632,7 +632,7 @@ static void increase_dsc_bpp(struct drm_atomic_state *state,
if (drm_dp_atomic_find_vcpi_slots(state,
params[next_index].port->mgr,
params[next_index].port,
- vars[next_index].pbn,\
+ vars[next_index].pbn,
dm_mst_get_pbn_divider(dc_link)) < 0)
return;
if (!drm_dp_mst_atomic_check(state)) {
--
2.17.1
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH] drm/amd/display: Fix a typo - dce_aduio_mask --> dce_audio_mask
Applied. thanks!
Alex
On Sat, Aug 10, 2019 at 9:55 AM Christophe JAILLET
wrote:
>
> This should be 'dce_audio_mask', not 'dce_aduio_mask'.
>
> Signed-off-by: Christophe JAILLET
> ---
> drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 2 +-
> drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 6 +++---
> drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 2 +-
> drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 2 +-
> drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 2 +-
> drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 2 +-
> drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c | 2 +-
> drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +-
> 8 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
> b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
> index 549704998f84..1e88c5f46be7 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
> @@ -937,7 +937,7 @@ struct audio *dce_audio_create(
> unsigned int inst,
> const struct dce_audio_registers *reg,
> const struct dce_audio_shift *shifts,
> - const struct dce_aduio_mask *masks
> + const struct dce_audio_mask *masks
> )
> {
> struct dce_audio *audio = kzalloc(sizeof(*audio), GFP_KERNEL);
> diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.h
> b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.h
> index a0d5724aab31..1392fab0860b 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.h
> +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.h
> @@ -101,7 +101,7 @@ struct dce_audio_shift {
> uint32_t DCCG_AUDIO_DTO1_USE_512FBR_DTO;
> };
>
> -struct dce_aduio_mask {
> +struct dce_audio_mask {
> uint32_t AZALIA_ENDPOINT_REG_INDEX;
> uint32_t AZALIA_ENDPOINT_REG_DATA;
>
> @@ -125,7 +125,7 @@ struct dce_audio {
> struct audio base;
> const struct dce_audio_registers *regs;
> const struct dce_audio_shift *shifts;
> - const struct dce_aduio_mask *masks;
> + const struct dce_audio_mask *masks;
> };
>
> struct audio *dce_audio_create(
> @@ -133,7 +133,7 @@ struct audio *dce_audio_create(
> unsigned int inst,
> const struct dce_audio_registers *reg,
> const struct dce_audio_shift *shifts,
> - const struct dce_aduio_mask *masks);
> + const struct dce_audio_mask *masks);
>
> void dce_aud_destroy(struct audio **audio);
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
> b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
> index 6248c8455314..81116286b15b 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
> @@ -304,7 +304,7 @@ static const struct dce_audio_shift audio_shift = {
> AUD_COMMON_MASK_SH_LIST(__SHIFT)
> };
>
> -static const struct dce_aduio_mask audio_mask = {
> +static const struct dce_audio_mask audio_mask = {
> AUD_COMMON_MASK_SH_LIST(_MASK)
> };
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
> b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
> index 764329264c3b..765e26454a18 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
> @@ -331,7 +331,7 @@ static const struct dce_audio_shift audio_shift = {
> AUD_COMMON_MASK_SH_LIST(__SHIFT)
> };
>
> -static const struct dce_aduio_mask audio_mask = {
> +static const struct dce_audio_mask audio_mask = {
> AUD_COMMON_MASK_SH_LIST(_MASK)
> };
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
> b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
> index c6136e0ed1a4..3ac4c7e73050 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
> @@ -337,7 +337,7 @@ static const struct dce_audio_shift audio_shift = {
> AUD_COMMON_MASK_SH_LIST(__SHIFT)
> };
>
> -static const struct dce_aduio_mask audio_mask = {
> +static const struct dce_audio_mask audio_mask = {
> AUD_COMMON_MASK_SH_LIST(_MASK)
> };
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
> b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
> index 54be7ab370df..9a922cd39cf2 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
> @@ -352,7 +352,7 @@ static const struct dce_audio_shift audio_shift = {
> DCE120_AUD_COMMON_MASK_SH_LIST(__SHIFT)
> };
>
> -static const struct dce_aduio_mask audio_mask = {
> +static const struct dce_audio_mask audio_mask = {
> DC
[PATCH] drm/amd/display: Fix a typo - dce_aduio_mask --> dce_audio_mask
This should be 'dce_audio_mask', not 'dce_aduio_mask'.
Signed-off-by: Christophe JAILLET
---
drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 2 +-
drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 6 +++---
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c | 2 +-
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c | 2 +-
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 2 +-
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 2 +-
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c | 2 +-
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
index 549704998f84..1e88c5f46be7 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
@@ -937,7 +937,7 @@ struct audio *dce_audio_create(
unsigned int inst,
const struct dce_audio_registers *reg,
const struct dce_audio_shift *shifts,
- const struct dce_aduio_mask *masks
+ const struct dce_audio_mask *masks
)
{
struct dce_audio *audio = kzalloc(sizeof(*audio), GFP_KERNEL);
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.h
b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.h
index a0d5724aab31..1392fab0860b 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.h
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.h
@@ -101,7 +101,7 @@ struct dce_audio_shift {
uint32_t DCCG_AUDIO_DTO1_USE_512FBR_DTO;
};
-struct dce_aduio_mask {
+struct dce_audio_mask {
uint32_t AZALIA_ENDPOINT_REG_INDEX;
uint32_t AZALIA_ENDPOINT_REG_DATA;
@@ -125,7 +125,7 @@ struct dce_audio {
struct audio base;
const struct dce_audio_registers *regs;
const struct dce_audio_shift *shifts;
- const struct dce_aduio_mask *masks;
+ const struct dce_audio_mask *masks;
};
struct audio *dce_audio_create(
@@ -133,7 +133,7 @@ struct audio *dce_audio_create(
unsigned int inst,
const struct dce_audio_registers *reg,
const struct dce_audio_shift *shifts,
- const struct dce_aduio_mask *masks);
+ const struct dce_audio_mask *masks);
void dce_aud_destroy(struct audio **audio);
diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
index 6248c8455314..81116286b15b 100644
--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
@@ -304,7 +304,7 @@ static const struct dce_audio_shift audio_shift = {
AUD_COMMON_MASK_SH_LIST(__SHIFT)
};
-static const struct dce_aduio_mask audio_mask = {
+static const struct dce_audio_mask audio_mask = {
AUD_COMMON_MASK_SH_LIST(_MASK)
};
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
index 764329264c3b..765e26454a18 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
@@ -331,7 +331,7 @@ static const struct dce_audio_shift audio_shift = {
AUD_COMMON_MASK_SH_LIST(__SHIFT)
};
-static const struct dce_aduio_mask audio_mask = {
+static const struct dce_audio_mask audio_mask = {
AUD_COMMON_MASK_SH_LIST(_MASK)
};
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
index c6136e0ed1a4..3ac4c7e73050 100644
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
@@ -337,7 +337,7 @@ static const struct dce_audio_shift audio_shift = {
AUD_COMMON_MASK_SH_LIST(__SHIFT)
};
-static const struct dce_aduio_mask audio_mask = {
+static const struct dce_audio_mask audio_mask = {
AUD_COMMON_MASK_SH_LIST(_MASK)
};
diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
index 54be7ab370df..9a922cd39cf2 100644
--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
@@ -352,7 +352,7 @@ static const struct dce_audio_shift audio_shift = {
DCE120_AUD_COMMON_MASK_SH_LIST(__SHIFT)
};
-static const struct dce_aduio_mask audio_mask = {
+static const struct dce_audio_mask audio_mask = {
DCE120_AUD_COMMON_MASK_SH_LIST(_MASK)
};
diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
index 860a524ebcfa..2a1ce9ecc66e 100644
--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
+++ b/drivers/gpu/drm/
[PATCH] drm/amd/display: Fix a typo - amdpgu_dm --> amdgpu_dm
This should be 'amdgpu_dm', not 'amdpgu_dm' Signed-off-by: Christophe JAILLET --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 332ac9d985f2..1ccd0e4d459f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -836,7 +836,7 @@ static void s3_handle_mst(struct drm_device *dev, bool suspend) /** * dm_hw_init() - Initialize DC device - * @handle: The base driver device containing the amdpgu_dm device. + * @handle: The base driver device containing the amdgpu_dm device. * * Initialize the &struct amdgpu_display_manager device. This involves calling * the initializers of each DM component, then populating the struct with them. @@ -866,7 +866,7 @@ static int dm_hw_init(void *handle) /** * dm_hw_fini() - Teardown DC device - * @handle: The base driver device containing the amdpgu_dm device. + * @handle: The base driver device containing the amdgpu_dm device. * * Teardown components within &struct amdgpu_display_manager that require * cleanup. This involves cleaning up the DRM device, DC, and any modules that -- 2.20.1 ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH] drm/amd/display: Fix a typo
On Wed, Jun 20, 2018 at 12:56 AM, Rex Zhu wrote:
> change wm_min_memg_clk_in_khz -> wm_min_mem_clk_in_khz
>
> Signed-off-by: Rex Zhu
Reviewed-by: Alex Deucher
> ---
> drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 8
> drivers/gpu/drm/amd/display/dc/dm_services_types.h | 6 +++---
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
> b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
> index 00c0a1e..943d74d 100644
> --- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
> @@ -1000,7 +1000,7 @@ static void bw_calcs_data_update_from_pplib(struct dc
> *dc)
> eng_clks.data[0].clocks_in_khz;
> clk_ranges.wm_clk_ranges[0].wm_max_eng_clk_in_khz =
> eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz
> - 1;
> - clk_ranges.wm_clk_ranges[0].wm_min_memg_clk_in_khz =
> + clk_ranges.wm_clk_ranges[0].wm_min_mem_clk_in_khz =
> mem_clks.data[0].clocks_in_khz;
> clk_ranges.wm_clk_ranges[0].wm_max_mem_clk_in_khz =
> mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz -
> 1;
> @@ -1010,7 +1010,7 @@ static void bw_calcs_data_update_from_pplib(struct dc
> *dc)
> eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz;
> /* 5 GHz instead of data[7].clockInKHz to cover Overdrive */
> clk_ranges.wm_clk_ranges[1].wm_max_eng_clk_in_khz = 500;
> - clk_ranges.wm_clk_ranges[1].wm_min_memg_clk_in_khz =
> + clk_ranges.wm_clk_ranges[1].wm_min_mem_clk_in_khz =
> mem_clks.data[0].clocks_in_khz;
> clk_ranges.wm_clk_ranges[1].wm_max_mem_clk_in_khz =
> mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz -
> 1;
> @@ -1020,7 +1020,7 @@ static void bw_calcs_data_update_from_pplib(struct dc
> *dc)
> eng_clks.data[0].clocks_in_khz;
> clk_ranges.wm_clk_ranges[2].wm_max_eng_clk_in_khz =
> eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz
> - 1;
> - clk_ranges.wm_clk_ranges[2].wm_min_memg_clk_in_khz =
> + clk_ranges.wm_clk_ranges[2].wm_min_mem_clk_in_khz =
> mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz;
> /* 5 GHz instead of data[2].clockInKHz to cover Overdrive */
> clk_ranges.wm_clk_ranges[2].wm_max_mem_clk_in_khz = 500;
> @@ -1030,7 +1030,7 @@ static void bw_calcs_data_update_from_pplib(struct dc
> *dc)
> eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz;
> /* 5 GHz instead of data[7].clockInKHz to cover Overdrive */
> clk_ranges.wm_clk_ranges[3].wm_max_eng_clk_in_khz = 500;
> - clk_ranges.wm_clk_ranges[3].wm_min_memg_clk_in_khz =
> + clk_ranges.wm_clk_ranges[3].wm_min_mem_clk_in_khz =
> mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz;
> /* 5 GHz instead of data[2].clockInKHz to cover Overdrive */
> clk_ranges.wm_clk_ranges[3].wm_max_mem_clk_in_khz = 500;
> diff --git a/drivers/gpu/drm/amd/display/dc/dm_services_types.h
> b/drivers/gpu/drm/amd/display/dc/dm_services_types.h
> index ab8c77d..2b83f92 100644
> --- a/drivers/gpu/drm/amd/display/dc/dm_services_types.h
> +++ b/drivers/gpu/drm/amd/display/dc/dm_services_types.h
> @@ -137,7 +137,7 @@ struct dm_pp_clock_range_for_wm_set {
> enum dm_pp_wm_set_id wm_set_id;
> uint32_t wm_min_eng_clk_in_khz;
> uint32_t wm_max_eng_clk_in_khz;
> - uint32_t wm_min_memg_clk_in_khz;
> + uint32_t wm_min_mem_clk_in_khz;
> uint32_t wm_max_mem_clk_in_khz;
> };
>
> @@ -150,7 +150,7 @@ struct dm_pp_clock_range_for_dmif_wm_set_soc15 {
> enum dm_pp_wm_set_id wm_set_id;
> uint32_t wm_min_dcfclk_clk_in_khz;
> uint32_t wm_max_dcfclk_clk_in_khz;
> - uint32_t wm_min_memg_clk_in_khz;
> + uint32_t wm_min_mem_clk_in_khz;
> uint32_t wm_max_mem_clk_in_khz;
> };
>
> @@ -158,7 +158,7 @@ struct dm_pp_clock_range_for_mcif_wm_set_soc15 {
> enum dm_pp_wm_set_id wm_set_id;
> uint32_t wm_min_socclk_clk_in_khz;
> uint32_t wm_max_socclk_clk_in_khz;
> - uint32_t wm_min_memg_clk_in_khz;
> + uint32_t wm_min_mem_clk_in_khz;
> uint32_t wm_max_mem_clk_in_khz;
> };
>
> --
> 1.9.1
>
> ___
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[PATCH] drm/amd/display: Fix a typo
change wm_min_memg_clk_in_khz -> wm_min_mem_clk_in_khz
Signed-off-by: Rex Zhu
---
drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c | 8
drivers/gpu/drm/amd/display/dc/dm_services_types.h | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
index 00c0a1e..943d74d 100644
--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c
@@ -1000,7 +1000,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc)
eng_clks.data[0].clocks_in_khz;
clk_ranges.wm_clk_ranges[0].wm_max_eng_clk_in_khz =
eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz -
1;
- clk_ranges.wm_clk_ranges[0].wm_min_memg_clk_in_khz =
+ clk_ranges.wm_clk_ranges[0].wm_min_mem_clk_in_khz =
mem_clks.data[0].clocks_in_khz;
clk_ranges.wm_clk_ranges[0].wm_max_mem_clk_in_khz =
mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz - 1;
@@ -1010,7 +1010,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc)
eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz;
/* 5 GHz instead of data[7].clockInKHz to cover Overdrive */
clk_ranges.wm_clk_ranges[1].wm_max_eng_clk_in_khz = 500;
- clk_ranges.wm_clk_ranges[1].wm_min_memg_clk_in_khz =
+ clk_ranges.wm_clk_ranges[1].wm_min_mem_clk_in_khz =
mem_clks.data[0].clocks_in_khz;
clk_ranges.wm_clk_ranges[1].wm_max_mem_clk_in_khz =
mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz - 1;
@@ -1020,7 +1020,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc)
eng_clks.data[0].clocks_in_khz;
clk_ranges.wm_clk_ranges[2].wm_max_eng_clk_in_khz =
eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz -
1;
- clk_ranges.wm_clk_ranges[2].wm_min_memg_clk_in_khz =
+ clk_ranges.wm_clk_ranges[2].wm_min_mem_clk_in_khz =
mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz;
/* 5 GHz instead of data[2].clockInKHz to cover Overdrive */
clk_ranges.wm_clk_ranges[2].wm_max_mem_clk_in_khz = 500;
@@ -1030,7 +1030,7 @@ static void bw_calcs_data_update_from_pplib(struct dc *dc)
eng_clks.data[eng_clks.num_levels*3/8].clocks_in_khz;
/* 5 GHz instead of data[7].clockInKHz to cover Overdrive */
clk_ranges.wm_clk_ranges[3].wm_max_eng_clk_in_khz = 500;
- clk_ranges.wm_clk_ranges[3].wm_min_memg_clk_in_khz =
+ clk_ranges.wm_clk_ranges[3].wm_min_mem_clk_in_khz =
mem_clks.data[mem_clks.num_levels>>1].clocks_in_khz;
/* 5 GHz instead of data[2].clockInKHz to cover Overdrive */
clk_ranges.wm_clk_ranges[3].wm_max_mem_clk_in_khz = 500;
diff --git a/drivers/gpu/drm/amd/display/dc/dm_services_types.h
b/drivers/gpu/drm/amd/display/dc/dm_services_types.h
index ab8c77d..2b83f92 100644
--- a/drivers/gpu/drm/amd/display/dc/dm_services_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dm_services_types.h
@@ -137,7 +137,7 @@ struct dm_pp_clock_range_for_wm_set {
enum dm_pp_wm_set_id wm_set_id;
uint32_t wm_min_eng_clk_in_khz;
uint32_t wm_max_eng_clk_in_khz;
- uint32_t wm_min_memg_clk_in_khz;
+ uint32_t wm_min_mem_clk_in_khz;
uint32_t wm_max_mem_clk_in_khz;
};
@@ -150,7 +150,7 @@ struct dm_pp_clock_range_for_dmif_wm_set_soc15 {
enum dm_pp_wm_set_id wm_set_id;
uint32_t wm_min_dcfclk_clk_in_khz;
uint32_t wm_max_dcfclk_clk_in_khz;
- uint32_t wm_min_memg_clk_in_khz;
+ uint32_t wm_min_mem_clk_in_khz;
uint32_t wm_max_mem_clk_in_khz;
};
@@ -158,7 +158,7 @@ struct dm_pp_clock_range_for_mcif_wm_set_soc15 {
enum dm_pp_wm_set_id wm_set_id;
uint32_t wm_min_socclk_clk_in_khz;
uint32_t wm_max_socclk_clk_in_khz;
- uint32_t wm_min_memg_clk_in_khz;
+ uint32_t wm_min_mem_clk_in_khz;
uint32_t wm_max_mem_clk_in_khz;
};
--
1.9.1
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
