diff options
| author | Alistair Delva <adelva@google.com> | 2021-02-24 15:40:17 -0800 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2021-02-26 13:23:09 -0800 |
| commit | d31469fabc77c417b985762d839cc0221018bcf3 (patch) | |
| tree | 3244e3862dca6f3f1b5df2aa10d7036f22e684c1 | |
| parent | 0ec5853dcf4f67cec10cb1e23e2020882d1764e6 (diff) | |
| download | cuttlefish-d31469fabc77c417b985762d839cc0221018bcf3.tar.gz | |
Avoid checking FLAGS_gpu_mode for true GPU mode
The FLAGS_gpu_mode is "auto" by default, and it gets remapped in the
config object to another setting in various scenarios. This means this
block of code, which had been intended to be optional for swiftshader
or QEMU+swiftshader, was basically being enabled all the time.
It seems like defining the frames_server all the time causes no problem,
but setting the keyboard and touch servers up will break because there
is nothing listening on the other side.
Change-Id: Ia44d6a80000941a5e4a088ca81cf8f8f2398f1e0
| -rw-r--r-- | host/commands/assemble_cvd/flags.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/commands/assemble_cvd/flags.cc b/host/commands/assemble_cvd/flags.cc index 0ab72e00c..ae18ee671 100644 --- a/host/commands/assemble_cvd/flags.cc +++ b/host/commands/assemble_cvd/flags.cc @@ -650,8 +650,8 @@ CuttlefishConfig InitializeCuttlefishConfiguration( instance.set_audiocontrol_server_port(9410); /* OK to use the same port number across instances */ instance.set_config_server_port(calc_vsock_port(6800)); - if (FLAGS_gpu_mode != kGpuModeDrmVirgl && - FLAGS_gpu_mode != kGpuModeGfxStream) { + if (tmp_config_obj.gpu_mode() != kGpuModeDrmVirgl && + tmp_config_obj.gpu_mode() != kGpuModeGfxStream) { instance.set_frames_server_port(calc_vsock_port(6900)); if (FLAGS_vm_manager == QemuManager::name()) { instance.set_keyboard_server_port(calc_vsock_port(7000)); |