From e5751b516390e412091ab01b7696d580d98319be Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 5 Jun 2024 19:10:04 -0400 Subject: [PATCH] Drop drm-msm-dpu-remove-empty-useless-labels.patch Signed-off-by: Sasha Levin --- ...-msm-dpu-remove-empty-useless-labels.patch | 288 ------------------ queue-4.19/series | 1 - 2 files changed, 289 deletions(-) delete mode 100644 queue-4.19/drm-msm-dpu-remove-empty-useless-labels.patch diff --git a/queue-4.19/drm-msm-dpu-remove-empty-useless-labels.patch b/queue-4.19/drm-msm-dpu-remove-empty-useless-labels.patch deleted file mode 100644 index e95cf8d8d0a..00000000000 --- a/queue-4.19/drm-msm-dpu-remove-empty-useless-labels.patch +++ /dev/null @@ -1,288 +0,0 @@ -From 99ed5fb980b740da9246f1862dc9fafcbb4d545a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Sep 2018 10:58:17 -0400 -Subject: drm/msm: dpu: Remove empty/useless labels - -From: Sean Paul - -[ Upstream commit 0841851f3b22bc1da09683aa458efe9f9e2abf51 ] - -I noticed an empty label while driving by and decided to use -coccinelle to see if there were any more. Here's the spatch and the -invocation: ---- - -@@ -identifier lbl; -expression E; -@@ - -- goto lbl; -+ return E; -... -- lbl: - return E; - -@@ -identifier lbl; -@@ - -- goto lbl; -+ return; -... -- lbl: -- return; - ---- -spatch --allow-inconsistent-paths --sp-file file.spatch --dir -drivers/gpu/drm/msm/disp/dpu1 --in-place ---- - -Reviewed-by: Jeykumar Sankaran -Signed-off-by: Sean Paul - -Signed-off-by: Rob Clark -Stable-dep-of: 2b938c3ab0a6 ("drm/msm/dpu: Always flush the slave INTF on the CTL") -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 5 ++--- - .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 8 ++------ - drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 5 ++--- - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 +-- - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 15 ++++++--------- - drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 3 +-- - drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 4 +--- - 7 files changed, 15 insertions(+), 28 deletions(-) - -diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c -index 41c5191f9056c..affc9738e2b5b 100644 ---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c -+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c -@@ -68,7 +68,7 @@ static bool _dpu_core_video_mode_intf_connected(struct drm_crtc *crtc) - bool intf_connected = false; - - if (!crtc) -- goto end; -+ return intf_connected; - - drm_for_each_crtc(tmp_crtc, crtc->dev) { - if ((dpu_crtc_get_intf_mode(tmp_crtc) == INTF_MODE_VIDEO) && -@@ -76,11 +76,10 @@ static bool _dpu_core_video_mode_intf_connected(struct drm_crtc *crtc) - DPU_DEBUG("video interface connected crtc:%d\n", - tmp_crtc->base.id); - intf_connected = true; -- goto end; -+ return intf_connected; - } - } - --end: - return intf_connected; - } - -diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c -index c8c4612dc34dd..f2aa62bae8bfd 100644 ---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c -+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c -@@ -515,14 +515,11 @@ static void dpu_encoder_phys_cmd_enable_helper( - _dpu_encoder_phys_cmd_pingpong_config(phys_enc); - - if (!dpu_encoder_phys_cmd_is_master(phys_enc)) -- goto skip_flush; -+ return; - - ctl = phys_enc->hw_ctl; - ctl->ops.get_bitmask_intf(ctl, &flush_mask, phys_enc->intf_idx); - ctl->ops.update_pending_flush(ctl, flush_mask); -- --skip_flush: -- return; - } - - static void dpu_encoder_phys_cmd_enable(struct dpu_encoder_phys *phys_enc) -@@ -832,7 +829,7 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init( - if (!cmd_enc) { - ret = -ENOMEM; - DPU_ERROR("failed to allocate\n"); -- goto fail; -+ return ERR_PTR(ret); - } - phys_enc = &cmd_enc->base; - phys_enc->hw_mdptop = p->dpu_kms->hw_mdp; -@@ -890,6 +887,5 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init( - - return phys_enc; - --fail: - return ERR_PTR(ret); - } -diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c -index bfcd165e96dfe..0aa9b8e1ae707 100644 ---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c -+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c -@@ -921,7 +921,7 @@ static int _dpu_format_populate_addrs_ubwc( - + layout->plane_size[2] + layout->plane_size[3]; - - if (!meta) -- goto done; -+ return 0; - - /* configure Y metadata plane */ - layout->plane_addr[2] = base_addr; -@@ -952,12 +952,11 @@ static int _dpu_format_populate_addrs_ubwc( - layout->plane_addr[1] = 0; - - if (!meta) -- goto done; -+ return 0; - - layout->plane_addr[2] = base_addr; - layout->plane_addr[3] = 0; - } --done: - return 0; - } - -diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c -index cc3a623903f4f..52fca13da1765 100644 ---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c -+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c -@@ -177,7 +177,7 @@ static u32 dpu_hw_pp_get_line_count(struct dpu_hw_pingpong *pp) - height = DPU_REG_READ(c, PP_SYNC_CONFIG_HEIGHT) & 0xFFFF; - - if (height < init) -- goto line_count_exit; -+ return line; - - line = DPU_REG_READ(c, PP_INT_COUNT_VAL) & 0xFFFF; - -@@ -186,7 +186,6 @@ static u32 dpu_hw_pp_get_line_count(struct dpu_hw_pingpong *pp) - else - line -= init; - --line_count_exit: - return line; - } - -diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c -index 57b40cf0f199f..c20fdb21570d9 100644 ---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c -+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c -@@ -974,20 +974,20 @@ static int dpu_kms_hw_init(struct msm_kms *kms) - - if (!kms) { - DPU_ERROR("invalid kms\n"); -- goto end; -+ return rc; - } - - dpu_kms = to_dpu_kms(kms); - dev = dpu_kms->dev; - if (!dev) { - DPU_ERROR("invalid device\n"); -- goto end; -+ return rc; - } - - rc = dpu_dbg_init(&dpu_kms->pdev->dev); - if (rc) { - DRM_ERROR("failed to init dpu dbg: %d\n", rc); -- goto end; -+ return rc; - } - - priv = dev->dev_private; -@@ -1169,7 +1169,6 @@ static int dpu_kms_hw_init(struct msm_kms *kms) - _dpu_kms_hw_destroy(dpu_kms); - dbg_destroy: - dpu_dbg_destroy(); --end: - return rc; - } - -@@ -1274,7 +1273,7 @@ static int __maybe_unused dpu_runtime_suspend(struct device *dev) - ddev = dpu_kms->dev; - if (!ddev) { - DPU_ERROR("invalid drm_device\n"); -- goto exit; -+ return rc; - } - - rc = dpu_power_resource_enable(&dpu_kms->phandle, -@@ -1286,7 +1285,6 @@ static int __maybe_unused dpu_runtime_suspend(struct device *dev) - if (rc) - DPU_ERROR("clock disable failed rc:%d\n", rc); - --exit: - return rc; - } - -@@ -1301,13 +1299,13 @@ static int __maybe_unused dpu_runtime_resume(struct device *dev) - ddev = dpu_kms->dev; - if (!ddev) { - DPU_ERROR("invalid drm_device\n"); -- goto exit; -+ return rc; - } - - rc = msm_dss_enable_clk(mp->clk_config, mp->num_clk, true); - if (rc) { - DPU_ERROR("clock enable failed rc:%d\n", rc); -- goto exit; -+ return rc; - } - - rc = dpu_power_resource_enable(&dpu_kms->phandle, -@@ -1315,7 +1313,6 @@ static int __maybe_unused dpu_runtime_resume(struct device *dev) - if (rc) - DPU_ERROR("resource enable failed: %d\n", rc); - --exit: - return rc; - } - -diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c -index 4ac2b0c669b74..616b7abc59643 100644 ---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c -+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c -@@ -1874,7 +1874,7 @@ struct drm_plane *dpu_plane_init(struct drm_device *dev, - if (!pdpu) { - DPU_ERROR("[%u]failed to allocate local plane struct\n", pipe); - ret = -ENOMEM; -- goto exit; -+ return ERR_PTR(ret); - } - - /* cache local stuff for later */ -@@ -1966,6 +1966,5 @@ struct drm_plane *dpu_plane_init(struct drm_device *dev, - dpu_hw_sspp_destroy(pdpu->pipe_hw); - clean_plane: - kfree(pdpu); --exit: - return ERR_PTR(ret); - } -diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c -index 24d009e066ab6..5c876a57532cb 100644 ---- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c -+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c -@@ -194,7 +194,7 @@ void dpu_vbif_set_ot_limit(struct dpu_kms *dpu_kms, - ot_lim = _dpu_vbif_get_ot_limit(vbif, params) & 0xFF; - - if (ot_lim == 0) -- goto exit; -+ return; - - trace_dpu_perf_set_ot(params->num, params->xin_id, ot_lim, - params->vbif_idx); -@@ -213,8 +213,6 @@ void dpu_vbif_set_ot_limit(struct dpu_kms *dpu_kms, - - if (forced_on) - mdp->ops.setup_clk_force_ctrl(mdp, params->clk_ctrl, false); --exit: -- return; - } - - void dpu_vbif_set_qos_remap(struct dpu_kms *dpu_kms, --- -2.43.0 - diff --git a/queue-4.19/series b/queue-4.19/series index abdf0886922..836536a9bc2 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -109,7 +109,6 @@ libsubcmd-fix-parse-options-memory-leak.patch input-ims-pcu-fix-printf-string-overflow.patch input-pm8xxx-vibrator-correct-vib_max_levels-calcula.patch drm-msm-dpu-use-kms-stored-hw-mdp-block.patch -drm-msm-dpu-remove-empty-useless-labels.patch drm-msm-dpu-always-flush-the-slave-intf-on-the-ctl.patch um-fix-return-value-in-ubd_init.patch um-add-winch-to-winch_handlers-before-registering-wi.patch -- 2.47.3