From ea11f7623489534bf8122275b08e132a16ca6429 Mon Sep 17 00:00:00 2001
From: Jason Macnak <natsu@google.com>
Date: Mon, 22 Aug 2022 12:36:44 -0700
Subject: [PATCH] gpu: enable EDID for 2D mode

... to ensure consistent phyiscal display ids when
running Android with Cuttlefish across both 2D and 3D
modes.

BUG=b:242931783
TEST=boot Cuttlefish with 2D mode and EDID and interact
     with the displays

Change-Id: Iba0e786464a603c7e1264625ddf619b91b9099bc
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3846059
Reviewed-by: Kaiyi Li <kaiyili@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: Jason Macnak <natsu@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
---
 devices/src/virtio/gpu/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devices/src/virtio/gpu/mod.rs b/devices/src/virtio/gpu/mod.rs
index 0d5b207df4..ed73b693c9 100644
--- a/devices/src/virtio/gpu/mod.rs
+++ b/devices/src/virtio/gpu/mod.rs
@@ -1170,7 +1170,7 @@ impl VirtioDevice for Gpu {
 
     fn features(&self) -> u64 {
         let rutabaga_features = match self.rutabaga_component {
-            RutabagaComponentType::Rutabaga2D => 0,
+            RutabagaComponentType::Rutabaga2D => 1 << VIRTIO_GPU_F_EDID,
             _ => {
                 let mut features_3d = 0;