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 6469B194A64; Thu, 5 Sep 2024 09:57:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725530234; cv=none; b=HMfWuIoK1tkTofve1pI6miAneRAxtUFSG07MDmJgBuPqAeeFAcUe/eQN/mtSUOmt1/fcB+izQOhlsVdMKPtV8LF1t+hX7pQYnJaBRFK82pB9uNtRqXbA66zvT4e+odWScWmW0Wden0T16NOTzoueSzWeXPH37kfdGyogJv9FS2A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725530234; c=relaxed/simple; bh=MI8m/zf1Ty9AimpUvhNYO/YM98uA5fBMJ6bdfpfYZ9k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=K0CKzOTixzvRyRQ5ibK8rXR1htkKYwRPwhFAro4At4Go7J4ZBZAxdFjcjZuqCIn4tUSqN0hLrJbfyDeTIshGgJ9cDbtjGrb+Rd009Me6fLbhczTDbxqV59aWllMAXBkAhd8koDUSJcZ4CXpVsTvthx3xWE+REwkGiEcKK1y4i9Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tR9ezvln; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tR9ezvln" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6040C4CEC3; Thu, 5 Sep 2024 09:57:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725530234; bh=MI8m/zf1Ty9AimpUvhNYO/YM98uA5fBMJ6bdfpfYZ9k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tR9ezvlnubDC0d08sOR6vOeT/CfDfDaabRkL6QjBXBi1I0HmHrjpX5oROiVy+mbYw K3r8GFNB+qqqbFjv49zkE8ylne1XQlNCNmxG39ksyagqFCvaOlszskDXRAo5sOneiI i4MWWnYn1DzUP5W6koCVayiLctlkwfPrEQhfvcdk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Asad Kamal , =?UTF-8?q?Christian=20K=C3=B6nig?= , Lijo Lazar , Alex Deucher , Sasha Levin Subject: [PATCH 6.6 064/132] drm/amd/amdgpu: Check tbo resource pointer Date: Thu, 5 Sep 2024 11:40:51 +0200 Message-ID: <20240905093724.746825609@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240905093722.230767298@linuxfoundation.org> References: <20240905093722.230767298@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Asad Kamal [ Upstream commit 6cd2b872643bb29bba01a8ac739138db7bd79007 ] Validate tbo resource pointer, skip if NULL Signed-off-by: Asad Kamal Reviewed-by: Christian König Reviewed-by: Lijo Lazar Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index eb663eb81156..251627c91f98 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -4480,7 +4480,8 @@ static int amdgpu_device_recover_vram(struct amdgpu_device *adev) shadow = vmbo->shadow; /* No need to recover an evicted BO */ - if (shadow->tbo.resource->mem_type != TTM_PL_TT || + if (!shadow->tbo.resource || + shadow->tbo.resource->mem_type != TTM_PL_TT || shadow->tbo.resource->start == AMDGPU_BO_INVALID_OFFSET || shadow->parent->tbo.resource->mem_type != TTM_PL_VRAM) continue; -- 2.43.0