enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uefi-loong64-6.19: rewrite against 6.19-rc4

Browse Source
This commit is contained in:
Ricardo Pardini 2026-01-06 21:44:48 +01:00 committed by Igor
parent 7e2a0b362f
commit 3be9a59c8d
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patch/kernel/archive/uefi-loong64-6.19/0001-drm-xe-bo-fix-alignment-with-non-4KiB-kernel-page-si.patch
View File

@ -102,7 +102,7 @@ diff --git a/drivers/gpu/drm/xe/xe_bo.c b/drivers/gpu/drm/xe/xe_bo.c
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/xe/xe_bo.c
+++ b/drivers/gpu/drm/xe/xe_bo.c
@@ -2129,9 +2129,9 @@ struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo,
@@ -2169,9 +2169,9 @@ struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo,
flags |= XE_BO_FLAG_INTERNAL_64K;
alignment = align >> PAGE_SHIFT;
} else {
@ -114,7 +114,7 @@ index 111111111111..222222222222 100644
}
if (type == ttm_bo_type_device && aligned_size != size)
@@ -2155,7 +2155,7 @@ struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo,
@@ -2195,7 +2195,7 @@ struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo,
#endif
INIT_LIST_HEAD(&bo->vram_userfault_link);

22
patch/kernel/archive/uefi-loong64-6.19/0002-drm-xe-guc-use-GUC_SIZE-SZ_4K-for-alignment.patch
View File

@ -64,7 +64,7 @@ diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/xe/xe_guc.c
+++ b/drivers/gpu/drm/xe/xe_guc.c
@@ -95,7 +95,7 @@ static u32 guc_ctl_feature_flags(struct xe_guc *guc)
@@ -101,7 +101,7 @@ static u32 guc_ctl_feature_flags(struct xe_guc *guc)
static u32 guc_ctl_log_params_flags(struct xe_guc *guc)
{
@ -73,7 +73,7 @@ index 111111111111..222222222222 100644
u32 flags;
#if (((CRASH_BUFFER_SIZE) % SZ_1M) == 0)
@@ -140,7 +140,7 @@ static u32 guc_ctl_log_params_flags(struct xe_guc *guc)
@@ -146,7 +146,7 @@ static u32 guc_ctl_log_params_flags(struct xe_guc *guc)
static u32 guc_ctl_ads_flags(struct xe_guc *guc)
{
@ -213,7 +213,7 @@ index 111111111111..222222222222 100644
}
static void guc_mmio_regset_write_one(struct xe_guc_ads *ads,
@@ -948,7 +948,7 @@ static void guc_golden_lrc_populate(struct xe_guc_ads *ads)
@@ -952,7 +952,7 @@ static void guc_golden_lrc_populate(struct xe_guc_ads *ads)
xe_gt_assert(gt, gt->default_lrc[class]);
real_size = xe_gt_lrc_size(gt, class);
@ -226,7 +226,7 @@ diff --git a/drivers/gpu/drm/xe/xe_guc_capture.c b/drivers/gpu/drm/xe/xe_guc_cap
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/xe/xe_guc_capture.c
+++ b/drivers/gpu/drm/xe/xe_guc_capture.c
@@ -591,8 +591,8 @@ guc_capture_getlistsize(struct xe_guc *guc, u32 owner, u32 type,
@@ -618,8 +618,8 @@ guc_capture_getlistsize(struct xe_guc *guc, u32 owner, u32 type,
return -ENODATA;
if (size)
@ -237,7 +237,7 @@ index 111111111111..222222222222 100644
return 0;
}
@@ -739,7 +739,7 @@ size_t xe_guc_capture_ads_input_worst_size(struct xe_guc *guc)
@@ -766,7 +766,7 @@ size_t xe_guc_capture_ads_input_worst_size(struct xe_guc *guc)
* sequence, that is, during the pre-hwconfig phase before we have
* the exact engine fusing info.
*/
@ -246,7 +246,7 @@ index 111111111111..222222222222 100644
for (i = 0; i < GUC_CAPTURE_LIST_INDEX_MAX; i++) {
for (j = 0; j < GUC_CAPTURE_LIST_CLASS_MAX; j++) {
if (xe_guc_capture_getlistsize(guc, i,
@@ -759,7 +759,7 @@ size_t xe_guc_capture_ads_input_worst_size(struct xe_guc *guc)
@@ -786,7 +786,7 @@ size_t xe_guc_capture_ads_input_worst_size(struct xe_guc *guc)
total_size += global_size;
}
@ -259,15 +259,15 @@ diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/xe/xe_guc_ct.c
+++ b/drivers/gpu/drm/xe/xe_guc_ct.c
@@ -224,7 +224,7 @@ int xe_guc_ct_init_noalloc(struct xe_guc_ct *ct)
@@ -225,7 +225,7 @@ int xe_guc_ct_init_noalloc(struct xe_guc_ct *ct)
struct xe_gt *gt = ct_to_gt(ct);
int err;
- xe_gt_assert(gt, !(guc_ct_size() % PAGE_SIZE));
+ xe_gt_assert(gt, !(guc_ct_size() % GUC_ALIGN));
ct->g2h_wq = alloc_ordered_workqueue("xe-g2h-wq", WQ_MEM_RECLAIM);
if (!ct->g2h_wq)
err = drmm_mutex_init(&xe->drm, &ct->lock);
if (err)
diff --git a/drivers/gpu/drm/xe/xe_guc_log.c b/drivers/gpu/drm/xe/xe_guc_log.c
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/xe/xe_guc_log.c
@ -302,7 +302,7 @@ diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/xe/xe_guc_pc.c
+++ b/drivers/gpu/drm/xe/xe_guc_pc.c
@@ -1239,7 +1239,7 @@ int xe_guc_pc_start(struct xe_guc_pc *pc)
@@ -1222,7 +1222,7 @@ int xe_guc_pc_start(struct xe_guc_pc *pc)
{
struct xe_device *xe = pc_to_xe(pc);
struct xe_gt *gt = pc_to_gt(pc);
@ -311,7 +311,7 @@ index 111111111111..222222222222 100644
unsigned int fw_ref;
ktime_t earlier;
int ret;
@@ -1372,7 +1372,7 @@ int xe_guc_pc_init(struct xe_guc_pc *pc)
@@ -1355,7 +1355,7 @@ int xe_guc_pc_init(struct xe_guc_pc *pc)
struct xe_tile *tile = gt_to_tile(gt);
struct xe_device *xe = gt_to_xe(gt);
struct xe_bo *bo;

4
patch/kernel/archive/uefi-loong64-6.19/0004-drm-xe-use-4KiB-alignment-for-cursor-jumps.patch
View File

@ -98,7 +98,7 @@ diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/xe/xe_migrate.c
+++ b/drivers/gpu/drm/xe/xe_migrate.c
@@ -617,7 +617,7 @@ static void emit_pte(struct xe_migrate *m,
@@ -631,7 +631,7 @@ static void emit_pte(struct xe_migrate *m,
u64 addr, flags = 0;
bool devmem = false;
@ -107,7 +107,7 @@ index 111111111111..222222222222 100644
if (is_vram) {
if (vm->flags & XE_VM_FLAG_64K) {
u64 va = cur_ofs * XE_PAGE_SIZE / 8;
@@ -638,7 +638,7 @@ static void emit_pte(struct xe_migrate *m,
@@ -652,7 +652,7 @@ static void emit_pte(struct xe_migrate *m,
bb->cs[bb->len++] = lower_32_bits(addr);
bb->cs[bb->len++] = upper_32_bits(addr);