From 8ab7d9b715023144494026627fef2cb6424a6aef Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Mon, 12 Sep 2022 10:18:26 -0700 Subject: [PATCH] rutabaga_gfx: nuke fake capset All Android guests have been updated. BUG=b:239639751 TEST=compile Change-Id: Ic1d6e7bc338335d3afd36d8d70f6f291a24cc63f Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3892130 Auto-Submit: Gurchetan Singh Commit-Queue: Gurchetan Singh Reviewed-by: Daniel Verkamp Reviewed-by: Dennis Kempin --- rutabaga_gfx/src/rutabaga_core.rs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/rutabaga_gfx/src/rutabaga_core.rs b/rutabaga_gfx/src/rutabaga_core.rs index 7374ab0f10..8cfc2ff623 100644 --- a/rutabaga_gfx/src/rutabaga_core.rs +++ b/rutabaga_gfx/src/rutabaga_core.rs @@ -210,7 +210,7 @@ struct RutabagaCapsetInfo { pub name: &'static str, } -const RUTABAGA_CAPSETS: [RutabagaCapsetInfo; 7] = [ +const RUTABAGA_CAPSETS: [RutabagaCapsetInfo; 6] = [ RutabagaCapsetInfo { capset_id: RUTABAGA_CAPSET_VIRGL, component: RutabagaComponentType::VirglRenderer, @@ -236,11 +236,6 @@ const RUTABAGA_CAPSETS: [RutabagaCapsetInfo; 7] = [ component: RutabagaComponentType::CrossDomain, name: "cross-domain", }, - RutabagaCapsetInfo { - capset_id: 30, - component: RutabagaComponentType::CrossDomain, - name: "minigbm-cross-domain", - }, RutabagaCapsetInfo { capset_id: RUTABAGA_CAPSET_DRM, component: RutabagaComponentType::VirglRenderer, @@ -256,13 +251,6 @@ pub fn calculate_context_mask(context_names: Vec) -> u64 { }; }); - // TODO remove once - // https://android-review.googlesource.com/c/platform/external/minigbm/+/2101455 - // is picked back to rvc-arc branch: - if context_mask & (1 << RUTABAGA_CAPSET_DRM) != 0 { - context_mask |= 1 << 30; - } - context_mask } @@ -964,7 +952,6 @@ impl RutabagaBuilder { let cross_domain = CrossDomain::init(self.channels)?; rutabaga_components.insert(RutabagaComponentType::CrossDomain, cross_domain); push_capset(RUTABAGA_CAPSET_CROSS_DOMAIN); - push_capset(30); } Ok(Rutabaga {