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 4547332144E; Mon, 18 Aug 2025 13:40:33 +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=1755524433; cv=none; b=PcBMBRX9GAEjzZmAx5HwKr6v0HG7mDgOiIyAL6QEbFFvfxyF8rpDLYww0NCjrdyAypH9Ayw/dYuIpOJhXAqdaE57NyojyFHLVIYaat59WIKUR2q/o4QDBCAu3sh607tvQi/PZw1hu1KHlnzDursnhmtwmyg048VWceAYrfcei3A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755524433; c=relaxed/simple; bh=fWC9xsIL71adP+RLJIwL2jWGR3SCN1inrHu4PRq0KkE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JmkJcnoQ2b1FNBIYpWaxWKqVo5iblbUr65I66MAREgKdXsEJi5uhtcbs39tYLukJySI+4Fg3RvsSRjzmtIaDP5N8/aSURh988+OCATOCf34RXxHXvOHbB9Sbm0x2APuZeLY9yd6UVT/QiaH967tYe7Q/EHMVE14JB5Io8KTz9fo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WIpDiHpT; 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="WIpDiHpT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC15AC113D0; Mon, 18 Aug 2025 13:40:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755524433; bh=fWC9xsIL71adP+RLJIwL2jWGR3SCN1inrHu4PRq0KkE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WIpDiHpTdFFa1c+qTi01SF9fQmTx4cmdCn7wrHifcH1k3WUFEn9R5GaMDS1Hcj0yQ iFv4aNQfOuA48OHaJEVYYWD9oXc5tFG2DRCOtTzRf3UqJMesT6bsM81RpG77HKzmg1 B0jIuOdBmkXBjUxtONQYn+rDeMV+mEuLraLeRa2s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jack Xiao , Likun Gao , Alex Deucher , Sasha Levin Subject: [PATCH 6.15 438/515] drm/amdgpu: fix incorrect vm flags to map bo Date: Mon, 18 Aug 2025 14:47:04 +0200 Message-ID: <20250818124515.286695172@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@linuxfoundation.org> User-Agent: quilt/0.68 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-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jack Xiao [ Upstream commit 040bc6d0e0e9c814c9c663f6f1544ebaff6824a8 ] It should use vm flags instead of pte flags to specify bo vm attributes. Fixes: 7946340fa389 ("drm/amdgpu: Move csa related code to separate file") Signed-off-by: Jack Xiao Reviewed-by: Likun Gao Signed-off-by: Alex Deucher (cherry picked from commit b08425fa77ad2f305fe57a33dceb456be03b653f) Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c index 02138aa55793..dfb6cfd83760 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c @@ -88,8 +88,8 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm, } r = amdgpu_vm_bo_map(adev, *bo_va, csa_addr, 0, size, - AMDGPU_PTE_READABLE | AMDGPU_PTE_WRITEABLE | - AMDGPU_PTE_EXECUTABLE); + AMDGPU_VM_PAGE_READABLE | AMDGPU_VM_PAGE_WRITEABLE | + AMDGPU_VM_PAGE_EXECUTABLE); if (r) { DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r); -- 2.50.1