Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41f41ac7 authored by Melody Hsu's avatar Melody Hsu Committed by Android (Google) Code Review
Browse files

Merge "Enable CPU loadup hints on client comp effects" into main

parents 593a6ed1 b1822ef5

services/surfaceflinger/PowerAdvisor/PowerAdvisor.cpp

+8 −1
Original line number Diff line number Diff line
@@ -807,7 +807,14 @@ void PowerAdvisor::setCommittedWorkload(ftl::Flags<Workload> workload) { 
                                              ftl::truncated<20>(mCommittedWorkload.string()))

                                          .c_str());



        // TODO(b/385028458) load up hint

        // TODO(b/385028458) load up hint for other increased workloads.



        // Provides a load up hint only for effects that require client

        // composition, such as blur or shadows.

        if (FlagManager::getInstance().adpf_cpu_effects_loadup() &&

            mCommittedWorkload.any(adpf::Workload::EFFECTS)) {

            notifyCpuLoadUp();

        }

    }

}

services/surfaceflinger/common/FlagManager.cpp

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ void FlagManager::dump(std::string& result) const { 
    DUMP_LEGACY_SERVER_FLAG(use_skia_tracing);



    /// Trunk stable server (R/W) flags ///

    DUMP_ACONFIG_FLAG(adpf_cpu_effects_loadup);

    DUMP_ACONFIG_FLAG(adpf_gpu_sf);

    DUMP_ACONFIG_FLAG(adpf_native_session_manager);

    DUMP_ACONFIG_FLAG(adpf_use_fmq_channel);
@@ -289,6 +290,7 @@ FLAG_MANAGER_ACONFIG_FLAG(synced_resolution_switch, ""); 


/// Trunk stable server (R/W) flags ///

FLAG_MANAGER_ACONFIG_FLAG(refresh_rate_overlay_on_external_display, "")

FLAG_MANAGER_ACONFIG_FLAG(adpf_cpu_effects_loadup, "");

FLAG_MANAGER_ACONFIG_FLAG(adpf_gpu_sf, "")

FLAG_MANAGER_ACONFIG_FLAG(adpf_native_session_manager, "");

FLAG_MANAGER_ACONFIG_FLAG(graphite_renderengine_preview_rollout, "");

services/surfaceflinger/common/include/common/FlagManager.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public: 
    bool use_skia_tracing() const;



    /// Trunk stable server (R/W) flags ///

    bool adpf_cpu_effects_loadup() const;

    bool adpf_gpu_sf() const;

    bool adpf_native_session_manager() const;

    bool adpf_use_fmq_channel() const;

services/surfaceflinger/surfaceflinger_flags_new.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -3,6 +3,16 @@ 
package: "com.android.graphics.surfaceflinger.flags"

container: "system"



flag {

  name: "adpf_cpu_effects_loadup"

  namespace: "window_surfaces"

  description: "Enables CPU loadup hints for effects using client composition"

  bug: "409887260"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

} # adpf_cpu_effects_loadup



flag {

  name: "adpf_fmq_sf"

  namespace: "game"