head-management: add jay-vrr-mode-info-v1 extension

src/compositor.rs

@@ -654,6 +654,7 @@ fn create_dummy_output(state: &Rc<State>) {
         inherent_non_desktop: false,
         override_non_desktop: None,
         vrr: false,
+        vrr_mode: VrrMode::Never.to_config(),
         tearing_enabled: backend_state.tearing,
         tearing_active: false,
         format: XRGB8888,

src/config/handler.rs

@@ -1375,8 +1375,7 @@ impl ConfigProxyHandler {
         match connector {
             Some(c) => {
                 let connector = self.get_output_node(c)?;
-                connector.global.persistent.vrr_mode.set(mode);
+                connector.set_vrr_mode(mode);
-                connector.update_presentation_type();
             }
             _ => self.state.default_vrr_mode.set(mode),
         }

src/ifs/head_management.rs

@@ -17,7 +17,7 @@ use {
         utils::{copyhashmap::CopyHashMap, hash_map_ext::HashMapExt, rc_eq::RcEq},
         wire::JayHeadManagerSessionV1Id,
     },
-    jay_config::video::Transform,
+    jay_config::video::{Transform, VrrMode},
     std::{
         cell::{Cell, RefCell},
         rc::Rc,
@@ -84,6 +84,7 @@ pub struct HeadState {
     pub inherent_non_desktop: bool,
     pub override_non_desktop: Option<bool>,
     pub vrr: bool,
+    pub vrr_mode: VrrMode,
     pub tearing_enabled: bool,
     pub tearing_active: bool,
     pub format: &'static Format,
@@ -229,6 +230,7 @@ impl HeadManagers {
             state.size = n.global.pos.get().size();
             state.mode = n.global.mode.get();
             state.transform = n.global.persistent.transform.get();
+            state.vrr_mode = n.global.persistent.vrr_mode.get().to_config();
         }
         for head in self.managers.lock().values() {
             skip_in_transaction!(head);
@@ -264,6 +266,10 @@ impl HeadManagers {
                 ext.send_state(state);
                 head.session.schedule_done();
             }
+            if let Some(ext) = &head.ext.jay_vrr_mode_info_v1 {
+                ext.send_mode(state);
+                head.session.schedule_done();
+            }
         }
     }
 
@@ -391,6 +397,18 @@ impl HeadManagers {
         }
     }
 
+    pub fn handle_vrr_mode_change(&self, vrr_mode: VrrMode) {
+        let state = &mut *self.state.borrow_mut();
+        state.vrr_mode = vrr_mode;
+        for head in self.managers.lock().values() {
+            skip_in_transaction!(head);
+            if let Some(ext) = &head.ext.jay_vrr_mode_info_v1 {
+                ext.send_mode(state);
+                head.session.schedule_done();
+            }
+        }
+    }
+
     pub fn handle_tearing_enabled_change(&self, enabled: bool) {
         let state = &mut *self.state.borrow_mut();
         state.tearing_enabled = enabled;

src/ifs/head_management/head_management_macros.rs

@@ -404,4 +404,5 @@ declare_extensions! {
     format_info_v1: FormatInfoV1,
     drm_color_space_info_v1: DrmColorSpaceInfoV1,
     non_desktop_override_v1: NonDesktopOverrideV1,
+    jay_vrr_mode_info_v1: JayVrrModeInfoV1,
 }

src/ifs/head_management/jay_head_ext.rs

@@ -7,6 +7,7 @@ pub(super) mod jay_head_ext_connector_info_v1;
 pub(super) mod jay_head_ext_core_info_v1;
 pub(super) mod jay_head_ext_drm_color_space_info_v1;
 pub(super) mod jay_head_ext_format_info_v1;
+pub(super) mod jay_head_ext_jay_vrr_mode_info_v1;
 pub(super) mod jay_head_ext_mode_info_v1;
 pub(super) mod jay_head_ext_mode_setter_v1;
 pub(super) mod jay_head_ext_non_desktop_info_v1;

src/ifs/head_management/jay_head_ext/jay_head_ext_jay_vrr_mode_info_v1.rs

@@ -0,0 +1,49 @@
+use {
+    crate::{
+        ifs::head_management::HeadState,
+        wire::{
+            jay_head_ext_jay_vrr_mode_info_v1::{JayHeadExtJayVrrModeInfoV1RequestHandler, Mode},
+            jay_head_manager_ext_jay_vrr_mode_info_v1::JayHeadManagerExtJayVrrModeInfoV1RequestHandler,
+        },
+    },
+    std::rc::Rc,
+};
+
+impl_jay_vrr_mode_info_v1! {
+    version = 1,
+    after_announce = after_announce,
+    after_transaction = after_transaction,
+}
+
+impl HeadName {
+    fn after_announce(&self, shared: &HeadState) {
+        self.send_mode(shared);
+    }
+
+    fn after_transaction(&self, shared: &HeadState, tran: &HeadState) {
+        if shared.vrr_mode != tran.vrr_mode {
+            self.send_mode(shared);
+        }
+    }
+
+    pub(in super::super) fn send_mode(&self, state: &HeadState) {
+        self.client.event(Mode {
+            self_id: self.id,
+            mode: state.vrr_mode.0,
+        });
+    }
+}
+
+impl JayHeadManagerExtJayVrrModeInfoV1RequestHandler for MgrName {
+    type Error = ErrorName;
+
+    mgr_common_req!();
+}
+
+impl JayHeadExtJayVrrModeInfoV1RequestHandler for HeadName {
+    type Error = ErrorName;
+
+    head_common_req!();
+}
+
+error!();

src/ifs/jay_randr.rs

@@ -419,8 +419,7 @@ impl JayRandrRequestHandler for JayRandr {
         let Some(c) = self.get_output_node(req.output) else {
             return Ok(());
         };
-        c.global.persistent.vrr_mode.set(mode);
+        c.set_vrr_mode(mode);
-        c.update_presentation_type();
         return Ok(());
     }
 

src/tasks/connector.rs

@@ -60,6 +60,7 @@ pub fn handle(state: &Rc<State>, connector: &Rc<dyn Connector>) {
         inherent_non_desktop: false,
         override_non_desktop: backend_state.non_desktop_override,
         vrr: backend_state.vrr,
+        vrr_mode: Default::default(),
         tearing_enabled: backend_state.tearing,
         tearing_active: false,
         format: backend_state.format,

src/tree/output.rs

@@ -1324,6 +1324,17 @@ impl OutputNode {
         }
         self.state.tree_changed();
     }
+
+    pub fn set_vrr_mode(&self, mode: &'static VrrMode) {
+        let old = self.global.persistent.vrr_mode.replace(mode);
+        if old != mode {
+            self.update_presentation_type();
+            self.global
+                .connector
+                .head_managers
+                .handle_vrr_mode_change(mode.to_config());
+        }
+    }
 }
 
 pub struct OutputTitle {

wire/jay_head_ext_jay_vrr_mode_info_v1.txt

@@ -0,0 +1,7 @@
+request destroy (destructor) {
+
+}
+
+event mode {
+    mode: u32,
+}

wire/jay_head_manager_ext_jay_vrr_mode_info_v1.txt

@@ -0,0 +1,7 @@
+request destroy (destructor) {
+
+}
+
+event head {
+    head: id(jay_head_ext_jay_vrr_mode_info_v1) (new),
+}