diff --git a/.github/workflows/android-mainline-clang-19.yml b/.github/workflows/android-mainline-clang-19.yml index 63dfaee6..64726c43 100644 --- a/.github/workflows/android-mainline-clang-19.yml +++ b/.github/workflows/android-mainline-clang-19.yml @@ -67,7 +67,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-19.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json tuxsuite/android-mainline-clang-19.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py @@ -197,7 +197,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name allconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-19.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name allconfigs --json-out builds.json tuxsuite/android-mainline-clang-19.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py diff --git a/.github/workflows/android-mainline-clang-20.yml b/.github/workflows/android-mainline-clang-20.yml index 276fcb70..4997648d 100644 --- a/.github/workflows/android-mainline-clang-20.yml +++ b/.github/workflows/android-mainline-clang-20.yml @@ -67,7 +67,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-20.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json tuxsuite/android-mainline-clang-20.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py @@ -197,7 +197,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name allconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-20.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name allconfigs --json-out builds.json tuxsuite/android-mainline-clang-20.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py diff --git a/.github/workflows/android-mainline-clang-21.yml b/.github/workflows/android-mainline-clang-21.yml index 34197506..3b739b0a 100644 --- a/.github/workflows/android-mainline-clang-21.yml +++ b/.github/workflows/android-mainline-clang-21.yml @@ -67,7 +67,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-21.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json tuxsuite/android-mainline-clang-21.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py @@ -197,7 +197,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name allconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-21.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name allconfigs --json-out builds.json tuxsuite/android-mainline-clang-21.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py diff --git a/.github/workflows/android-mainline-clang-22.yml b/.github/workflows/android-mainline-clang-22.yml index 984b08d1..dc572dd1 100644 --- a/.github/workflows/android-mainline-clang-22.yml +++ b/.github/workflows/android-mainline-clang-22.yml @@ -67,7 +67,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-22.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json tuxsuite/android-mainline-clang-22.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py @@ -197,7 +197,7 @@ jobs: if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - name: tuxsuite if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name allconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-22.tux.yml || true + run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name allconfigs --json-out builds.json tuxsuite/android-mainline-clang-22.tux.yml || true - name: Update Cache Build Status if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} run: python caching/update.py diff --git a/patches/android-mainline/7fa37ba25a1dfc084e24ea9acc14bf1fad8af14c.patch b/patches/android-mainline/7fa37ba25a1dfc084e24ea9acc14bf1fad8af14c.patch deleted file mode 100644 index c52db985..00000000 --- a/patches/android-mainline/7fa37ba25a1dfc084e24ea9acc14bf1fad8af14c.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 7fa37ba25a1dfc084e24ea9acc14bf1fad8af14c Mon Sep 17 00:00:00 2001 -From: Arnd Bergmann -Date: Thu, 7 Aug 2025 22:54:15 +0200 -Subject: media: s5p-mfc: remove an unused/uninitialized variable - -The s5p_mfc_cmd_args structure in the v6 driver is never used, not -initialized to anything other than zero, but as of clang-21 this -causes a warning: - -drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c:45:7: error: variable 'h2r_args' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer] - 45 | &h2r_args); - | ^~~~~~~~ - -Just remove this for simplicity. Since the function is also called -through a callback, this does require adding a trivial wrapper with -the correct prototype. - -Fixes: f96f3cfa0bb8 ("[media] s5p-mfc: Update MFC v4l2 driver to support MFC6.x") -Cc: stable@vger.kernel.org -Signed-off-by: Arnd Bergmann -Signed-off-by: Hans Verkuil ---- -Link: https://git.linuxtv.org/media.git/commit/?id=7fa37ba25a1dfc084e24ea9acc14bf1fad8af14c ---- - .../platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c | 35 ++++++++-------------- - 1 file changed, 13 insertions(+), 22 deletions(-) - -diff --git a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c -index 47bc3014b5d8..f7c682fca645 100644 ---- a/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c -+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c -@@ -14,8 +14,7 @@ - #include "s5p_mfc_opr.h" - #include "s5p_mfc_cmd_v6.h" - --static int s5p_mfc_cmd_host2risc_v6(struct s5p_mfc_dev *dev, int cmd, -- const struct s5p_mfc_cmd_args *args) -+static int s5p_mfc_cmd_host2risc_v6(struct s5p_mfc_dev *dev, int cmd) - { - mfc_debug(2, "Issue the command: %d\n", cmd); - -@@ -31,7 +30,6 @@ static int s5p_mfc_cmd_host2risc_v6(struct s5p_mfc_dev *dev, int cmd, - - static int s5p_mfc_sys_init_cmd_v6(struct s5p_mfc_dev *dev) - { -- struct s5p_mfc_cmd_args h2r_args; - const struct s5p_mfc_buf_size_v6 *buf_size = dev->variant->buf_size->priv; - int ret; - -@@ -41,33 +39,23 @@ static int s5p_mfc_sys_init_cmd_v6(struct s5p_mfc_dev *dev) - - mfc_write(dev, dev->ctx_buf.dma, S5P_FIMV_CONTEXT_MEM_ADDR_V6); - mfc_write(dev, buf_size->dev_ctx, S5P_FIMV_CONTEXT_MEM_SIZE_V6); -- return s5p_mfc_cmd_host2risc_v6(dev, S5P_FIMV_H2R_CMD_SYS_INIT_V6, -- &h2r_args); -+ return s5p_mfc_cmd_host2risc_v6(dev, S5P_FIMV_H2R_CMD_SYS_INIT_V6); - } - - static int s5p_mfc_sleep_cmd_v6(struct s5p_mfc_dev *dev) - { -- struct s5p_mfc_cmd_args h2r_args; -- -- memset(&h2r_args, 0, sizeof(struct s5p_mfc_cmd_args)); -- return s5p_mfc_cmd_host2risc_v6(dev, S5P_FIMV_H2R_CMD_SLEEP_V6, -- &h2r_args); -+ return s5p_mfc_cmd_host2risc_v6(dev, S5P_FIMV_H2R_CMD_SLEEP_V6); - } - - static int s5p_mfc_wakeup_cmd_v6(struct s5p_mfc_dev *dev) - { -- struct s5p_mfc_cmd_args h2r_args; -- -- memset(&h2r_args, 0, sizeof(struct s5p_mfc_cmd_args)); -- return s5p_mfc_cmd_host2risc_v6(dev, S5P_FIMV_H2R_CMD_WAKEUP_V6, -- &h2r_args); -+ return s5p_mfc_cmd_host2risc_v6(dev, S5P_FIMV_H2R_CMD_WAKEUP_V6); - } - - /* Open a new instance and get its number */ - static int s5p_mfc_open_inst_cmd_v6(struct s5p_mfc_ctx *ctx) - { - struct s5p_mfc_dev *dev = ctx->dev; -- struct s5p_mfc_cmd_args h2r_args; - int codec_type; - - mfc_debug(2, "Requested codec mode: %d\n", ctx->codec_mode); -@@ -129,23 +117,20 @@ static int s5p_mfc_open_inst_cmd_v6(struct s5p_mfc_ctx *ctx) - mfc_write(dev, ctx->ctx.size, S5P_FIMV_CONTEXT_MEM_SIZE_V6); - mfc_write(dev, 0, S5P_FIMV_D_CRC_CTRL_V6); /* no crc */ - -- return s5p_mfc_cmd_host2risc_v6(dev, S5P_FIMV_H2R_CMD_OPEN_INSTANCE_V6, -- &h2r_args); -+ return s5p_mfc_cmd_host2risc_v6(dev, S5P_FIMV_H2R_CMD_OPEN_INSTANCE_V6); - } - - /* Close instance */ - static int s5p_mfc_close_inst_cmd_v6(struct s5p_mfc_ctx *ctx) - { - struct s5p_mfc_dev *dev = ctx->dev; -- struct s5p_mfc_cmd_args h2r_args; - int ret = 0; - - dev->curr_ctx = ctx->num; - if (ctx->state != MFCINST_FREE) { - mfc_write(dev, ctx->inst_no, S5P_FIMV_INSTANCE_ID_V6); - ret = s5p_mfc_cmd_host2risc_v6(dev, -- S5P_FIMV_H2R_CMD_CLOSE_INSTANCE_V6, -- &h2r_args); -+ S5P_FIMV_H2R_CMD_CLOSE_INSTANCE_V6); - } else { - ret = -EINVAL; - } -@@ -153,9 +138,15 @@ static int s5p_mfc_close_inst_cmd_v6(struct s5p_mfc_ctx *ctx) - return ret; - } - -+static int s5p_mfc_cmd_host2risc_v6_args(struct s5p_mfc_dev *dev, int cmd, -+ const struct s5p_mfc_cmd_args *ignored) -+{ -+ return s5p_mfc_cmd_host2risc_v6(dev, cmd); -+} -+ - /* Initialize cmd function pointers for MFC v6 */ - static const struct s5p_mfc_hw_cmds s5p_mfc_cmds_v6 = { -- .cmd_host2risc = s5p_mfc_cmd_host2risc_v6, -+ .cmd_host2risc = s5p_mfc_cmd_host2risc_v6_args, - .sys_init_cmd = s5p_mfc_sys_init_cmd_v6, - .sleep_cmd = s5p_mfc_sleep_cmd_v6, - .wakeup_cmd = s5p_mfc_wakeup_cmd_v6, --- -cgit v1.2.3 - diff --git a/patches/android-mainline/series b/patches/android-mainline/series deleted file mode 100644 index 250c20f7..00000000 --- a/patches/android-mainline/series +++ /dev/null @@ -1 +0,0 @@ -7fa37ba25a1dfc084e24ea9acc14bf1fad8af14c.patch diff --git a/tuxsuite/android-mainline-clang-19.tux.yml b/tuxsuite/android-mainline-clang-19.tux.yml index 8761740c..ab9ccc17 100644 --- a/tuxsuite/android-mainline-clang-19.tux.yml +++ b/tuxsuite/android-mainline-clang-19.tux.yml @@ -2,10 +2,9 @@ # This file has been autogenerated by invoking: # $ ./generate_tuxsuite.py android-mainline # Invoke tuxsuite via: -# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-19.tux.yml +# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json tuxsuite/android-mainline-clang-19.tux.yml # Invoke locally via: # $ git clone -b android-mainline --depth=1 https://android.googlesource.com/kernel/common.git linux -# $ git -C linux quiltimport --patches ../patches/android-mainline # $ scripts/build-local.py -C linux -f tuxsuite/android-mainline-clang-19.tux.yml -j defconfigs version: 1 name: https://android.googlesource.com/kernel/common.git at android-mainline diff --git a/tuxsuite/android-mainline-clang-20.tux.yml b/tuxsuite/android-mainline-clang-20.tux.yml index b7c6404f..cd304c38 100644 --- a/tuxsuite/android-mainline-clang-20.tux.yml +++ b/tuxsuite/android-mainline-clang-20.tux.yml @@ -2,10 +2,9 @@ # This file has been autogenerated by invoking: # $ ./generate_tuxsuite.py android-mainline # Invoke tuxsuite via: -# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-20.tux.yml +# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json tuxsuite/android-mainline-clang-20.tux.yml # Invoke locally via: # $ git clone -b android-mainline --depth=1 https://android.googlesource.com/kernel/common.git linux -# $ git -C linux quiltimport --patches ../patches/android-mainline # $ scripts/build-local.py -C linux -f tuxsuite/android-mainline-clang-20.tux.yml -j defconfigs version: 1 name: https://android.googlesource.com/kernel/common.git at android-mainline diff --git a/tuxsuite/android-mainline-clang-21.tux.yml b/tuxsuite/android-mainline-clang-21.tux.yml index 80d81b59..c3a9ce7a 100644 --- a/tuxsuite/android-mainline-clang-21.tux.yml +++ b/tuxsuite/android-mainline-clang-21.tux.yml @@ -2,10 +2,9 @@ # This file has been autogenerated by invoking: # $ ./generate_tuxsuite.py android-mainline # Invoke tuxsuite via: -# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-21.tux.yml +# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json tuxsuite/android-mainline-clang-21.tux.yml # Invoke locally via: # $ git clone -b android-mainline --depth=1 https://android.googlesource.com/kernel/common.git linux -# $ git -C linux quiltimport --patches ../patches/android-mainline # $ scripts/build-local.py -C linux -f tuxsuite/android-mainline-clang-21.tux.yml -j defconfigs version: 1 name: https://android.googlesource.com/kernel/common.git at android-mainline diff --git a/tuxsuite/android-mainline-clang-22.tux.yml b/tuxsuite/android-mainline-clang-22.tux.yml index 93aa8263..85ab475e 100644 --- a/tuxsuite/android-mainline-clang-22.tux.yml +++ b/tuxsuite/android-mainline-clang-22.tux.yml @@ -2,10 +2,9 @@ # This file has been autogenerated by invoking: # $ ./generate_tuxsuite.py android-mainline # Invoke tuxsuite via: -# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-22.tux.yml +# $ tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name defconfigs --json-out builds.json tuxsuite/android-mainline-clang-22.tux.yml # Invoke locally via: # $ git clone -b android-mainline --depth=1 https://android.googlesource.com/kernel/common.git linux -# $ git -C linux quiltimport --patches ../patches/android-mainline # $ scripts/build-local.py -C linux -f tuxsuite/android-mainline-clang-22.tux.yml -j defconfigs version: 1 name: https://android.googlesource.com/kernel/common.git at android-mainline