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 42EAB30DD36; Tue, 2 Sep 2025 13:34:07 +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=1756820047; cv=none; b=R2hy5EQxS54ksDUxjrPtpn43VV+xa93ghMBJaCbcTdS5VkoCtLHsu9ZH1C6paoTc2HPrK/BWUToIlrs4Pi5HpKbpiW2tPaNMy01jS1ISGYepy2ALzgYV/jlyXgpAaSe+i4kMqQH01aDLvqAl5ePhDtUDytZuSuXcLtf+VwF4sk0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756820047; c=relaxed/simple; bh=2H7PK6itMpTpAJ75p5gZ9COJqCl4PfFomHzDo1esH1s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nu6wFj+s04sHAEgKY9TrAyqovd09z9pr4Q4E+vdzF6JoHHpzpAqPeOLchiIWesO+j+yo+AwcR2GbapB8AP/+KSgWE4G9l8Quhb6ekC370Wyj6QGSA/1RKfNQOtSNNsSEgrM44a/jtd5DuaULVAYLpxloeTr5UHezMbIbm3oka0U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DaGbMo+Z; 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="DaGbMo+Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6EB9C4CEED; Tue, 2 Sep 2025 13:34:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756820047; bh=2H7PK6itMpTpAJ75p5gZ9COJqCl4PfFomHzDo1esH1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DaGbMo+ZYlzV1NXSywrj/dB5x9dVs0bMb340PEm9GxFjUTiWa0ZbjMpvaA9mVqTy/ TdW6qHmhSa7kz1BXUVRKizj1TVUBwEeCFrcPdd05FWxANFww3DVeXzlEocSaSZ+iUx 8mf4CclNzSTXEoZ473jKztJILxaGCc3Qf2g1IiuA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Deucher Subject: [PATCH 6.12 77/95] Revert "drm/amdgpu: fix incorrect vm flags to map bo" Date: Tue, 2 Sep 2025 15:20:53 +0200 Message-ID: <20250902131942.566205890@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131939.601201881@linuxfoundation.org> References: <20250902131939.601201881@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Deucher commit ac4ed2da4c1305a1a002415058aa7deaf49ffe3e upstream. This reverts commit b08425fa77ad2f305fe57a33dceb456be03b653f. Revert this to align with 6.17 because the fixes tag was wrong on this commit. Signed-off-by: Alex Deucher (cherry picked from commit be33e8a239aac204d7e9e673c4220ef244eb1ba3) Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- 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_ } r = amdgpu_vm_bo_map(adev, *bo_va, csa_addr, 0, size, - AMDGPU_VM_PAGE_READABLE | AMDGPU_VM_PAGE_WRITEABLE | - AMDGPU_VM_PAGE_EXECUTABLE); + AMDGPU_PTE_READABLE | AMDGPU_PTE_WRITEABLE | + AMDGPU_PTE_EXECUTABLE); if (r) { DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);