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 C6B9C24169D; Tue, 26 Aug 2025 13:25:19 +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=1756214719; cv=none; b=e1BXoM32YjdfMcoHmjk21KusOlNO/+q1SNQIYLjMGn2hwBCt6tAC/2KW8Z3qbcBamP4Xc2ezS5LXeA+BLhwR/wT96PzyJp9GhF6fKUTRkIeEH6Sczc0WlYl3gri11G9aC4+ApzxkR5s1wlH6imOJfN5S2msCIVtZ0/83SD9Erg4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756214719; c=relaxed/simple; bh=QQ756njNW3e8UW5QrT30rjoktgxvFXk0PMkVa/ZhtlQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m+QVbu8RrNbRa/ujOm0llgjgUEYVv1rboKsp2qbkmG5fMY8qvb+Hj71hwmTJj0fHnu0OISaN+oBjFTlP4W+utxzFqNZpWtIRRULz1aL5jwwx7WTbjTzL+GQABGiNPnXWQDaWvMi6YSexGvRd80R6RBD7MLTB+6+SaXY9ZO5u3Jw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=v3iE4qC0; 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="v3iE4qC0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 574F7C4CEF1; Tue, 26 Aug 2025 13:25:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756214719; bh=QQ756njNW3e8UW5QrT30rjoktgxvFXk0PMkVa/ZhtlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v3iE4qC0TZ7Mez0CSrlFxPcCnUdmluHYdJWsfdX55hzMwwratI2IycM/V+rGAp+pX H2QHALeuzVe7mrTG2hQ8E80/CA5eeGmq/oSWxcDqmmZI+kccSIgFSW9PqDyUheoGtx eQJH+opsTda0i4pHkr18MAJzupUh5GKm3157hVZQ= 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.1 243/482] drm/amdgpu: fix incorrect vm flags to map bo Date: Tue, 26 Aug 2025 13:08:16 +0200 Message-ID: <20250826110936.773439691@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110930.769259449@linuxfoundation.org> References: <20250826110930.769259449@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.1-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 c6d4d41c4393..35e635c833f0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c @@ -93,8 +93,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