OSDN Git Service

amdgpu: Don't use AMDGPU_GEM_CREATE_EXPLICIT_SYNC flag.
authorDeepak Sharma <Deepak.Sharma@amd.com>
Fri, 9 Nov 2018 22:12:04 +0000 (14:12 -0800)
committerchrome-bot <chrome-bot@chromium.org>
Sat, 17 Nov 2018 20:00:08 +0000 (12:00 -0800)
some of the android.media.cts.EncodeDecodeTest in media test are
failing when enabled.

Bug=b:115585732
TEST=run android.media.cts.EncodeDecodeTest tests

Change-Id: Id54236a4441e6441bd8500a81f83c00e2fa405d8
Signed-off-by: Deepak Sharma <Deepak.Sharma@amd.com>
Reviewed-on: https://chromium-review.googlesource.com/1329993
Commit-Ready: Deepak Sharma <deepak.sharma@amd.com>
Tested-by: Deepak Sharma <deepak.sharma@amd.com>
Reviewed-by: Bas Nieuwenhuizen <basni@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
amdgpu.c

index 5c94f37..add4c20 100644 (file)
--- a/amdgpu.c
+++ b/amdgpu.c
@@ -137,7 +137,6 @@ static int amdgpu_create_bo(struct bo *bo, uint32_t width, uint32_t height, uint
        uint32_t plane, stride;
        struct combination *combo;
        union drm_amdgpu_gem_create gem_create;
-       struct amdgpu_priv *priv = bo->drv->priv;
 
        combo = drv_get_combination(bo->drv, format, use_flags);
        if (!combo)
@@ -177,12 +176,6 @@ static int amdgpu_create_bo(struct bo *bo, uint32_t width, uint32_t height, uint
        if (!(use_flags & (BO_USE_SW_READ_OFTEN | BO_USE_SCANOUT)))
                gem_create.in.domain_flags |= AMDGPU_GEM_CREATE_CPU_GTT_USWC;
 
-       /* If drm_version >= 21 everything exposes explicit synchronization primitives
-          and chromeos/arc++ will use them. Disable implicit synchronization. */
-       if (priv->drm_version >= 21) {
-               gem_create.in.domain_flags |= AMDGPU_GEM_CREATE_EXPLICIT_SYNC;
-       }
-
        /* Allocate the buffer with the preferred heap. */
        ret = drmCommandWriteRead(drv_get_fd(bo->drv), DRM_AMDGPU_GEM_CREATE, &gem_create,
                                  sizeof(gem_create));