diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_sa.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_sa.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c index 0abe5a9431bb..f0bac68254b7 100644 --- a/drivers/gpu/drm/radeon/radeon_sa.c +++ b/drivers/gpu/drm/radeon/radeon_sa.c | |||
@@ -49,7 +49,7 @@ static void radeon_sa_bo_try_free(struct radeon_sa_manager *sa_manager); | |||
49 | 49 | ||
50 | int radeon_sa_bo_manager_init(struct radeon_device *rdev, | 50 | int radeon_sa_bo_manager_init(struct radeon_device *rdev, |
51 | struct radeon_sa_manager *sa_manager, | 51 | struct radeon_sa_manager *sa_manager, |
52 | unsigned size, u32 domain) | 52 | unsigned size, u32 align, u32 domain) |
53 | { | 53 | { |
54 | int i, r; | 54 | int i, r; |
55 | 55 | ||
@@ -57,13 +57,14 @@ int radeon_sa_bo_manager_init(struct radeon_device *rdev, | |||
57 | sa_manager->bo = NULL; | 57 | sa_manager->bo = NULL; |
58 | sa_manager->size = size; | 58 | sa_manager->size = size; |
59 | sa_manager->domain = domain; | 59 | sa_manager->domain = domain; |
60 | sa_manager->align = align; | ||
60 | sa_manager->hole = &sa_manager->olist; | 61 | sa_manager->hole = &sa_manager->olist; |
61 | INIT_LIST_HEAD(&sa_manager->olist); | 62 | INIT_LIST_HEAD(&sa_manager->olist); |
62 | for (i = 0; i < RADEON_NUM_RINGS; ++i) { | 63 | for (i = 0; i < RADEON_NUM_RINGS; ++i) { |
63 | INIT_LIST_HEAD(&sa_manager->flist[i]); | 64 | INIT_LIST_HEAD(&sa_manager->flist[i]); |
64 | } | 65 | } |
65 | 66 | ||
66 | r = radeon_bo_create(rdev, size, RADEON_GPU_PAGE_SIZE, true, | 67 | r = radeon_bo_create(rdev, size, align, true, |
67 | domain, NULL, &sa_manager->bo); | 68 | domain, NULL, &sa_manager->bo); |
68 | if (r) { | 69 | if (r) { |
69 | dev_err(rdev->dev, "(%d) failed to allocate bo for manager\n", r); | 70 | dev_err(rdev->dev, "(%d) failed to allocate bo for manager\n", r); |
@@ -317,7 +318,7 @@ int radeon_sa_bo_new(struct radeon_device *rdev, | |||
317 | unsigned tries[RADEON_NUM_RINGS]; | 318 | unsigned tries[RADEON_NUM_RINGS]; |
318 | int i, r; | 319 | int i, r; |
319 | 320 | ||
320 | BUG_ON(align > RADEON_GPU_PAGE_SIZE); | 321 | BUG_ON(align > sa_manager->align); |
321 | BUG_ON(size > sa_manager->size); | 322 | BUG_ON(size > sa_manager->size); |
322 | 323 | ||
323 | *sa_bo = kmalloc(sizeof(struct radeon_sa_bo), GFP_KERNEL); | 324 | *sa_bo = kmalloc(sizeof(struct radeon_sa_bo), GFP_KERNEL); |