amdgpu: stop checking flag masks
authorChristian König <christian.koenig@amd.com>
Tue, 19 May 2015 14:06:50 +0000 (16:06 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 5 Aug 2015 17:47:50 +0000 (13:47 -0400)
The kernel is responsible for parameter checking, not libdrm.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Monk Liu <monk.liu@amd.com>
amdgpu/amdgpu_bo.c
include/drm/amdgpu_drm.h

index f8d9c87..f797234 100644 (file)
@@ -134,8 +134,8 @@ int amdgpu_bo_alloc(amdgpu_device_handle dev,
        args.in.alignment = alloc_buffer->phys_alignment;
 
        /* Set the placement. */
-       args.in.domains = heap & AMDGPU_GEM_DOMAIN_MASK;
-       args.in.domain_flags = alloc_buffer->flags & AMDGPU_GEM_CREATE_CPU_GTT_MASK;
+       args.in.domains = heap;
+       args.in.domain_flags = alloc_buffer->flags;
 
        /* Allocate the buffer with the preferred heap. */
        r = drmCommandWriteRead(dev->fd, DRM_AMDGPU_GEM_CREATE,
index dc4caf1..03e46b0 100644 (file)
@@ -67,8 +67,6 @@
 #define AMDGPU_GEM_DOMAIN_GWS          0x10
 #define AMDGPU_GEM_DOMAIN_OA           0x20
 
-#define AMDGPU_GEM_DOMAIN_MASK         0x3F
-
 /* Flag that CPU access will be required for the case of VRAM domain */
 #define AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED  (1 << 0)
 /* Flag that CPU access will not work, this VRAM domain is invisible */
 /* Flag that USWC attributes should be used for GTT */
 #define AMDGPU_GEM_CREATE_CPU_GTT_USWC         (1 << 2)
 
-/* Flag mask for GTT domain_flags */
-#define AMDGPU_GEM_CREATE_CPU_GTT_MASK \
-       (AMDGPU_GEM_CREATE_CPU_GTT_USWC | \
-        AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | \
-        AMDGPU_GEM_CREATE_NO_CPU_ACCESS)
-
 struct drm_amdgpu_gem_create_in  {
        /** the requested memory size */
        uint64_t bo_size;