From a06ae9c5392aaf068d14e3d60d3ee0f468395214 Mon Sep 17 00:00:00 2001 From: Jianfeng Liu Date: Mon, 13 Oct 2025 15:05:46 +0800 Subject: [PATCH] uefi-loong64-edge: bump to 6.18 --- ...1-drm-xe-bo-fix-alignment-with-non-4KiB-kernel-page-si.patch | 0 .../0002-drm-xe-guc-use-GUC_SIZE-SZ_4K-for-alignment.patch | 2 +- .../0003-drm-xe-regs-fix-RING_CTL_SIZE-size-calculation.patch | 0 .../0004-drm-xe-use-4KiB-alignment-for-cursor-jumps.patch | 0 ...5-drm-xe-query-use-PAGE_SIZE-as-the-minimum-page-align.patch | 0 .../0006-enable-xe-on-16K-pagesize.patch | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename patch/kernel/archive/{uefi-loong64-6.17 => uefi-loong64-6.18}/0001-drm-xe-bo-fix-alignment-with-non-4KiB-kernel-page-si.patch (100%) rename patch/kernel/archive/{uefi-loong64-6.17 => uefi-loong64-6.18}/0002-drm-xe-guc-use-GUC_SIZE-SZ_4K-for-alignment.patch (99%) rename patch/kernel/archive/{uefi-loong64-6.17 => uefi-loong64-6.18}/0003-drm-xe-regs-fix-RING_CTL_SIZE-size-calculation.patch (100%) rename patch/kernel/archive/{uefi-loong64-6.17 => uefi-loong64-6.18}/0004-drm-xe-use-4KiB-alignment-for-cursor-jumps.patch (100%) rename patch/kernel/archive/{uefi-loong64-6.17 => uefi-loong64-6.18}/0005-drm-xe-query-use-PAGE_SIZE-as-the-minimum-page-align.patch (100%) rename patch/kernel/archive/{uefi-loong64-6.17 => uefi-loong64-6.18}/0006-enable-xe-on-16K-pagesize.patch (100%) diff --git a/patch/kernel/archive/uefi-loong64-6.17/0001-drm-xe-bo-fix-alignment-with-non-4KiB-kernel-page-si.patch b/patch/kernel/archive/uefi-loong64-6.18/0001-drm-xe-bo-fix-alignment-with-non-4KiB-kernel-page-si.patch similarity index 100% rename from patch/kernel/archive/uefi-loong64-6.17/0001-drm-xe-bo-fix-alignment-with-non-4KiB-kernel-page-si.patch rename to patch/kernel/archive/uefi-loong64-6.18/0001-drm-xe-bo-fix-alignment-with-non-4KiB-kernel-page-si.patch diff --git a/patch/kernel/archive/uefi-loong64-6.17/0002-drm-xe-guc-use-GUC_SIZE-SZ_4K-for-alignment.patch b/patch/kernel/archive/uefi-loong64-6.18/0002-drm-xe-guc-use-GUC_SIZE-SZ_4K-for-alignment.patch similarity index 99% rename from patch/kernel/archive/uefi-loong64-6.17/0002-drm-xe-guc-use-GUC_SIZE-SZ_4K-for-alignment.patch rename to patch/kernel/archive/uefi-loong64-6.18/0002-drm-xe-guc-use-GUC_SIZE-SZ_4K-for-alignment.patch index b4271d7995..fcae7dff6b 100644 --- a/patch/kernel/archive/uefi-loong64-6.17/0002-drm-xe-guc-use-GUC_SIZE-SZ_4K-for-alignment.patch +++ b/patch/kernel/archive/uefi-loong64-6.18/0002-drm-xe-guc-use-GUC_SIZE-SZ_4K-for-alignment.patch @@ -79,7 +79,7 @@ index 111111111111..222222222222 100644 { - u32 ads = guc_bo_ggtt_addr(guc, guc->ads.bo) >> PAGE_SHIFT; + u32 ads = guc_bo_ggtt_addr(guc, guc->ads.bo) >> XE_PTE_SHIFT; - u32 flags = ads << GUC_ADS_ADDR_SHIFT; + u32 flags = FIELD_PREP(GUC_ADS_ADDR, ads); return flags; diff --git a/drivers/gpu/drm/xe/xe_guc.h b/drivers/gpu/drm/xe/xe_guc.h diff --git a/patch/kernel/archive/uefi-loong64-6.17/0003-drm-xe-regs-fix-RING_CTL_SIZE-size-calculation.patch b/patch/kernel/archive/uefi-loong64-6.18/0003-drm-xe-regs-fix-RING_CTL_SIZE-size-calculation.patch similarity index 100% rename from patch/kernel/archive/uefi-loong64-6.17/0003-drm-xe-regs-fix-RING_CTL_SIZE-size-calculation.patch rename to patch/kernel/archive/uefi-loong64-6.18/0003-drm-xe-regs-fix-RING_CTL_SIZE-size-calculation.patch diff --git a/patch/kernel/archive/uefi-loong64-6.17/0004-drm-xe-use-4KiB-alignment-for-cursor-jumps.patch b/patch/kernel/archive/uefi-loong64-6.18/0004-drm-xe-use-4KiB-alignment-for-cursor-jumps.patch similarity index 100% rename from patch/kernel/archive/uefi-loong64-6.17/0004-drm-xe-use-4KiB-alignment-for-cursor-jumps.patch rename to patch/kernel/archive/uefi-loong64-6.18/0004-drm-xe-use-4KiB-alignment-for-cursor-jumps.patch diff --git a/patch/kernel/archive/uefi-loong64-6.17/0005-drm-xe-query-use-PAGE_SIZE-as-the-minimum-page-align.patch b/patch/kernel/archive/uefi-loong64-6.18/0005-drm-xe-query-use-PAGE_SIZE-as-the-minimum-page-align.patch similarity index 100% rename from patch/kernel/archive/uefi-loong64-6.17/0005-drm-xe-query-use-PAGE_SIZE-as-the-minimum-page-align.patch rename to patch/kernel/archive/uefi-loong64-6.18/0005-drm-xe-query-use-PAGE_SIZE-as-the-minimum-page-align.patch diff --git a/patch/kernel/archive/uefi-loong64-6.17/0006-enable-xe-on-16K-pagesize.patch b/patch/kernel/archive/uefi-loong64-6.18/0006-enable-xe-on-16K-pagesize.patch similarity index 100% rename from patch/kernel/archive/uefi-loong64-6.17/0006-enable-xe-on-16K-pagesize.patch rename to patch/kernel/archive/uefi-loong64-6.18/0006-enable-xe-on-16K-pagesize.patch