drm/nouveau: switch driver from bo->resv to bo->base.resv (27c44ace) · Commits · 戴 / test

drivers/gpu/drm/nouveau/dispnv50/wndw.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -457,7 +457,7 @@ nv50_wndw_prepare_fb(struct drm_plane plane, struct drm_plane_state state)
		asyw->image.handle[0] = ctxdma->object.handle;
		}

		asyw->state.fence = reservation_object_get_excl_rcu(fb->nvbo->bo.resv);
		asyw->state.fence = reservation_object_get_excl_rcu(fb->nvbo->bo.base.resv);
		asyw->image.offset[0] = fb->nvbo->bo.offset;

		if (wndw->func->prepare) {

+2 −3

Original line number	Diff line number	Diff line
		@@ -299,7 +299,6 @@ nouveau_bo_new(struct nouveau_cli *cli, u64 size, int align,
		type, &nvbo->placement,
		align >> PAGE_SHIFT, false, acc_size, sg,
		robj, nouveau_bo_del_ttm);
		nvbo->bo.base.resv = nvbo->bo.resv;

		if (ret) {
		/* ttm will call nouveau_bo_del_ttm if it fails.. */
		@@ -1325,7 +1324,7 @@ nouveau_bo_vm_cleanup(struct ttm_buffer_object *bo,
		{
		struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
		struct drm_device *dev = drm->dev;
		struct dma_fence *fence = reservation_object_get_excl(bo->resv);
		struct dma_fence *fence = reservation_object_get_excl(bo->base.resv);

		nv10_bo_put_tile_region(dev, *old_tile, fence);
		*old_tile = new_tile;
		@@ -1656,7 +1655,7 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt *ttm)
		void
		nouveau_bo_fence(struct nouveau_bo nvbo, struct nouveau_fence fence, bool exclusive)
		{
		struct reservation_object *resv = nvbo->bo.resv;
		struct reservation_object *resv = nvbo->bo.base.resv;

		if (exclusive)
		reservation_object_add_excl_fence(resv, &fence->base);

+1 −1

Original line number	Diff line number	Diff line
		@@ -335,7 +335,7 @@ nouveau_fence_sync(struct nouveau_bo nvbo, struct nouveau_channel chan, bool e
		{
		struct nouveau_fence_chan *fctx = chan->fence;
		struct dma_fence *fence;
		struct reservation_object *resv = nvbo->bo.resv;
		struct reservation_object *resv = nvbo->bo.base.resv;
		struct reservation_object_list *fobj;
		struct nouveau_fence *f;
		int ret = 0, i;

+1 −1

Original line number	Diff line number	Diff line
		@@ -887,7 +887,7 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device dev, void data,
		return -ENOENT;
		nvbo = nouveau_gem_object(gem);

		lret = reservation_object_wait_timeout_rcu(nvbo->bo.resv, write, true,
		lret = reservation_object_wait_timeout_rcu(nvbo->bo.base.resv, write, true,
		no_wait ? 0 : 30 * HZ);
		if (!lret)
		ret = -EBUSY;