| Message ID | 1405941351-27103-1-git-send-email-thierry.reding@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, Jul 21, 2014 at 7:15 AM, Thierry Reding <thierry.reding@gmail.com> wrote: > From: Thierry Reding <treding@nvidia.com> > > The final parameter to ttm_bo_reserve() is a pointer, therefore callers > should use NULL instead of 0. > > Fixes a bunch of sparse warnings of this type: > > warning: Using plain integer as NULL pointer > > Signed-off-by: Thierry Reding <treding@nvidia.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/ast/ast_drv.h | 2 +- > drivers/gpu/drm/bochs/bochs_fbdev.c | 2 +- > drivers/gpu/drm/bochs/bochs_kms.c | 4 ++-- > drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +- > drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- > drivers/gpu/drm/nouveau/nouveau_bo.c | 6 +++--- > drivers/gpu/drm/nouveau/nouveau_gem.c | 4 ++-- > drivers/gpu/drm/qxl/qxl_object.h | 4 ++-- > drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 6 +++--- > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 ++-- > drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +- > 12 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h > index 5d6a87573c33..957d4fabf1e1 100644 > --- a/drivers/gpu/drm/ast/ast_drv.h > +++ b/drivers/gpu/drm/ast/ast_drv.h > @@ -362,7 +362,7 @@ static inline int ast_bo_reserve(struct ast_bo *bo, bool no_wait) > { > int ret; > > - ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0); > + ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, NULL); > if (ret) { > if (ret != -ERESTARTSYS && ret != -EBUSY) > DRM_ERROR("reserve failed %p\n", bo); > diff --git a/drivers/gpu/drm/bochs/bochs_fbdev.c b/drivers/gpu/drm/bochs/bochs_fbdev.c > index 19cf3e9413b6..fe95d31cd110 100644 > --- a/drivers/gpu/drm/bochs/bochs_fbdev.c > +++ b/drivers/gpu/drm/bochs/bochs_fbdev.c > @@ -72,7 +72,7 @@ static int bochsfb_create(struct drm_fb_helper *helper, > > bo = gem_to_bochs_bo(gobj); > > - ret = ttm_bo_reserve(&bo->bo, true, false, false, 0); > + ret = ttm_bo_reserve(&bo->bo, true, false, false, NULL); > if (ret) > return ret; > > diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c > index dcf2e55f4ae9..9abd2312f5bd 100644 > --- a/drivers/gpu/drm/bochs/bochs_kms.c > +++ b/drivers/gpu/drm/bochs/bochs_kms.c > @@ -53,7 +53,7 @@ static int bochs_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, > if (old_fb) { > bochs_fb = to_bochs_framebuffer(old_fb); > bo = gem_to_bochs_bo(bochs_fb->obj); > - ret = ttm_bo_reserve(&bo->bo, true, false, false, 0); > + ret = ttm_bo_reserve(&bo->bo, true, false, false, NULL); > if (ret) { > DRM_ERROR("failed to reserve old_fb bo\n"); > } else { > @@ -67,7 +67,7 @@ static int bochs_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, > > bochs_fb = to_bochs_framebuffer(crtc->primary->fb); > bo = gem_to_bochs_bo(bochs_fb->obj); > - ret = ttm_bo_reserve(&bo->bo, true, false, false, 0); > + ret = ttm_bo_reserve(&bo->bo, true, false, false, NULL); > if (ret) > return ret; > > diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.h b/drivers/gpu/drm/cirrus/cirrus_drv.h > index 117d3eca5e37..401c890b6c6a 100644 > --- a/drivers/gpu/drm/cirrus/cirrus_drv.h > +++ b/drivers/gpu/drm/cirrus/cirrus_drv.h > @@ -241,7 +241,7 @@ static inline int cirrus_bo_reserve(struct cirrus_bo *bo, bool no_wait) > { > int ret; > > - ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0); > + ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, NULL); > if (ret) { > if (ret != -ERESTARTSYS && ret != -EBUSY) > DRM_ERROR("reserve failed %p\n", bo); > diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h > index cf11ee68a6d9..80de23d9b9c9 100644 > --- a/drivers/gpu/drm/mgag200/mgag200_drv.h > +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h > @@ -280,7 +280,7 @@ static inline int mgag200_bo_reserve(struct mgag200_bo *bo, bool no_wait) > { > int ret; > > - ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0); > + ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, NULL); > if (ret) { > if (ret != -ERESTARTSYS && ret != -EBUSY) > DRM_ERROR("reserve failed %p\n", bo); > diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c > index f00ae18003f1..58e49dcf5bd8 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_bo.c > +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c > @@ -310,7 +310,7 @@ nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t memtype) > struct ttm_buffer_object *bo = &nvbo->bo; > int ret; > > - ret = ttm_bo_reserve(bo, false, false, false, 0); > + ret = ttm_bo_reserve(bo, false, false, false, NULL); > if (ret) > goto out; > > @@ -351,7 +351,7 @@ nouveau_bo_unpin(struct nouveau_bo *nvbo) > struct ttm_buffer_object *bo = &nvbo->bo; > int ret, ref; > > - ret = ttm_bo_reserve(bo, false, false, false, 0); > + ret = ttm_bo_reserve(bo, false, false, false, NULL); > if (ret) > return ret; > > @@ -386,7 +386,7 @@ nouveau_bo_map(struct nouveau_bo *nvbo) > { > int ret; > > - ret = ttm_bo_reserve(&nvbo->bo, false, false, false, 0); > + ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL); > if (ret) > return ret; > > diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c > index b7e42fdc9634..42027e413c2e 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_gem.c > +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c > @@ -61,7 +61,7 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv) > if (!cli->base.vm) > return 0; > > - ret = ttm_bo_reserve(&nvbo->bo, false, false, false, 0); > + ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL); > if (ret) > return ret; > > @@ -132,7 +132,7 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv) > if (!cli->base.vm) > return; > > - ret = ttm_bo_reserve(&nvbo->bo, false, false, false, 0); > + ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL); > if (ret) > return; > > diff --git a/drivers/gpu/drm/qxl/qxl_object.h b/drivers/gpu/drm/qxl/qxl_object.h > index d458a140c024..83a423293afd 100644 > --- a/drivers/gpu/drm/qxl/qxl_object.h > +++ b/drivers/gpu/drm/qxl/qxl_object.h > @@ -31,7 +31,7 @@ static inline int qxl_bo_reserve(struct qxl_bo *bo, bool no_wait) > { > int r; > > - r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0); > + r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, NULL); > if (unlikely(r != 0)) { > if (r != -ERESTARTSYS) { > struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; > @@ -67,7 +67,7 @@ static inline int qxl_bo_wait(struct qxl_bo *bo, u32 *mem_type, > { > int r; > > - r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0); > + r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, NULL); > if (unlikely(r != 0)) { > if (r != -ERESTARTSYS) { > struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c > index 70ddce8358b0..ed1d51006ab1 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c > @@ -61,7 +61,7 @@ int vmw_dmabuf_to_placement(struct vmw_private *dev_priv, > > vmw_execbuf_release_pinned_bo(dev_priv); > > - ret = ttm_bo_reserve(bo, interruptible, false, false, 0); > + ret = ttm_bo_reserve(bo, interruptible, false, false, NULL); > if (unlikely(ret != 0)) > goto err; > > @@ -105,7 +105,7 @@ int vmw_dmabuf_to_vram_or_gmr(struct vmw_private *dev_priv, > if (pin) > vmw_execbuf_release_pinned_bo(dev_priv); > > - ret = ttm_bo_reserve(bo, interruptible, false, false, 0); > + ret = ttm_bo_reserve(bo, interruptible, false, false, NULL); > if (unlikely(ret != 0)) > goto err; > > @@ -212,7 +212,7 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *dev_priv, > > if (pin) > vmw_execbuf_release_pinned_bo(dev_priv); > - ret = ttm_bo_reserve(bo, interruptible, false, false, 0); > + ret = ttm_bo_reserve(bo, interruptible, false, false, NULL); > if (unlikely(ret != 0)) > goto err_unlock; > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > index f31a75494e07..18b54acacfbb 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > @@ -316,7 +316,7 @@ static int vmw_dummy_query_bo_create(struct vmw_private *dev_priv) > if (unlikely(ret != 0)) > return ret; > > - ret = ttm_bo_reserve(bo, false, true, false, 0); > + ret = ttm_bo_reserve(bo, false, true, false, NULL); > BUG_ON(ret != 0); > > ret = ttm_bo_kmap(bo, 0, 1, &map); > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c > index 1a024e3b7285..28e5845fb959 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c > @@ -136,7 +136,7 @@ int vmw_cursor_update_dmabuf(struct vmw_private *dev_priv, > kmap_offset = 0; > kmap_num = (width*height*4 + PAGE_SIZE - 1) >> PAGE_SHIFT; > > - ret = ttm_bo_reserve(&dmabuf->base, true, false, false, 0); > + ret = ttm_bo_reserve(&dmabuf->base, true, false, false, NULL); > if (unlikely(ret != 0)) { > DRM_ERROR("reserve failed\n"); > return -EINVAL; > @@ -343,7 +343,7 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf, > kmap_offset = cmd->dma.guest.ptr.offset >> PAGE_SHIFT; > kmap_num = (64*64*4) >> PAGE_SHIFT; > > - ret = ttm_bo_reserve(bo, true, false, false, 0); > + ret = ttm_bo_reserve(bo, true, false, false, NULL); > if (unlikely(ret != 0)) { > DRM_ERROR("reserve failed\n"); > return; > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c > index 01d68f0a69dc..a432c0db257c 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c > @@ -127,7 +127,7 @@ static void vmw_resource_release(struct kref *kref) > if (res->backup) { > struct ttm_buffer_object *bo = &res->backup->base; > > - ttm_bo_reserve(bo, false, false, false, 0); > + ttm_bo_reserve(bo, false, false, false, NULL); > if (!list_empty(&res->mob_head) && > res->func->unbind != NULL) { > struct ttm_validate_buffer val_buf; > -- > 2.0.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index 5d6a87573c33..957d4fabf1e1 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -362,7 +362,7 @@ static inline int ast_bo_reserve(struct ast_bo *bo, bool no_wait) { int ret; - ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0); + ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, NULL); if (ret) { if (ret != -ERESTARTSYS && ret != -EBUSY) DRM_ERROR("reserve failed %p\n", bo); diff --git a/drivers/gpu/drm/bochs/bochs_fbdev.c b/drivers/gpu/drm/bochs/bochs_fbdev.c index 19cf3e9413b6..fe95d31cd110 100644 --- a/drivers/gpu/drm/bochs/bochs_fbdev.c +++ b/drivers/gpu/drm/bochs/bochs_fbdev.c @@ -72,7 +72,7 @@ static int bochsfb_create(struct drm_fb_helper *helper, bo = gem_to_bochs_bo(gobj); - ret = ttm_bo_reserve(&bo->bo, true, false, false, 0); + ret = ttm_bo_reserve(&bo->bo, true, false, false, NULL); if (ret) return ret; diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index dcf2e55f4ae9..9abd2312f5bd 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c @@ -53,7 +53,7 @@ static int bochs_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, if (old_fb) { bochs_fb = to_bochs_framebuffer(old_fb); bo = gem_to_bochs_bo(bochs_fb->obj); - ret = ttm_bo_reserve(&bo->bo, true, false, false, 0); + ret = ttm_bo_reserve(&bo->bo, true, false, false, NULL); if (ret) { DRM_ERROR("failed to reserve old_fb bo\n"); } else { @@ -67,7 +67,7 @@ static int bochs_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, bochs_fb = to_bochs_framebuffer(crtc->primary->fb); bo = gem_to_bochs_bo(bochs_fb->obj); - ret = ttm_bo_reserve(&bo->bo, true, false, false, 0); + ret = ttm_bo_reserve(&bo->bo, true, false, false, NULL); if (ret) return ret; diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.h b/drivers/gpu/drm/cirrus/cirrus_drv.h index 117d3eca5e37..401c890b6c6a 100644 --- a/drivers/gpu/drm/cirrus/cirrus_drv.h +++ b/drivers/gpu/drm/cirrus/cirrus_drv.h @@ -241,7 +241,7 @@ static inline int cirrus_bo_reserve(struct cirrus_bo *bo, bool no_wait) { int ret; - ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0); + ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, NULL); if (ret) { if (ret != -ERESTARTSYS && ret != -EBUSY) DRM_ERROR("reserve failed %p\n", bo); diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h index cf11ee68a6d9..80de23d9b9c9 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.h +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h @@ -280,7 +280,7 @@ static inline int mgag200_bo_reserve(struct mgag200_bo *bo, bool no_wait) { int ret; - ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0); + ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, NULL); if (ret) { if (ret != -ERESTARTSYS && ret != -EBUSY) DRM_ERROR("reserve failed %p\n", bo); diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index f00ae18003f1..58e49dcf5bd8 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -310,7 +310,7 @@ nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t memtype) struct ttm_buffer_object *bo = &nvbo->bo; int ret; - ret = ttm_bo_reserve(bo, false, false, false, 0); + ret = ttm_bo_reserve(bo, false, false, false, NULL); if (ret) goto out; @@ -351,7 +351,7 @@ nouveau_bo_unpin(struct nouveau_bo *nvbo) struct ttm_buffer_object *bo = &nvbo->bo; int ret, ref; - ret = ttm_bo_reserve(bo, false, false, false, 0); + ret = ttm_bo_reserve(bo, false, false, false, NULL); if (ret) return ret; @@ -386,7 +386,7 @@ nouveau_bo_map(struct nouveau_bo *nvbo) { int ret; - ret = ttm_bo_reserve(&nvbo->bo, false, false, false, 0); + ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL); if (ret) return ret; diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index b7e42fdc9634..42027e413c2e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -61,7 +61,7 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv) if (!cli->base.vm) return 0; - ret = ttm_bo_reserve(&nvbo->bo, false, false, false, 0); + ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL); if (ret) return ret; @@ -132,7 +132,7 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv) if (!cli->base.vm) return; - ret = ttm_bo_reserve(&nvbo->bo, false, false, false, 0); + ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL); if (ret) return; diff --git a/drivers/gpu/drm/qxl/qxl_object.h b/drivers/gpu/drm/qxl/qxl_object.h index d458a140c024..83a423293afd 100644 --- a/drivers/gpu/drm/qxl/qxl_object.h +++ b/drivers/gpu/drm/qxl/qxl_object.h @@ -31,7 +31,7 @@ static inline int qxl_bo_reserve(struct qxl_bo *bo, bool no_wait) { int r; - r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0); + r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, NULL); if (unlikely(r != 0)) { if (r != -ERESTARTSYS) { struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; @@ -67,7 +67,7 @@ static inline int qxl_bo_wait(struct qxl_bo *bo, u32 *mem_type, { int r; - r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0); + r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, NULL); if (unlikely(r != 0)) { if (r != -ERESTARTSYS) { struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c index 70ddce8358b0..ed1d51006ab1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c @@ -61,7 +61,7 @@ int vmw_dmabuf_to_placement(struct vmw_private *dev_priv, vmw_execbuf_release_pinned_bo(dev_priv); - ret = ttm_bo_reserve(bo, interruptible, false, false, 0); + ret = ttm_bo_reserve(bo, interruptible, false, false, NULL); if (unlikely(ret != 0)) goto err; @@ -105,7 +105,7 @@ int vmw_dmabuf_to_vram_or_gmr(struct vmw_private *dev_priv, if (pin) vmw_execbuf_release_pinned_bo(dev_priv); - ret = ttm_bo_reserve(bo, interruptible, false, false, 0); + ret = ttm_bo_reserve(bo, interruptible, false, false, NULL); if (unlikely(ret != 0)) goto err; @@ -212,7 +212,7 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *dev_priv, if (pin) vmw_execbuf_release_pinned_bo(dev_priv); - ret = ttm_bo_reserve(bo, interruptible, false, false, 0); + ret = ttm_bo_reserve(bo, interruptible, false, false, NULL); if (unlikely(ret != 0)) goto err_unlock; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index f31a75494e07..18b54acacfbb 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -316,7 +316,7 @@ static int vmw_dummy_query_bo_create(struct vmw_private *dev_priv) if (unlikely(ret != 0)) return ret; - ret = ttm_bo_reserve(bo, false, true, false, 0); + ret = ttm_bo_reserve(bo, false, true, false, NULL); BUG_ON(ret != 0); ret = ttm_bo_kmap(bo, 0, 1, &map); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 1a024e3b7285..28e5845fb959 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -136,7 +136,7 @@ int vmw_cursor_update_dmabuf(struct vmw_private *dev_priv, kmap_offset = 0; kmap_num = (width*height*4 + PAGE_SIZE - 1) >> PAGE_SHIFT; - ret = ttm_bo_reserve(&dmabuf->base, true, false, false, 0); + ret = ttm_bo_reserve(&dmabuf->base, true, false, false, NULL); if (unlikely(ret != 0)) { DRM_ERROR("reserve failed\n"); return -EINVAL; @@ -343,7 +343,7 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf, kmap_offset = cmd->dma.guest.ptr.offset >> PAGE_SHIFT; kmap_num = (64*64*4) >> PAGE_SHIFT; - ret = ttm_bo_reserve(bo, true, false, false, 0); + ret = ttm_bo_reserve(bo, true, false, false, NULL); if (unlikely(ret != 0)) { DRM_ERROR("reserve failed\n"); return; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index 01d68f0a69dc..a432c0db257c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c @@ -127,7 +127,7 @@ static void vmw_resource_release(struct kref *kref) if (res->backup) { struct ttm_buffer_object *bo = &res->backup->base; - ttm_bo_reserve(bo, false, false, false, 0); + ttm_bo_reserve(bo, false, false, false, NULL); if (!list_empty(&res->mob_head) && res->func->unbind != NULL) { struct ttm_validate_buffer val_buf;