mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-10 12:09:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "rutabaga_gfx: Support for cached mappings on msm"

Browse source 
This reverts commit 84e4fbc2be.

Reason for revert: cts regression in b/247131923

Original change's description:
> rutabaga_gfx: Support for cached mappings on msm
>
> This is a stop gap solution until we have some way for the kernel to
> report mapping info to crosvm.  But since on arm devices without FWB,
> the mapping attributes are the more restrictive of the S1 and S2
> mappings, for now we can just map them as cached in the S2 pgtables.
>
> BUG=b:239718180
> TEST=cts-tradefed run cts -m CtsVideoTestCases -t android.video.cts.VideoEncoderDecoderTest#testAvcGoog0Perf0320x0240
>
> Change-Id: Ib3f085fd8da768b58e7a6d8deadf3a16c7cbcc4c
> Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3832355
> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
> Auto-Submit: Rob Clark <robdclark@chromium.org>
> Commit-Queue: Rob Clark <robdclark@chromium.org>
> Tested-by: Rob Clark <robdclark@chromium.org>

BUG=b:247131923
TEST=BasicVulkanGpuTest

Change-Id: I6566ab033840a5f9bd99dca7cbecfc1f42a5c363
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3903099
Commit-Queue: Yiwei Zhang <zzyiwei@chromium.org>
Auto-Submit: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Yiwei Zhang 2022-09-19 04:48:24 +00:00 committed by crosvm LUCI
parent 2d7d5e99c2
commit b896f0a153
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
rutabaga_gfx/src/rutabaga_gralloc/minigbm.rs
View file

@ -114,13 +114,7 @@ impl Gralloc for MinigbmDevice {
// perhaps minigbm will be deprecated by then. Other display drivers (rockchip, mediatek, // perhaps minigbm will be deprecated by then. Other display drivers (rockchip, mediatek,
// amdgpu) typically use write combine memory. We can also consider use flags too if this // amdgpu) typically use write combine memory. We can also consider use flags too if this
// heuristic proves insufficient. // heuristic proves insufficient.
// if self.device_name == "i915" {
// Existing qcom devices use a mix of cached and WC buffers. We don't *yet* have a good
// way to differentiate, but https://patchwork.freedesktop.org/series/106847/ is a proposal
// to fix that. But existing devices without the FWB feature, the resulting mapping attrs
// are the more restrictive of the combination for S1 and S2 mappings. So if we map as
// cached in S2 pgtables, but S1 has WC, then the result will be WC.
if self.device_name == "i915" || self.device_name == "msm" {
reqs.map_info = RUTABAGA_MAP_CACHE_CACHED; reqs.map_info = RUTABAGA_MAP_CACHE_CACHED;
} else { } else {
reqs.map_info = RUTABAGA_MAP_CACHE_WC; reqs.map_info = RUTABAGA_MAP_CACHE_WC;