[PATCH 2/4] drm/ttm: remove persistent_swap_storage argument from ttm_bo_init/ttm_bo_create

2012-11-07 Thread Thomas Hellstrom 
On 11/06/2012 10:49 PM, Marcin Slusarz wrote:
> All drivers pass NULL here. ttm_buffer_object's field can still be set after
> init, just like nouveau does.
>
> Signed-off-by: Marcin Slusarz 
> Cc: Thomas Hellstrom 
> ---
>   drivers/gpu/drm/ast/ast_ttm.c|  7 +++
>   drivers/gpu/drm/cirrus/cirrus_ttm.c  |  2 +-
>   drivers/gpu/drm/mgag200/mgag200_ttm.c|  2 +-
>   drivers/gpu/drm/nouveau/nouveau_bo.c |  7 +++
>   drivers/gpu/drm/radeon/radeon_object.c   |  6 +++---
>   drivers/gpu/drm/ttm/ttm_bo.c |  7 ++-
>   drivers/gpu/drm/vmwgfx/vmwgfx_drv.c  |  3 +--
>   drivers/gpu/drm/vmwgfx/vmwgfx_resource.c |  8 +++-
>   include/drm/ttm/ttm_bo_api.h | 16 +++-
>   9 files changed, 20 insertions(+), 38 deletions(-)
>
> diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
> index 0a54f65..c6dcc84 100644
> --- a/drivers/gpu/drm/ast/ast_ttm.c
> +++ b/drivers/gpu/drm/ast/ast_ttm.c
> @@ -354,10 +354,9 @@ int ast_bo_create(struct drm_device *dev, int size, int 
> align,
>   acc_size = ttm_bo_dma_acc_size(>ttm.bdev, size,
>  sizeof(struct ast_bo));
>   
> - ret = ttm_bo_init(>ttm.bdev, >bo, size,
> -   ttm_bo_type_device, >placement,
> -   align >> PAGE_SHIFT, false, NULL, acc_size,
> -   NULL, ast_bo_ttm_destroy);
> + ret = ttm_bo_init(>ttm.bdev, >bo, size, ttm_bo_type_device,
> +   >placement, align >> PAGE_SHIFT, false,
> +   acc_size, NULL, ast_bo_ttm_destroy);
>   if (ret)
>   return ret;
>   
> diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c 
> b/drivers/gpu/drm/cirrus/cirrus_ttm.c
> index 90d7701..65e665f 100644
> --- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
> +++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
> @@ -361,7 +361,7 @@ int cirrus_bo_create(struct drm_device *dev, int size, 
> int align,
>   
>   ret = ttm_bo_init(>ttm.bdev, >bo, size,
> ttm_bo_type_device, >placement,
> -   align >> PAGE_SHIFT, false, NULL, acc_size,
> +   align >> PAGE_SHIFT, false, acc_size,
> NULL, cirrus_bo_ttm_destroy);
>   if (ret)
>   return ret;
> diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c 
> b/drivers/gpu/drm/mgag200/mgag200_ttm.c
> index 49d60a6..be121d1 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
> @@ -355,7 +355,7 @@ int mgag200_bo_create(struct drm_device *dev, int size, 
> int align,
>   
>   ret = ttm_bo_init(>ttm.bdev, >bo, size,
> ttm_bo_type_device, >placement,
> -   align >> PAGE_SHIFT, false, NULL, acc_size,
> +   align >> PAGE_SHIFT, false, acc_size,
> NULL, mgag200_bo_ttm_destroy);
>   if (ret)
>   return ret;
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c 
> b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index 3cbf1a8..82f0f3c 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -223,10 +223,9 @@ nouveau_bo_new(struct drm_device *dev, int size, int 
> align,
>   acc_size = ttm_bo_dma_acc_size(>ttm.bdev, size,
>  sizeof(struct nouveau_bo));
>   
> - ret = ttm_bo_init(>ttm.bdev, >bo, size,
> -   type, >placement,
> -   align >> PAGE_SHIFT, false, NULL, acc_size, sg,
> -   nouveau_bo_del_ttm);
> + ret = ttm_bo_init(>ttm.bdev, >bo, size, type,
> +   >placement, align >> PAGE_SHIFT, false,
> +   acc_size, sg, nouveau_bo_del_ttm);
>   if (ret) {
>   /* ttm will call nouveau_bo_del_ttm if it fails.. */
>   return ret;
> diff --git a/drivers/gpu/drm/radeon/radeon_object.c 
> b/drivers/gpu/drm/radeon/radeon_object.c
> index 0665845..834b291 100644
> --- a/drivers/gpu/drm/radeon/radeon_object.c
> +++ b/drivers/gpu/drm/radeon/radeon_object.c
> @@ -139,9 +139,9 @@ int radeon_bo_create(struct radeon_device *rdev,
>   radeon_ttm_placement_from_domain(bo, domain);
>   /* Kernel allocation are uninterruptible */
>   down_read(>pm.mclk_lock);
> - r = ttm_bo_init(>mman.bdev, >tbo, size, type,
> - >placement, page_align, !kernel, NULL,
> - acc_size, sg, _ttm_bo_destroy);
> + r = ttm_bo_init(>mman.bdev, >tbo, size, type, >placement,
> + page_align, !kernel, acc_size, sg,
> + _ttm_bo_destroy);
>   up_read(>pm.mclk_lock);
>   if (unlikely(r != 0)) {
>   return r;
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 27a2d3f..412486c 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -1180,7 +1180,6 @@ int

Re: [PATCH 2/4] drm/ttm: remove persistent_swap_storage argument from ttm_bo_init/ttm_bo_create

2012-11-07 Thread Thomas Hellstrom 

On 11/06/2012 10:49 PM, Marcin Slusarz wrote:

All drivers pass NULL here. ttm_buffer_object's field can still be set after
init, just like nouveau does.

Signed-off-by: Marcin Slusarz marcin.slus...@gmail.com
Cc: Thomas Hellstrom thellst...@vmware.com
---
  drivers/gpu/drm/ast/ast_ttm.c|  7 +++
  drivers/gpu/drm/cirrus/cirrus_ttm.c  |  2 +-
  drivers/gpu/drm/mgag200/mgag200_ttm.c|  2 +-
  drivers/gpu/drm/nouveau/nouveau_bo.c |  7 +++
  drivers/gpu/drm/radeon/radeon_object.c   |  6 +++---
  drivers/gpu/drm/ttm/ttm_bo.c |  7 ++-
  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c  |  3 +--
  drivers/gpu/drm/vmwgfx/vmwgfx_resource.c |  8 +++-
  include/drm/ttm/ttm_bo_api.h | 16 +++-
  9 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
index 0a54f65..c6dcc84 100644
--- a/drivers/gpu/drm/ast/ast_ttm.c
+++ b/drivers/gpu/drm/ast/ast_ttm.c
@@ -354,10 +354,9 @@ int ast_bo_create(struct drm_device *dev, int size, int 
align,
acc_size = ttm_bo_dma_acc_size(ast-ttm.bdev, size,
   sizeof(struct ast_bo));
  
-	ret = ttm_bo_init(ast-ttm.bdev, astbo-bo, size,

- ttm_bo_type_device, astbo-placement,
- align  PAGE_SHIFT, false, NULL, acc_size,
- NULL, ast_bo_ttm_destroy);
+   ret = ttm_bo_init(ast-ttm.bdev, astbo-bo, size, ttm_bo_type_device,
+ astbo-placement, align  PAGE_SHIFT, false,
+ acc_size, NULL, ast_bo_ttm_destroy);
if (ret)
return ret;
  
diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c

index 90d7701..65e665f 100644
--- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
+++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
@@ -361,7 +361,7 @@ int cirrus_bo_create(struct drm_device *dev, int size, int 
align,
  
  	ret = ttm_bo_init(cirrus-ttm.bdev, cirrusbo-bo, size,

  ttm_bo_type_device, cirrusbo-placement,
- align  PAGE_SHIFT, false, NULL, acc_size,
+ align  PAGE_SHIFT, false, acc_size,
  NULL, cirrus_bo_ttm_destroy);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c 
b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index 49d60a6..be121d1 100644
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -355,7 +355,7 @@ int mgag200_bo_create(struct drm_device *dev, int size, int 
align,
  
  	ret = ttm_bo_init(mdev-ttm.bdev, mgabo-bo, size,

  ttm_bo_type_device, mgabo-placement,
- align  PAGE_SHIFT, false, NULL, acc_size,
+ align  PAGE_SHIFT, false, acc_size,
  NULL, mgag200_bo_ttm_destroy);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c 
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 3cbf1a8..82f0f3c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -223,10 +223,9 @@ nouveau_bo_new(struct drm_device *dev, int size, int align,
acc_size = ttm_bo_dma_acc_size(drm-ttm.bdev, size,
   sizeof(struct nouveau_bo));
  
-	ret = ttm_bo_init(drm-ttm.bdev, nvbo-bo, size,

- type, nvbo-placement,
- align  PAGE_SHIFT, false, NULL, acc_size, sg,
- nouveau_bo_del_ttm);
+   ret = ttm_bo_init(drm-ttm.bdev, nvbo-bo, size, type,
+ nvbo-placement, align  PAGE_SHIFT, false,
+ acc_size, sg, nouveau_bo_del_ttm);
if (ret) {
/* ttm will call nouveau_bo_del_ttm if it fails.. */
return ret;
diff --git a/drivers/gpu/drm/radeon/radeon_object.c 
b/drivers/gpu/drm/radeon/radeon_object.c
index 0665845..834b291 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -139,9 +139,9 @@ int radeon_bo_create(struct radeon_device *rdev,
radeon_ttm_placement_from_domain(bo, domain);
/* Kernel allocation are uninterruptible */
down_read(rdev-pm.mclk_lock);
-   r = ttm_bo_init(rdev-mman.bdev, bo-tbo, size, type,
-   bo-placement, page_align, !kernel, NULL,
-   acc_size, sg, radeon_ttm_bo_destroy);
+   r = ttm_bo_init(rdev-mman.bdev, bo-tbo, size, type, bo-placement,
+   page_align, !kernel, acc_size, sg,
+   radeon_ttm_bo_destroy);
up_read(rdev-pm.mclk_lock);
if (unlikely(r != 0)) {
return r;
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 27a2d3f..412486c 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1180,7

[PATCH 2/4] drm/ttm: remove persistent_swap_storage argument from ttm_bo_init/ttm_bo_create

2012-11-06 Thread Marcin Slusarz 
All drivers pass NULL here. ttm_buffer_object's field can still be set after
init, just like nouveau does.

Signed-off-by: Marcin Slusarz 
Cc: Thomas Hellstrom 
---
 drivers/gpu/drm/ast/ast_ttm.c|  7 +++
 drivers/gpu/drm/cirrus/cirrus_ttm.c  |  2 +-
 drivers/gpu/drm/mgag200/mgag200_ttm.c|  2 +-
 drivers/gpu/drm/nouveau/nouveau_bo.c |  7 +++
 drivers/gpu/drm/radeon/radeon_object.c   |  6 +++---
 drivers/gpu/drm/ttm/ttm_bo.c |  7 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c  |  3 +--
 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c |  8 +++-
 include/drm/ttm/ttm_bo_api.h | 16 +++-
 9 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
index 0a54f65..c6dcc84 100644
--- a/drivers/gpu/drm/ast/ast_ttm.c
+++ b/drivers/gpu/drm/ast/ast_ttm.c
@@ -354,10 +354,9 @@ int ast_bo_create(struct drm_device *dev, int size, int 
align,
acc_size = ttm_bo_dma_acc_size(>ttm.bdev, size,
   sizeof(struct ast_bo));

-   ret = ttm_bo_init(>ttm.bdev, >bo, size,
- ttm_bo_type_device, >placement,
- align >> PAGE_SHIFT, false, NULL, acc_size,
- NULL, ast_bo_ttm_destroy);
+   ret = ttm_bo_init(>ttm.bdev, >bo, size, ttm_bo_type_device,
+ >placement, align >> PAGE_SHIFT, false,
+ acc_size, NULL, ast_bo_ttm_destroy);
if (ret)
return ret;

diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c 
b/drivers/gpu/drm/cirrus/cirrus_ttm.c
index 90d7701..65e665f 100644
--- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
+++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
@@ -361,7 +361,7 @@ int cirrus_bo_create(struct drm_device *dev, int size, int 
align,

ret = ttm_bo_init(>ttm.bdev, >bo, size,
  ttm_bo_type_device, >placement,
- align >> PAGE_SHIFT, false, NULL, acc_size,
+ align >> PAGE_SHIFT, false, acc_size,
  NULL, cirrus_bo_ttm_destroy);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c 
b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index 49d60a6..be121d1 100644
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -355,7 +355,7 @@ int mgag200_bo_create(struct drm_device *dev, int size, int 
align,

ret = ttm_bo_init(>ttm.bdev, >bo, size,
  ttm_bo_type_device, >placement,
- align >> PAGE_SHIFT, false, NULL, acc_size,
+ align >> PAGE_SHIFT, false, acc_size,
  NULL, mgag200_bo_ttm_destroy);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c 
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 3cbf1a8..82f0f3c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -223,10 +223,9 @@ nouveau_bo_new(struct drm_device *dev, int size, int align,
acc_size = ttm_bo_dma_acc_size(>ttm.bdev, size,
   sizeof(struct nouveau_bo));

-   ret = ttm_bo_init(>ttm.bdev, >bo, size,
- type, >placement,
- align >> PAGE_SHIFT, false, NULL, acc_size, sg,
- nouveau_bo_del_ttm);
+   ret = ttm_bo_init(>ttm.bdev, >bo, size, type,
+ >placement, align >> PAGE_SHIFT, false,
+ acc_size, sg, nouveau_bo_del_ttm);
if (ret) {
/* ttm will call nouveau_bo_del_ttm if it fails.. */
return ret;
diff --git a/drivers/gpu/drm/radeon/radeon_object.c 
b/drivers/gpu/drm/radeon/radeon_object.c
index 0665845..834b291 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -139,9 +139,9 @@ int radeon_bo_create(struct radeon_device *rdev,
radeon_ttm_placement_from_domain(bo, domain);
/* Kernel allocation are uninterruptible */
down_read(>pm.mclk_lock);
-   r = ttm_bo_init(>mman.bdev, >tbo, size, type,
-   >placement, page_align, !kernel, NULL,
-   acc_size, sg, _ttm_bo_destroy);
+   r = ttm_bo_init(>mman.bdev, >tbo, size, type, >placement,
+   page_align, !kernel, acc_size, sg,
+   _ttm_bo_destroy);
up_read(>pm.mclk_lock);
if (unlikely(r != 0)) {
return r;
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 27a2d3f..412486c 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1180,7 +1180,6 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
struct ttm_placement *placement,
uint32_t page_alignment,
bool interruptible,
-   struct

[PATCH 2/4] drm/ttm: remove persistent_swap_storage argument from ttm_bo_init/ttm_bo_create

2012-11-06 Thread Marcin Slusarz 
All drivers pass NULL here. ttm_buffer_object's field can still be set after
init, just like nouveau does.

Signed-off-by: Marcin Slusarz marcin.slus...@gmail.com
Cc: Thomas Hellstrom thellst...@vmware.com
---
 drivers/gpu/drm/ast/ast_ttm.c|  7 +++
 drivers/gpu/drm/cirrus/cirrus_ttm.c  |  2 +-
 drivers/gpu/drm/mgag200/mgag200_ttm.c|  2 +-
 drivers/gpu/drm/nouveau/nouveau_bo.c |  7 +++
 drivers/gpu/drm/radeon/radeon_object.c   |  6 +++---
 drivers/gpu/drm/ttm/ttm_bo.c |  7 ++-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c  |  3 +--
 drivers/gpu/drm/vmwgfx/vmwgfx_resource.c |  8 +++-
 include/drm/ttm/ttm_bo_api.h | 16 +++-
 9 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
index 0a54f65..c6dcc84 100644
--- a/drivers/gpu/drm/ast/ast_ttm.c
+++ b/drivers/gpu/drm/ast/ast_ttm.c
@@ -354,10 +354,9 @@ int ast_bo_create(struct drm_device *dev, int size, int 
align,
acc_size = ttm_bo_dma_acc_size(ast-ttm.bdev, size,
   sizeof(struct ast_bo));
 
-   ret = ttm_bo_init(ast-ttm.bdev, astbo-bo, size,
- ttm_bo_type_device, astbo-placement,
- align  PAGE_SHIFT, false, NULL, acc_size,
- NULL, ast_bo_ttm_destroy);
+   ret = ttm_bo_init(ast-ttm.bdev, astbo-bo, size, ttm_bo_type_device,
+ astbo-placement, align  PAGE_SHIFT, false,
+ acc_size, NULL, ast_bo_ttm_destroy);
if (ret)
return ret;
 
diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c 
b/drivers/gpu/drm/cirrus/cirrus_ttm.c
index 90d7701..65e665f 100644
--- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
+++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
@@ -361,7 +361,7 @@ int cirrus_bo_create(struct drm_device *dev, int size, int 
align,
 
ret = ttm_bo_init(cirrus-ttm.bdev, cirrusbo-bo, size,
  ttm_bo_type_device, cirrusbo-placement,
- align  PAGE_SHIFT, false, NULL, acc_size,
+ align  PAGE_SHIFT, false, acc_size,
  NULL, cirrus_bo_ttm_destroy);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c 
b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index 49d60a6..be121d1 100644
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -355,7 +355,7 @@ int mgag200_bo_create(struct drm_device *dev, int size, int 
align,
 
ret = ttm_bo_init(mdev-ttm.bdev, mgabo-bo, size,
  ttm_bo_type_device, mgabo-placement,
- align  PAGE_SHIFT, false, NULL, acc_size,
+ align  PAGE_SHIFT, false, acc_size,
  NULL, mgag200_bo_ttm_destroy);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c 
b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 3cbf1a8..82f0f3c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -223,10 +223,9 @@ nouveau_bo_new(struct drm_device *dev, int size, int align,
acc_size = ttm_bo_dma_acc_size(drm-ttm.bdev, size,
   sizeof(struct nouveau_bo));
 
-   ret = ttm_bo_init(drm-ttm.bdev, nvbo-bo, size,
- type, nvbo-placement,
- align  PAGE_SHIFT, false, NULL, acc_size, sg,
- nouveau_bo_del_ttm);
+   ret = ttm_bo_init(drm-ttm.bdev, nvbo-bo, size, type,
+ nvbo-placement, align  PAGE_SHIFT, false,
+ acc_size, sg, nouveau_bo_del_ttm);
if (ret) {
/* ttm will call nouveau_bo_del_ttm if it fails.. */
return ret;
diff --git a/drivers/gpu/drm/radeon/radeon_object.c 
b/drivers/gpu/drm/radeon/radeon_object.c
index 0665845..834b291 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -139,9 +139,9 @@ int radeon_bo_create(struct radeon_device *rdev,
radeon_ttm_placement_from_domain(bo, domain);
/* Kernel allocation are uninterruptible */
down_read(rdev-pm.mclk_lock);
-   r = ttm_bo_init(rdev-mman.bdev, bo-tbo, size, type,
-   bo-placement, page_align, !kernel, NULL,
-   acc_size, sg, radeon_ttm_bo_destroy);
+   r = ttm_bo_init(rdev-mman.bdev, bo-tbo, size, type, bo-placement,
+   page_align, !kernel, acc_size, sg,
+   radeon_ttm_bo_destroy);
up_read(rdev-pm.mclk_lock);
if (unlikely(r != 0)) {
return r;
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 27a2d3f..412486c 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1180,7 +1180,6 @@ int ttm_bo_init(struct