staging: vboxvideo: adapt to new TTM interface

Commit Message

Christian König Nov. 24, 2017, 10:29 a.m. UTC

I missed this driver because it is in the staging area.

Signed-off-by: Christian König <[e-mail]>
Reviewed-by: Hans de Goede <[e-mail]>
---
 drivers/staging/vboxvideo/vbox_ttm.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

Comments

Greg KH Nov. 24, 2017, 10:31 a.m. UTC | #1

On Fri, Nov 24, 2017 at 11:29:27AM +0100, Christian König wrote:
> I missed this driver because it is in the staging area.

What does this changelog text mean???

> Signed-off-by: Christian König <[e-mail]>
> Reviewed-by: Hans de Goede <[e-mail]>
> ---
>  drivers/staging/vboxvideo/vbox_ttm.c | 17 ++++++-----------
>  1 file changed, 6 insertions(+), 11 deletions(-)

Please provide something that makes sense when reading the changelog
text on its own.

thanks,

greg k-h

Christian König Nov. 24, 2017, 10:35 a.m. UTC | #2

Am 24.11.2017 um 11:31 schrieb Greg KH:
> On Fri, Nov 24, 2017 at 11:29:27AM +0100, Christian König wrote:
>> I missed this driver because it is in the staging area.
> What does this changelog text mean???

Sorry for the confusion, the patch was originally part of a larger series.

Just send it out again with an updated commit message.

>
>> Signed-off-by: Christian König <[e-mail]>
>> Reviewed-by: Hans de Goede <[e-mail]>
>> ---
>>   drivers/staging/vboxvideo/vbox_ttm.c | 17 ++++++-----------
>>   1 file changed, 6 insertions(+), 11 deletions(-)
> Please provide something that makes sense when reading the changelog
> text on its own.

Done, but please note that I'm not sure if the interface this breaks has 
already reached any of the relevant upstream repositories.

I just added you to the list of recipients because Hans suggested to do so.

Regards,
Christian.

>
> thanks,
>
> greg k-h

Patch

diff --git a/drivers/staging/vboxvideo/vbox_ttm.c b/drivers/staging/vboxvideo/vbox_ttm.c
index 4eb410a2a1a8..231c89e0699c 100644
--- a/drivers/staging/vboxvideo/vbox_ttm.c
+++ b/drivers/staging/vboxvideo/vbox_ttm.c
@@ -183,13 +183,6 @@  static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev,
 {
 }
 
-static int vbox_bo_move(struct ttm_buffer_object *bo,
-			bool evict, bool interruptible,
-			bool no_wait_gpu, struct ttm_mem_reg *new_mem)
-{
-	return ttm_bo_move_memcpy(bo, interruptible, no_wait_gpu, new_mem);
-}
-
 static void vbox_ttm_backend_destroy(struct ttm_tt *tt)
 {
 	ttm_tt_fini(tt);
@@ -237,7 +230,6 @@  static struct ttm_bo_driver vbox_bo_driver = {
 	.init_mem_type = vbox_bo_init_mem_type,
 	.eviction_valuable = ttm_bo_eviction_valuable,
 	.evict_flags = vbox_bo_evict_flags,
-	.move = vbox_bo_move,
 	.verify_access = vbox_bo_verify_access,
 	.io_mem_reserve = &vbox_ttm_io_mem_reserve,
 	.io_mem_free = &vbox_ttm_io_mem_free,
@@ -374,6 +366,7 @@  static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo)
 
 int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
 {
+	struct ttm_operation_ctx ctx = { false, false };
 	int i, ret;
 
 	if (bo->pin_count) {
@@ -389,7 +382,7 @@  int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
 	for (i = 0; i < bo->placement.num_placement; i++)
 		bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT;
 
-	ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
+	ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
 	if (ret)
 		return ret;
 
@@ -403,6 +396,7 @@  int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
 
 int vbox_bo_unpin(struct vbox_bo *bo)
 {
+	struct ttm_operation_ctx ctx = { false, false };
 	int i, ret;
 
 	if (!bo->pin_count) {
@@ -416,7 +410,7 @@  int vbox_bo_unpin(struct vbox_bo *bo)
 	for (i = 0; i < bo->placement.num_placement; i++)
 		bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT;
 
-	ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
+	ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
 	if (ret)
 		return ret;
 
@@ -430,6 +424,7 @@  int vbox_bo_unpin(struct vbox_bo *bo)
  */
 int vbox_bo_push_sysram(struct vbox_bo *bo)
 {
+	struct ttm_operation_ctx ctx = { false, false };
 	int i, ret;
 
 	if (!bo->pin_count) {
@@ -448,7 +443,7 @@  int vbox_bo_push_sysram(struct vbox_bo *bo)
 	for (i = 0; i < bo->placement.num_placement; i++)
 		bo->placements[i].flags |= TTM_PL_FLAG_NO_EVICT;
 
-	ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
+	ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
 	if (ret) {
 		DRM_ERROR("pushing to VRAM failed\n");
 		return ret;