From 3303f4dbe79924c471ccb6673a8265dd20ce3243 Mon Sep 17 00:00:00 2001 From: solidDoWant Date: Sat, 30 Dec 2023 15:21:36 -0600 Subject: [PATCH 1/3] Fix `make rk3588-blade3-v101-linux.img` compilation bug with GCC 11 The build command `make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- rk3588-blade3-v101-linux.img` fails with GCC 11 because the `continue` statement on the modified line is indented when it should not be. This throws a `misleading-indentation` warning which is forbidden by the build flags. --- drivers/video/rockchip/rga3/rga_policy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/rockchip/rga3/rga_policy.c b/drivers/video/rockchip/rga3/rga_policy.c index 31f4ec231fa23e..51c4bf54f4ed83 100644 --- a/drivers/video/rockchip/rga3/rga_policy.c +++ b/drivers/video/rockchip/rga3/rga_policy.c @@ -244,7 +244,7 @@ int rga_job_assign(struct rga_job *job) job->flags & RGA_JOB_UNSUPPORT_RGA2) { if (DEBUGGER_EN(MSG)) pr_info("RGA2 only support under 4G memory!\n"); - continue; + continue; } if (feature > 0) { @@ -351,4 +351,4 @@ int rga_job_assign(struct rga_job *job) pr_info("assign core: %d\n", core); return core; -} \ No newline at end of file +} From 2f592d10e2562bc42e319786aefa080493e3cca7 Mon Sep 17 00:00:00 2001 From: solidDoWant Date: Sat, 30 Dec 2023 15:22:26 -0600 Subject: [PATCH 2/3] revert accidental new line addition From 670e8662ef2e14bd3bc9fe39e881c03bd2c8fdb5 Mon Sep 17 00:00:00 2001 From: solidDoWant Date: Sat, 30 Dec 2023 15:35:37 -0600 Subject: [PATCH 3/3] Fixed `capture.c` indentation issues --- drivers/media/platform/rockchip/cif/capture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/capture.c b/drivers/media/platform/rockchip/cif/capture.c index e579445da42a7e..dc0e23b42502da 100644 --- a/drivers/media/platform/rockchip/cif/capture.c +++ b/drivers/media/platform/rockchip/cif/capture.c @@ -6107,7 +6107,7 @@ static int rkcif_dvp_g_ch_id(struct v4l2_device *v4l2_dev, if ((frm_stat & DVP_CHANNEL2_FRM_READ) == DVP_CHANNEL2_FRM_READ) v4l2_warn(v4l2_dev, "frame0/1 trigger simultaneously in DVP ID2\n"); - *intstat &= ~DVP_FRAME_END_ID2; + *intstat &= ~DVP_FRAME_END_ID2; return RKCIF_STREAM_MIPI_ID2; } @@ -6115,7 +6115,7 @@ static int rkcif_dvp_g_ch_id(struct v4l2_device *v4l2_dev, if ((frm_stat & DVP_CHANNEL3_FRM_READ) == DVP_CHANNEL3_FRM_READ) v4l2_warn(v4l2_dev, "frame0/1 trigger simultaneously in DVP ID3\n"); - *intstat &= ~DVP_FRAME_END_ID3; + *intstat &= ~DVP_FRAME_END_ID3; return RKCIF_STREAM_MIPI_ID3; }