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

Commit 52f0abec authored by Rachel Lee's avatar Rachel Lee
Browse files

Add MRR guarding flag frame_rate_category_mrr 

This flag will guard new dVRR scheduler features from MRR devices.

Bug: 330224639
Test: presubmit
Change-Id: Ib180f5fb800de19758362d80d0d3e280d5cf378d
parent 27776e5b

services/surfaceflinger/common/FlagManager.cpp

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ void FlagManager::dump(std::string& result) const { 
    /// Trunk stable readonly flags ///

    DUMP_READ_ONLY_FLAG(connected_display);

    DUMP_READ_ONLY_FLAG(enable_small_area_detection);

    DUMP_READ_ONLY_FLAG(frame_rate_category_mrr);

    DUMP_READ_ONLY_FLAG(misc1);

    DUMP_READ_ONLY_FLAG(vrr_config);

    DUMP_READ_ONLY_FLAG(hotplug2);
@@ -197,6 +198,7 @@ FLAG_MANAGER_LEGACY_SERVER_FLAG(use_skia_tracing, PROPERTY_SKIA_ATRACE_ENABLED, 
/// Trunk stable readonly flags ///

FLAG_MANAGER_READ_ONLY_FLAG(connected_display, "")

FLAG_MANAGER_READ_ONLY_FLAG(enable_small_area_detection, "")

FLAG_MANAGER_READ_ONLY_FLAG(frame_rate_category_mrr, "debug.sf.frame_rate_category_mrr")

FLAG_MANAGER_READ_ONLY_FLAG(misc1, "")

FLAG_MANAGER_READ_ONLY_FLAG(vrr_config, "debug.sf.enable_vrr_config")

FLAG_MANAGER_READ_ONLY_FLAG(hotplug2, "")

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

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ public: 


    /// Trunk stable readonly flags ///

    bool connected_display() const;

    bool frame_rate_category_mrr() const;

    bool enable_small_area_detection() const;

    bool misc1() const;

    bool vrr_config() const;

services/surfaceflinger/surfaceflinger_flags_new.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -10,4 +10,15 @@ flag { 
  bug: "273702768"

} # dont_skip_on_early_ro2



flag {

  name: "frame_rate_category_mrr"

  namespace: "core_graphics"

  description: "Enable to use frame rate category and newer frame rate votes such as GTE in SurfaceFlinger scheduler, to guard dVRR changes from MRR devices"

  bug: "330224639"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

} # frame_rate_category_mrr



# IMPORTANT - please keep alphabetize to reduce merge conflicts