From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 C5B06441638; Thu, 30 Jul 2026 14:37:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785422279; cv=none; b=mh67KzHDjh9Iwo61NpOdLPAcSRgU1niW3LIl9ENb1yiLtYrgsb7Be5iXjQmzokeFKmnoUgUJtm4L9POan8rjifeAoDHGtEGknR1cfdyZuvTesdll44/1QT4i3+Jy8ArdClOOevUYKH0KNUM4XgTd+0auv/HgOSmBsxNZLNkl9WI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785422279; c=relaxed/simple; bh=bypOQie+jjCoCZcRAfKIIEugc6tPdpvWAeVd+vvR1ys=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=S6NtA7G/+1UqaYeC6JYXfuqPMmYkQsn6jLG+a63oIFb94AJYJpMk+JNkgKFMi0lT3b3epdXk45j2z2ugkNtOp3g41xkUpZqQ1p34e9maXILDT50RiznDRClUPCNvaWW0wlupGwXw0VZyylQn1eVLTguhhQbDoE7cIXEdtiazAxA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0GLmwyqR; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="0GLmwyqR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11D0D1F000E9; Thu, 30 Jul 2026 14:37:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785422278; bh=qlY0uDFkCq5dMDRZML7PArnTQHk4ozDxZj8JqjgP+ME=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=0GLmwyqRznXPQ40CjsdvZPCoq4KkoCKXBKg106G7azHlyGzlZ8kiJaNzF6okTTFZ8 cC2IGiEdGZ4fb0E3E6zEBtXJabC15SXbOOolB2JXB9sQWaXrQbk13Mf0RzUMt4Cukn 79DmU2kM6wcKVQxpPQD89QoxBGgs1wsQTrWaiZY8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Timur=20Krist=C3=B3f?= , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher Subject: [PATCH 7.1 384/744] drm/amdgpu: Fix amdgpu_bo_move() when old_mem and new_mem are both GTT Date: Thu, 30 Jul 2026 16:10:57 +0200 Message-ID: <20260730141452.445542354@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260730141444.267951807@linuxfoundation.org> References: <20260730141444.267951807@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore 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 7.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Timur Kristóf commit ee94a65f192c05c543b4d3ad7137cd696b5c18fc upstream. The UVD code relies on GTT to GTT moves in order to ensure that its BOs don't cross 256M segments. Fixes: bfe5e585b44f ("drm/ttm: move last binding into the drivers.") Signed-off-by: Timur Kristóf Reviewed-by: Christian König Signed-off-by: Alex Deucher (cherry picked from commit 21fd45e5e2628d00b478590bcc3d14d3de5d45b6) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -515,6 +515,15 @@ static int amdgpu_bo_move(struct ttm_buf if (new_mem->mem_type == TTM_PL_TT || new_mem->mem_type == AMDGPU_PL_PREEMPT) { + if (old_mem && (old_mem->mem_type == TTM_PL_TT || + old_mem->mem_type == AMDGPU_PL_PREEMPT)) { + r = ttm_bo_wait_ctx(bo, ctx); + if (r) + return r; + + amdgpu_ttm_backend_unbind(bo->bdev, bo->ttm); + } + r = amdgpu_ttm_backend_bind(bo->bdev, bo->ttm, new_mem); if (r) return r; @@ -547,6 +556,15 @@ static int amdgpu_bo_move(struct ttm_buf amdgpu_bo_move_notify(bo, evict, new_mem); ttm_resource_free(bo, &bo->resource); ttm_bo_assign_mem(bo, new_mem); + return 0; + } + if ((old_mem->mem_type == TTM_PL_TT || + old_mem->mem_type == AMDGPU_PL_PREEMPT) && + (new_mem->mem_type == TTM_PL_TT || + new_mem->mem_type == AMDGPU_PL_PREEMPT)) { + amdgpu_bo_move_notify(bo, evict, new_mem); + ttm_resource_free(bo, &bo->resource); + ttm_bo_assign_mem(bo, new_mem); return 0; }