From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Christian König" <ckoenig.leichtzumerken@gmail.com>,
"Andrzej Hajda" <andrzej.hajda@intel.com>,
dri-devel@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH v2 1/6] drm/i915/ttm: fix sparse warning
Date: Mon, 30 Jan 2023 12:06:31 +0000 [thread overview]
Message-ID: <20230130120636.63765-1-matthew.auld@intel.com> (raw)
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>
---
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;
}
--
2.39.1
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Christian König" <ckoenig.leichtzumerken@gmail.com>,
"Andrzej Hajda" <andrzej.hajda@intel.com>,
"kernel test robot" <lkp@intel.com>,
dri-devel@lists.freedesktop.org
Subject: [PATCH v2 1/6] drm/i915/ttm: fix sparse warning
Date: Mon, 30 Jan 2023 12:06:31 +0000 [thread overview]
Message-ID: <20230130120636.63765-1-matthew.auld@intel.com> (raw)
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>
---
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;
}
--
2.39.1
next reply other threads:[~2023-01-30 12:07 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-30 12:06 Matthew Auld [this message]
2023-01-30 12:06 ` [PATCH v2 1/6] drm/i915/ttm: fix sparse warning Matthew Auld
2023-01-30 12:06 ` [Intel-gfx] [PATCH v2 2/6] drm/i915/ttm: audit remaining bo->resource Matthew Auld
2023-01-30 12:06 ` Matthew Auld
2023-01-30 12:12 ` [Intel-gfx] " Das, Nirmoy
2023-01-30 12:06 ` [Intel-gfx] [PATCH v2 3/6] drm/ttm: clear the ttm_tt when bo->resource is NULL Matthew Auld
2023-01-30 12:06 ` Matthew Auld
2023-01-30 12:12 ` [Intel-gfx] " Das, Nirmoy
2023-01-30 12:12 ` Das, Nirmoy
2023-01-30 12:06 ` [Intel-gfx] [PATCH v2 4/6] drm/ttm: stop allocating dummy resources during BO creation Matthew Auld
2023-01-30 12:06 ` Matthew Auld
2023-01-30 12:13 ` [Intel-gfx] " Das, Nirmoy
2023-01-30 12:13 ` Das, Nirmoy
2023-01-30 12:06 ` [Intel-gfx] [PATCH v2 5/6] drm/ttm: stop allocating a dummy resource for pipelined gutting Matthew Auld
2023-01-30 12:06 ` Matthew Auld
2023-01-30 12:13 ` [Intel-gfx] " Das, Nirmoy
2023-01-30 12:13 ` Das, Nirmoy
2023-01-30 12:06 ` [Intel-gfx] [PATCH v2 6/6] drm/ttm: prevent moving of pinned BOs Matthew Auld
2023-01-30 12:06 ` Matthew Auld
2023-01-30 12:09 ` [Intel-gfx] [PATCH v2 1/6] drm/i915/ttm: fix sparse warning Das, Nirmoy
2023-01-30 12:09 ` Das, Nirmoy
2023-01-30 16:35 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [v2,1/6] " Patchwork
2023-01-30 16:46 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-01-30 22:17 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230130120636.63765-1-matthew.auld@intel.com \
--to=matthew.auld@intel.com \
--cc=andrzej.hajda@intel.com \
--cc=ckoenig.leichtzumerken@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.