On 6/14/23 16:42, Hamza Mahfooz wrote:
> From: Daniel Miess <[email protected]>
>
> [Why]
> RCO is causing error messages on some DCN314 systems
>
> [How]
> Force disable RCO for DCN314
>
> Fixes: 0e1961c93839 ("drm/amd/display: Enable dcn314 DPP RCO")
> Reviewed-by: Nicholas Kazlauskas <[email protected]>
> Acked-by: Hamza Mahfooz <[email protected]>
> Signed-off-by: Daniel Miess <[email protected]>
Series is
Reviewed-by: Harry Wentland <[email protected]>
Harry
> ---
> drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 2 +-
> drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c | 3 +++
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c
> b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c
> index cf23d7bc560a..0746ed31d1d1 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c
> @@ -332,7 +332,7 @@ static void dccg314_dpp_root_clock_control(
> {
> struct dcn_dccg *dccg_dcn = TO_DCN_DCCG(dccg);
>
> - if (dccg->dpp_clock_gated[dpp_inst] == clock_on)
> + if (dccg->dpp_clock_gated[dpp_inst] != clock_on)
> return;
>
> if (clock_on) {
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
> b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
> index ef49b4d7742f..6a9024aa3285 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
> @@ -1908,6 +1908,9 @@ static bool dcn314_resource_construct(
> dc->debug.disable_dpp_power_gate = true;
> dc->debug.disable_hubp_power_gate = true;
>
> + /* Disable root clock optimization */
> + dc->debug.root_clock_optimization.u32All = 0;
> +
> // Init the vm_helper
> if (dc->vm_helper)
> vm_helper_init(dc->vm_helper, 16);
