msm: Clear all sw use flags for UBWC combinations

Whether rarely or often, we can't support any kind of sw access if the
buffer is UBWC compressed.  We could potentially add support for
blitting in and out of the buffer, but for now just allocate linear.

BUG=b:167934919
TEST=Buffers allocated with any SW access use flag don't get UBWC

Change-Id: Ic9c1d86a124e24b7bc4aa259c62d8c4882c487b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/2397084
Tested-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Reviewed-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Kristian H. Kristensen <hoegsberg@chromium.org>

diff --git a/msm.c b/msm.c
index 07ed7c7..ac23b73 100644 (file)
--- a/msm.c
+++ b/msm.c
@@ -186,7 +186,7 @@ static int msm_init(struct driver *drv)
        struct format_metadata metadata;
        uint64_t render_use_flags = BO_USE_RENDER_MASK | BO_USE_SCANOUT;
        uint64_t texture_use_flags = BO_USE_TEXTURE_MASK | BO_USE_HW_VIDEO_DECODER;
-       uint64_t sw_flags = (BO_USE_RENDERSCRIPT | BO_USE_SW_WRITE_OFTEN | BO_USE_SW_READ_OFTEN |
+       uint64_t sw_flags = (BO_USE_RENDERSCRIPT | BO_USE_SW_MASK |
                             BO_USE_LINEAR | BO_USE_PROTECTED);
 
        drv_add_combinations(drv, render_target_formats, ARRAY_SIZE(render_target_formats),