Allow minigbm gralloc to coexist with board gralloc. am: 3fbaca6783 am: ff234ae422

[android-x86/external-minigbm.git] / amdgpu.c

diff --git a/amdgpu.c b/amdgpu.c
index b01967a..ee556bc 100644 (file)
--- a/amdgpu.c
+++ b/amdgpu.c
@@ -33,12 +33,13 @@ struct amdgpu_priv {
        int drm_version;
 };
 
-const static uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888,     DRM_FORMAT_ARGB8888,
-                                                 DRM_FORMAT_RGB565,       DRM_FORMAT_XBGR8888,
-                                                 DRM_FORMAT_XBGR16161616, DRM_FORMAT_XRGB8888 };
+const static uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888,
+                                                 DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888,
+                                                 DRM_FORMAT_XRGB8888 };
 
-const static uint32_t texture_source_formats[] = { DRM_FORMAT_GR88, DRM_FORMAT_R8, DRM_FORMAT_NV21,
-                                                  DRM_FORMAT_NV12, DRM_FORMAT_YVU420_ANDROID };
+const static uint32_t texture_source_formats[] = { DRM_FORMAT_BGR888, DRM_FORMAT_GR88,
+                                                  DRM_FORMAT_R8,     DRM_FORMAT_NV21,
+                                                  DRM_FORMAT_NV12,   DRM_FORMAT_YVU420_ANDROID };
 
 static int amdgpu_init(struct driver *drv)
 {
@@ -158,14 +159,9 @@ static int amdgpu_create_bo(struct bo *bo, uint32_t width, uint32_t height, uint
        if (use_flags & (BO_USE_LINEAR | BO_USE_SW))
                gem_create.in.domain_flags |= AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
 
-       if (use_flags & (BO_USE_SCANOUT | BO_USE_CURSOR)) {
-               /* TODO(dbehr) do not use VRAM after we enable display VM */
-               gem_create.in.domains = AMDGPU_GEM_DOMAIN_VRAM;
-       } else {
-               gem_create.in.domains = AMDGPU_GEM_DOMAIN_GTT;
-               if (!(use_flags & BO_USE_SW_READ_OFTEN))
-                       gem_create.in.domain_flags |= AMDGPU_GEM_CREATE_CPU_GTT_USWC;
-       }
+       gem_create.in.domains = AMDGPU_GEM_DOMAIN_GTT;
+       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. */