diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-07-13 00:21:10 +0200 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-07-13 00:21:10 +0200 |
| commit | f99546298a4537965b75d518c210742f641be389 (patch) | |
| tree | dfc235ae7a99527682c2e086b09b8f7d7fbc87fc /drivers/gpu | |
| parent | drm/i915: Fix vm use-after-free in vma destruction (diff) | |
| parent | drm/i915/gvt: IS_ERR() vs NULL bug in intel_gvt_update_reg_whitelist() (diff) | |
| download | linux-f99546298a4537965b75d518c210742f641be389.tar.xz linux-f99546298a4537965b75d518c210742f641be389.zip | |
Merge tag 'gvt-fixes-2022-07-11' of https://github.com/intel/gvt-linux into drm-intel-fixes
gvt-fixes-2022-07-11
- Fix return value for shmem_pin_map()
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220711052021.GV1089@zhen-hp.sh.intel.com
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/cmd_parser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index b9eb75a2b400..1c35a41620ae 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -3117,9 +3117,9 @@ void intel_gvt_update_reg_whitelist(struct intel_vgpu *vgpu) continue; vaddr = shmem_pin_map(engine->default_state); - if (IS_ERR(vaddr)) { - gvt_err("failed to map %s->default state, err:%zd\n", - engine->name, PTR_ERR(vaddr)); + if (!vaddr) { + gvt_err("failed to map %s->default state\n", + engine->name); return; } |