qcs6490-6.18: patch 0022 drm/msm/dpu sc7280 catalog fails to apply on linux-6.18.y #9473
Description
Summary
While building the radxa-dragon-q6a kernel (qcs6490, edge) from Armbian build, patch:
patch/kernel/archive/qcs6490-6.18/0022-drm-msm-dpu-Add-missing-caps-and-blocks-to-sc7280-ca.patch
fails to apply against the current linux-6.18.y base, causing the kernel build to abort (patching.py raises Exception: Failed to apply 1 patches.).
This blocks downstream builds that otherwise only need unrelated changes (e.g. audio/USB-offload work).
Environment
- Repo:
armbian/build - Board:
radxa-dragon-q6a - Command (example):
./compile.sh kernel BOARD=radxa-dragon-q6a BRANCH=edge RELEASE=noble \ BUILD_MINIMAL=yes BUILD_DESKTOP=no EXPERT=yes PREFER_DOCKER=no KERNEL_GIT=shallow
Failure details
- Target file:
drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h git apply -p1 --checkfails.git apply -p1 --rejectproduces rejects for 3 hunks (caps/pingpong/mdss cfg); one hunk (MDP clk ctrl) may apply.
Observed reject excerpt:
@@ -9,9 +9,11 @@
static const struct dpu_caps sc7280_dpu_caps = {
.max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH,
- .max_mixer_blendstages = 0x7,
+ .max_mixer_blendstages = 0x9,
+ .has_src_split = true,
...
@@ -128,29 +131,42 @@ static const struct dpu_pingpong_cfg sc7280_pp[] = {
...Likely root cause
The target file appears to have diverged / partially incorporated similar changes already:
has_3d_merge = trueis already present insc7280_dpu_caps.DPU_CLK_CTRL_REG_DMAis already present insc7280_mdp.sc7280_pp[]andsc7280_merge_3d[]structures differ from what 0022 expects.
So the patch context no longer matches (failed_apply).
Request
Please rebase/update this patch for the current linux-6.18.y base, or drop it if the equivalent functionality is already present upstream.