From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8542A6FA3 for ; Mon, 16 Jan 2023 16:35:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 059BBC433EF; Mon, 16 Jan 2023 16:35:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1673886929; bh=lXac1krLyvWXItOa1usDZ9GlDirmZxdVVgKum/nsJUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=alPG0vhb0VSZPdfamtSdw0C98y6pA9XTYGY85oYHEu/Vn24vqpsuiPegUdZuNW2O1 pm0KVc8X0IEeZVeiqKYW595dm+yqG9wobahNnAmMnbqC590d3XwE6UrtMbzDbqF0r+ b4JWkz9yU633+VivRdv9RoYWgNHkITtuB4Y/DbeE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Zhenyu Wang , Sasha Levin Subject: [PATCH 5.4 585/658] drm/i915: unpin on error in intel_vgpu_shadow_mm_pin() Date: Mon, 16 Jan 2023 16:51:13 +0100 Message-Id: <20230116154936.254470989@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116154909.645460653@linuxfoundation.org> References: <20230116154909.645460653@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Dan Carpenter [ Upstream commit 3792fc508c095abd84b10ceae12bd773e61fdc36 ] Call intel_vgpu_unpin_mm() on this error path. Fixes: 418741480809 ("drm/i915/gvt: Adding ppgtt to GVT GEM context after shadow pdps settled.") Signed-off-by: Dan Carpenter Signed-off-by: Zhenyu Wang Link: http://patchwork.freedesktop.org/patch/msgid/Y3OQ5tgZIVxyQ/WV@kili Reviewed-by: Zhenyu Wang Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/gvt/scheduler.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c index 058dcd541644..c1dc225d8436 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c @@ -632,6 +632,7 @@ static int prepare_workload(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; } -- 2.35.1