Revert "gpu: Add parameter for a custom cursor file"

This reverts commit 2744e5fef6.

Reason for revert: This cmd line param is no longer being used

BUG=b:364906315

Original change's description:
> gpu: Add parameter for a custom cursor file
>
> This will be used to display a custom mouse cursor for Surfaces. This CL
> won't change any functionality
>
> BUG=b:362814745
> TEST=builds and presubmits
>
> Change-Id: If4e5a41bdaa92fecf680aa09fe8e2ca154946d07
> Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5825087
> Reviewed-by: Noah Gold <nkgold@google.com>
> Commit-Queue: Richard Zhang <rizhang@google.com>
> Reviewed-by: Pujun Lun <lunpujun@google.com>

Bug: b:362814745
Change-Id: Ib975f92e96e3adb07e1fa27d1a5e6c870e76881a
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5876365
Commit-Queue: Richard Zhang <rizhang@google.com>
Reviewed-by: Noah Gold <nkgold@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>

devices/src/virtio/gpu/mod.rs

@@ -247,7 +247,6 @@ fn build(
     #[cfg(windows)] wndproc_thread: &mut Option<WindowProcedureThread>,
     udmabuf: bool,
     #[cfg(windows)] gpu_display_wait_descriptor_ctrl_wr: SendTube,
-    #[cfg(windows)] custom_cursor_path: Option<String>,
 ) -> Option<VirtioGpu> {
     let mut display_opt = None;
     for display_backend in display_backends {
@@ -258,8 +257,6 @@ fn build(
             gpu_display_wait_descriptor_ctrl_wr
                 .try_clone()
                 .expect("failed to clone wait context ctrl channel"),
-            #[cfg(windows)]
-            custom_cursor_path.clone(),
         ) {
             Ok(c) => {
                 display_opt = Some(c);
@@ -1135,7 +1132,6 @@ impl DisplayBackend {
         &self,
         #[cfg(windows)] wndproc_thread: &mut Option<WindowProcedureThread>,
         #[cfg(windows)] gpu_display_wait_descriptor_ctrl: SendTube,
-        #[cfg(windows)] custom_cursor_path: Option<String>,
     ) -> std::result::Result<GpuDisplay, GpuDisplayError> {
         match self {
             #[cfg(any(target_os = "android", target_os = "linux"))]
@@ -1150,7 +1146,6 @@ impl DisplayBackend {
                     /* win_metrics= */ None,
                     gpu_display_wait_descriptor_ctrl,
                     None,
-                    custom_cursor_path,
                 ),
                 None => {
                     error!("wndproc_thread is none");
@@ -1216,9 +1211,6 @@ pub struct Gpu {
     /// sets this to true while stopping the worker.
     sleep_requested: Arc<AtomicBool>,
     worker_snapshot: Option<WorkerSnapshot>,
-    // Path for the bigger more visible custom cursor.
-    #[cfg(windows)]
-    custom_cursor_path: Option<String>,
 }
 
 impl Gpu {
@@ -1325,8 +1317,6 @@ impl Gpu {
             gpu_cgroup_path: gpu_cgroup_path.cloned(),
             sleep_requested: Arc::new(AtomicBool::new(false)),
             worker_snapshot: None,
-            #[cfg(windows)]
-            custom_cursor_path: gpu_parameters.custom_cursor_path.clone(),
         }
     }
 
@@ -1364,8 +1354,6 @@ impl Gpu {
             self.gpu_display_wait_descriptor_ctrl_wr
                 .try_clone()
                 .expect("failed to clone wait context control channel"),
-            #[cfg(windows)]
-            self.custom_cursor_path.take(),
         )?;
 
         for event_device in self.event_devices.take().expect("missing event_devices") {
@@ -1436,9 +1424,6 @@ impl Gpu {
         let (activate_tx, activate_rx) = mpsc::channel();
         let sleep_requested = self.sleep_requested.clone();
 
-        #[cfg(windows)]
-        let custom_cursor_path = self.custom_cursor_path.take();
-
         let worker_thread = WorkerThread::start("v_gpu", move |kill_evt| {
             #[cfg(any(target_os = "android", target_os = "linux"))]
             if let Some(cgroup_path) = gpu_cgroup_path {
@@ -1478,8 +1463,6 @@ impl Gpu {
                 udmabuf,
                 #[cfg(windows)]
                 gpu_display_wait_descriptor_ctrl_wr,
-                #[cfg(windows)]
-                custom_cursor_path,
             ) {
                 Some(backend) => backend,
                 None => {

devices/src/virtio/gpu/parameters.rs

@@ -89,8 +89,6 @@ pub struct GpuParameters {
     pub allow_implicit_render_server_exec: bool,
     // Passthrough parameters sent to the underlying renderer in a renderer-specific format.
     pub renderer_features: Option<String>,
-    // Path to the custom cursor file.
-    pub custom_cursor_path: Option<String>,
 }
 
 impl Default for GpuParameters {
@@ -122,7 +120,6 @@ impl Default for GpuParameters {
             fixed_blob_mapping: cfg!(target_os = "linux") && !cfg!(feature = "gfxstream"),
             allow_implicit_render_server_exec: false,
             renderer_features: None,
-            custom_cursor_path: None,
         }
     }
 }

gpu_display/src/gpu_display_win/mod.rs

@@ -85,9 +85,6 @@ pub struct DisplayWin {
     vulkan_displays: HashMap<u32, Arc<Mutex<VulkanDisplayWrapper>>>,
     #[allow(dead_code)]
     vulkan_display_create_params: Option<VulkanCreateParams>,
-    // TODO(b/362813373): remove dead_code attr when handled.
-    #[allow(dead_code)]
-    custom_cursor_path: Option<String>,
 }
 
 impl DisplayWin {
@@ -96,7 +93,6 @@ impl DisplayWin {
         win_metrics: Option<Weak<Metrics>>,
         gpu_display_wait_descriptor_ctrl: SendTube,
         vulkan_display_create_params: Option<VulkanCreateParams>,
-        custom_cursor_path: Option<String>,
     ) -> Result<DisplayWin, GpuDisplayError> {
         let close_requested_event =
             wndproc_thread
@@ -114,7 +110,6 @@ impl DisplayWin {
             event_device_wait_descriptor_requests: Vec::new(),
             vulkan_displays: HashMap::new(),
             vulkan_display_create_params,
-            custom_cursor_path,
         })
     }
 

gpu_display/src/sys/windows.rs

@@ -66,7 +66,6 @@ pub trait WinGpuDisplayExt {
         win_metrics: Option<Weak<Metrics>>,
         gpu_display_wait_descriptor_ctrl: SendTube,
         vulkan_display_create_params: Option<VulkanCreateParams>,
-        custom_cursor_path: Option<String>,
     ) -> GpuDisplayResult<GpuDisplay>;
 }
 
@@ -76,14 +75,12 @@ impl WinGpuDisplayExt for GpuDisplay {
         win_metrics: Option<Weak<Metrics>>,
         gpu_display_wait_descriptor_ctrl: SendTube,
         vulkan_display_create_params: Option<VulkanCreateParams>,
-        custom_cursor_path: Option<String>,
     ) -> GpuDisplayResult<GpuDisplay> {
         let display = DisplayWin::new(
             wndproc_thread,
             win_metrics,
             gpu_display_wait_descriptor_ctrl,
             vulkan_display_create_params,
-            custom_cursor_path,
         )?;
 
         let wait_ctx = WaitContext::new()?;