From: Greg Kroah-Hartman Date: Wed, 15 Oct 2025 08:52:30 +0000 (+0200) Subject: drop drm 6.17 patch that is already in the tree X-Git-Tag: v6.1.156~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cf71d555ad2f60bb53aedf5324133a26a071ffd;p=thirdparty%2Fkernel%2Fstable-queue.git drop drm 6.17 patch that is already in the tree --- diff --git a/queue-6.17/drm-amdgpu-fix-incorrect-vm-flags-to-map-bo.patch b/queue-6.17/drm-amdgpu-fix-incorrect-vm-flags-to-map-bo.patch deleted file mode 100644 index ee7a482b70..0000000000 --- a/queue-6.17/drm-amdgpu-fix-incorrect-vm-flags-to-map-bo.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ffb35d618348b4d11ff5919c8982217e136a825d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 11 Aug 2025 15:20:55 +0800 -Subject: drm/amdgpu: fix incorrect vm flags to map bo - -From: Jack Xiao - -[ Upstream commit b08425fa77ad2f305fe57a33dceb456be03b653f ] - -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 -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 02138aa557935..dfb6cfd837606 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.51.0 - diff --git a/queue-6.17/series b/queue-6.17/series index 63eae9ab57..b83a98af68 100644 --- a/queue-6.17/series +++ b/queue-6.17/series @@ -227,7 +227,6 @@ f2fs-fix-to-zero-data-after-eof-for-compressed-file-.patch drm-bridge-it6505-select-regmap_i2c.patch wifi-rtw88-lock-rtwdev-mutex-before-setting-the-led.patch hid-steelseries-refactor-probe-and-remove.patch -drm-amdgpu-fix-incorrect-vm-flags-to-map-bo.patch media-zoran-remove-zoran_fh-structure.patch phy-rockchip-naneng-combphy-enable-u3-otg-port-for-r.patch drm-bridge-cdns-dsi-fix-the-_atomic_check.patch