Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next

Updates for 5.1:
- GDS fixes
- Add AMDGPU_CHUNK_ID_SCHEDULED_DEPENDENCIES interface
- GPUVM fixes
- PCIE DPM switching fixes for vega20
- Vega10 uclk DPM regression fix
- DC Freesync fixes
- DC ABM fixes
- Various DC cleanups

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190208210214.27666-1-alexander.deucher@amd.com

1 files changed, 12 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 728e15e5d68a..fd9c4beeaaa4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -426,12 +426,20 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
         size_t acc_size;
         int r;
 
-        page_align = roundup(bp->byte_align, PAGE_SIZE) >> PAGE_SHIFT;
-        if (bp->domain & (AMDGPU_GEM_DOMAIN_GDS | AMDGPU_GEM_DOMAIN_GWS |
-                          AMDGPU_GEM_DOMAIN_OA))
+        /* Note that GDS/GWS/OA allocates 1 page per byte/resource. */
+        if (bp->domain & (AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA)) {
+                /* GWS and OA don't need any alignment. */
+                page_align = bp->byte_align;
                 size <<= PAGE_SHIFT;
-        else
+        } else if (bp->domain & AMDGPU_GEM_DOMAIN_GDS) {
+                /* Both size and alignment must be a multiple of 4. */
+                page_align = ALIGN(bp->byte_align, 4);
+                size = ALIGN(size, 4) << PAGE_SHIFT;
+        } else {
+                /* Memory should be aligned at least to a page size. */
+                page_align = ALIGN(bp->byte_align, PAGE_SIZE) >> PAGE_SHIFT;
                 size = ALIGN(size, PAGE_SIZE);
+        }
 
         if (!amdgpu_bo_validate_size(adev, size, bp->domain))
                 return -ENOMEM;