[v5,11/18,fixup] ttm
diff mbox series

Message ID 20190805124310.3275-12-kraxel@redhat.com
State New
Headers show
Series
  • drm/ttm: make ttm bo a gem bo subclass
Related show

Commit Message

Gerd Hoffmann Aug. 5, 2019, 12:43 p.m. UTC
---
 drivers/gpu/drm/ttm/ttm_bo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Gerd Hoffmann Aug. 5, 2019, 12:45 p.m. UTC | #1
On Mon, Aug 05, 2019 at 02:43:03PM +0200, Gerd Hoffmann wrote:
> ---
>  drivers/gpu/drm/ttm/ttm_bo.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index b3d628b3f038..73d407494586 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -961,7 +961,7 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,
>  	struct ww_acquire_ctx *ticket;
>  	int ret;
>  
> -	ticket = reservation_object_locking_ctx(bo->resv);
> +	ticket = reservation_object_locking_ctx(bo->base.resv);
>  	do {
>  		ret = (*man->func->get_node)(man, bo, place, mem);
>  		if (unlikely(ret != 0))

Oops.  This is meant to be squashed into 10/18 of course.

cheers,
  Gerd

Patch
diff mbox series

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index b3d628b3f038..73d407494586 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -961,7 +961,7 @@  static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,
 	struct ww_acquire_ctx *ticket;
 	int ret;
 
-	ticket = reservation_object_locking_ctx(bo->resv);
+	ticket = reservation_object_locking_ctx(bo->base.resv);
 	do {
 		ret = (*man->func->get_node)(man, bo, place, mem);
 		if (unlikely(ret != 0))