Commit f004d34d authored by Dan Carpenter's avatar Dan Carpenter Committed by zhaoxiaoqiang11
Browse files

drm/i915: unpin on error in intel_vgpu_shadow_mm_pin() 

stable inclusion
from stable-v5.10.163
commit e5a05837445e48620636551d5de98ddd3939ad7f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7PJ9N

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e5a05837445e48620636551d5de98ddd3939ad7f



----------------------------------------------------

[ Upstream commit 3792fc50 ]

Call intel_vgpu_unpin_mm() on this error path.

Fixes: 41874148 ("drm/i915/gvt: Adding ppgtt to GVT GEM context after shadow pdps settled.")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/Y3OQ5tgZIVxyQ/WV@kili


Reviewed-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarzhaoxiaoqiang11 <zhaoxiaoqiang11@jd.com>
parent b26dd836

drivers/gpu/drm/i915/gvt/scheduler.c

+1 −0
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ intel_vgpu_shadow_mm_pin(struct intel_vgpu_workload *workload) 


	if (workload->shadow_mm->type != INTEL_GVT_MM_PPGTT ||

	    !workload->shadow_mm->ppgtt_mm.shadowed) {

		intel_vgpu_unpin_mm(workload->shadow_mm);

		gvt_vgpu_err("workload shadow ppgtt isn't ready\n");

		return -EINVAL;

	}