| Message ID | 20230130101230.25347-1-matthew.auld@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/6] drm/i915/ttm: fix sparse warning | expand |
On 30.01.2023 11:12, Matthew Auld wrote: > Sparse complains with: > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:1066:21: sparse: > expected restricted vm_fault_t [assigned] [usertype] ret > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:1066:21: sparse: got int > > Fixes: 516198d317d8 ("drm/i915: audit bo->resource usage v3") > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Matthew Auld <matthew.auld@intel.com> > Cc: Christian König <ckoenig.leichtzumerken@gmail.com> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> Regards Andrzej > --- > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > index 7420276827a5..4758f21c91e1 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > @@ -1067,11 +1067,12 @@ static vm_fault_t vm_fault_ttm(struct vm_fault *vmf) > .interruptible = true, > .no_wait_gpu = true, /* should be idle already */ > }; > + int err; > > GEM_BUG_ON(!bo->ttm || !(bo->ttm->page_flags & TTM_TT_FLAG_SWAPPED)); > > - ret = ttm_bo_validate(bo, i915_ttm_sys_placement(), &ctx); > - if (ret) { > + err = ttm_bo_validate(bo, i915_ttm_sys_placement(), &ctx); > + if (err) { > dma_resv_unlock(bo->base.resv); > return VM_FAULT_SIGBUS; > }
Am 30.01.23 um 11:12 schrieb Matthew Auld: > Sparse complains with: > > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:1066:21: sparse: > expected restricted vm_fault_t [assigned] [usertype] ret > drivers/gpu/drm/i915/gem/i915_gem_ttm.c:1066:21: sparse: got int > > Fixes: 516198d317d8 ("drm/i915: audit bo->resource usage v3") > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Matthew Auld <matthew.auld@intel.com> > Cc: Christian König <ckoenig.leichtzumerken@gmail.com> Acked-by: Christian König <christian.koenig@amd.com> for the i915 patches. I'm on vacation this week. going to push this to drm-misc-next when I'm back unless someone is faster. Thanks, Christian. > --- > drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > index 7420276827a5..4758f21c91e1 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c > @@ -1067,11 +1067,12 @@ static vm_fault_t vm_fault_ttm(struct vm_fault *vmf) > .interruptible = true, > .no_wait_gpu = true, /* should be idle already */ > }; > + int err; > > GEM_BUG_ON(!bo->ttm || !(bo->ttm->page_flags & TTM_TT_FLAG_SWAPPED)); > > - ret = ttm_bo_validate(bo, i915_ttm_sys_placement(), &ctx); > - if (ret) { > + err = ttm_bo_validate(bo, i915_ttm_sys_placement(), &ctx); > + if (err) { > dma_resv_unlock(bo->base.resv); > return VM_FAULT_SIGBUS; > }
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c index 7420276827a5..4758f21c91e1 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -1067,11 +1067,12 @@ static vm_fault_t vm_fault_ttm(struct vm_fault *vmf) .interruptible = true, .no_wait_gpu = true, /* should be idle already */ }; + int err; GEM_BUG_ON(!bo->ttm || !(bo->ttm->page_flags & TTM_TT_FLAG_SWAPPED)); - ret = ttm_bo_validate(bo, i915_ttm_sys_placement(), &ctx); - if (ret) { + err = ttm_bo_validate(bo, i915_ttm_sys_placement(), &ctx); + if (err) { dma_resv_unlock(bo->base.resv); return VM_FAULT_SIGBUS; }
Sparse complains with: drivers/gpu/drm/i915/gem/i915_gem_ttm.c:1066:21: sparse: expected restricted vm_fault_t [assigned] [usertype] ret drivers/gpu/drm/i915/gem/i915_gem_ttm.c:1066:21: sparse: got int Fixes: 516198d317d8 ("drm/i915: audit bo->resource usage v3") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Christian König <ckoenig.leichtzumerken@gmail.com> --- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)