drm/amd/display: disable RCO for DCN314

From Daniel Miess
d4008eadfce5d7791bf078f5e51ba5b735fd8c09 in linux-6.1.y/6.1.47
85e41f1ed5d94a26fe4e57003c399936d291ed70 in mainline linux

diff --git a/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_dccg.c b/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_dccg.c
index 97c6a79..b74705c 100644 (file)
--- a/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_dccg.c
+++ b/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_dccg.c
@@ -296,7 +296,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/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_resource.c b/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_resource.c
index 012f636..503ab45 100644 (file)
--- a/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_resource.c
+++ b/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_resource.c
@@ -1933,6 +1933,10 @@ static bool dcn314_resource_construct(
                dc->debug = debug_defaults_drv;
        else
                dc->debug = debug_defaults_diags;
+
+       /* 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);