From 99387a717603e7d65308eba9d46f1e413b5fa565 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Thu, 15 Sep 2022 10:26:11 -0700 Subject: [PATCH] Revert "minigbm/msm: disable UBWC for virtualization" This reverts commit 7a1a7dbda342415279f01eccb728803446ab3250. BUG=b:243681772 TEST=confirm UBWC usage in arcvm Cq-Depend: chromium:3900312 Change-Id: I126353bd91b75b7656257da00bc6fdf7d4c17060 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3900553 Reviewed-by: Chia-I Wu Reviewed-by: Ryan Neph Auto-Submit: Rob Clark Tested-by: Rob Clark Commit-Queue: Rob Clark --- msm.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/msm.c b/msm.c index 27f85d9..e696686 100644 --- a/msm.c +++ b/msm.c @@ -209,21 +209,6 @@ static bool should_avoid_ubwc(void) drv_logi("WARNING: waffle detected, disabling UBWC\n"); return true; } - - /* Sommelier relies on implicit modifier, which does not pass host modifier to - * zwp_linux_buffer_params_v1_add. Graphics will be broken if UBWC is enabled. - * Sommelier shall be fixed to mirror what arc wayland_service does, and then - * we can re-enable UBWC here. - * - * Inherit the trick from crrev/c/2523246 previously used for gtest. The side - * effect is all VM guests on msm will revert back to use linear modifier. - * - * See b/229147702 - */ - if (!dlsym(RTLD_DEFAULT, "cupsFilePrintf")) { - drv_logi("WARNING: virtualization detected, disabling UBWC\n"); - return true; - } #endif return false; }