From: Lee Jones <lee.jones@linaro.org>
To: lee.jones@linaro.org
Cc: linux-kernel@vger.kernel.org, Rob Clark <robdclark@gmail.com>,
Sean Paul <sean@poorly.run>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
freedreno@lists.freedesktop.org
Subject: [PATCH 39/40] drm/msm/disp/dpu1/dpu_encoder: Remove a bunch of unused variables
Date: Fri, 13 Nov 2020 13:49:37 +0000 [thread overview]
Message-ID: <20201113134938.4004947-40-lee.jones@linaro.org> (raw)
In-Reply-To: <20201113134938.4004947-1-lee.jones@linaro.org>
Fixes the following W=1 kernel build warning(s):
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c: In function ‘dpu_encoder_virt_mode_set’:
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:981:31: warning: variable ‘num_dspp’ set but not used [-Wunused-but-set-variable]
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:976:30: warning: variable ‘topology’ set but not used [-Wunused-but-set-variable]
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c: In function ‘_dpu_encoder_virt_enable_helper’:
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:1099:26: warning: variable ‘priv’ set but not used [-Wunused-but-set-variable]
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c: In function ‘dpu_encoder_virt_disable’:
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c:1210:18: warning: variable ‘dpu_kms’ set but not used [-Wunused-but-set-variable]
Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: linux-arm-msm@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: freedreno@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index f7f5c258b5537..289bfb6f1861c 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -973,12 +973,11 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,
struct drm_crtc *drm_crtc;
struct dpu_crtc_state *cstate;
struct dpu_global_state *global_state;
- struct msm_display_topology topology;
struct dpu_hw_blk *hw_pp[MAX_CHANNELS_PER_ENC];
struct dpu_hw_blk *hw_ctl[MAX_CHANNELS_PER_ENC];
struct dpu_hw_blk *hw_lm[MAX_CHANNELS_PER_ENC];
struct dpu_hw_blk *hw_dspp[MAX_CHANNELS_PER_ENC] = { NULL };
- int num_lm, num_ctl, num_pp, num_dspp;
+ int num_lm, num_ctl, num_pp;
int i, j;
if (!drm_enc) {
@@ -1020,8 +1019,6 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,
if (drm_crtc->state->encoder_mask & drm_encoder_mask(drm_enc))
break;
- topology = dpu_encoder_get_topology(dpu_enc, dpu_kms, adj_mode);
-
/* Query resource that have been reserved in atomic check step. */
num_pp = dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state,
drm_enc->base.id, DPU_HW_BLK_PINGPONG, hw_pp,
@@ -1030,7 +1027,7 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,
drm_enc->base.id, DPU_HW_BLK_CTL, hw_ctl, ARRAY_SIZE(hw_ctl));
num_lm = dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state,
drm_enc->base.id, DPU_HW_BLK_LM, hw_lm, ARRAY_SIZE(hw_lm));
- num_dspp = dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state,
+ dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state,
drm_enc->base.id, DPU_HW_BLK_DSPP, hw_dspp,
ARRAY_SIZE(hw_dspp));
@@ -1096,7 +1093,6 @@ static void dpu_encoder_virt_mode_set(struct drm_encoder *drm_enc,
static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc)
{
struct dpu_encoder_virt *dpu_enc = NULL;
- struct msm_drm_private *priv;
int i;
if (!drm_enc || !drm_enc->dev) {
@@ -1104,8 +1100,6 @@ static void _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc)
return;
}
- priv = drm_enc->dev->dev_private;
-
dpu_enc = to_dpu_encoder_virt(drm_enc);
if (!dpu_enc || !dpu_enc->cur_master) {
DPU_ERROR("invalid dpu encoder/master\n");
@@ -1207,7 +1201,6 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)
{
struct dpu_encoder_virt *dpu_enc = NULL;
struct msm_drm_private *priv;
- struct dpu_kms *dpu_kms;
int i = 0;
if (!drm_enc) {
@@ -1225,7 +1218,6 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)
dpu_enc->enabled = false;
priv = drm_enc->dev->dev_private;
- dpu_kms = to_dpu_kms(priv->kms);
trace_dpu_enc_disable(DRMID(drm_enc));
--
2.25.1
next prev parent reply other threads:[~2020-11-13 13:50 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 13:48 [PATCH 00/40] [Set 7] Rid W=1 warnings from GPU Lee Jones
2020-11-13 13:48 ` [PATCH 01/40] drm/amd/include/vega10_ip_offset: Mark _BASE structs as __maybe_unused Lee Jones
2020-11-13 15:16 ` Alex Deucher
2020-11-15 23:12 ` Joe Perches
2020-11-13 13:49 ` [PATCH 02/40] drm/amd/display/dc/core/dc_link_dp: Move DP_VGA_LVDS_CONVERTER_ID_{2,3} to where they're used Lee Jones
2020-11-13 15:23 ` [PATCH 02/40] drm/amd/display/dc/core/dc_link_dp: Move DP_VGA_LVDS_CONVERTER_ID_{2, 3} " Alex Deucher
2020-11-13 15:26 ` Alex Deucher
2020-11-13 15:45 ` Lee Jones
2020-11-13 15:27 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 03/40] drm/amd/display/dc/core/dc_link_ddc: Move DP_DVI_CONVERTER_ID_{4,5} " Lee Jones
2020-11-13 15:28 ` [PATCH 03/40] drm/amd/display/dc/core/dc_link_ddc: Move DP_DVI_CONVERTER_ID_{4, 5} " Alex Deucher
2020-11-13 13:49 ` [PATCH 04/40] drm/amd/amdgpu/amdgpu_drv: Move 'amdgpu_info_ioctl()'s prototype to shared header Lee Jones
2020-11-13 15:44 ` Alex Deucher
2020-11-18 10:24 ` Lee Jones
2020-11-13 13:49 ` [PATCH 05/40] drm/amd/amdgpu/amdgpu_ring: Fix misnaming of param 'max_dw' Lee Jones
2020-11-13 17:12 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 06/40] drm/msm/adreno/a6xx_gpu: Staticise local function 'a6xx_idle' Lee Jones
2020-11-13 15:30 ` [Freedreno] " Jordan Crouse
2020-11-13 13:49 ` [PATCH 07/40] drm/mediatek/mtk_disp_rdma: Fix formatting and supply missing struct member description Lee Jones
2020-11-23 14:30 ` Chun-Kuang Hu
2020-11-13 13:49 ` [PATCH 08/40] drm/amd/amdgpu/amdgpu_ib: Fix some incorrect/incomplete function documentation Lee Jones
2020-11-13 17:16 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 09/40] drm/mediatek/mtk_drm_crtc: Demote seriously out-of-date struct header Lee Jones
2020-11-13 13:49 ` [PATCH 10/40] drm/mediatek/mtk_drm_drv: Staticise local function invoked by reference Lee Jones
2020-11-23 14:30 ` Chun-Kuang Hu
2020-11-13 13:49 ` [PATCH 11/40] drm/amd/amdgpu/amdgpu_pll: Fix kernel-doc formatting, missing and extra params Lee Jones
2020-11-13 17:17 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 12/40] drm/pl111/pl111_display: Make local function static Lee Jones
2020-11-14 19:11 ` Sam Ravnborg
2020-11-16 8:40 ` Lee Jones
2020-11-16 10:17 ` Sam Ravnborg
2020-11-16 10:25 ` Lee Jones
2020-11-16 11:18 ` Sam Ravnborg
2020-11-13 13:49 ` [PATCH 13/40] drm/panel/panel-tpo-tpg110: Correct misnaming and supply missing param description Lee Jones
2020-11-14 19:27 ` Sam Ravnborg
2020-11-13 13:49 ` [PATCH 14/40] drm/meson/meson_venc: Make local function 'meson_venc_hdmi_get_dmt_vmode' static Lee Jones
2020-11-16 8:48 ` Neil Armstrong
2020-11-13 13:49 ` [PATCH 15/40] drm/lima/lima_drv: Demote kernel-doc formatting abuse Lee Jones
2020-11-16 0:24 ` Qiang Yu
2020-11-13 13:49 ` [PATCH 16/40] drm/amd/amdgpu/amdgpu_sync: Fix misnamed, missing and extra param descriptions Lee Jones
2020-11-13 17:18 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 17/40] drm/meson/meson_vclk: Make two local functions static Lee Jones
2020-11-16 8:49 ` Neil Armstrong
2020-11-13 13:49 ` [PATCH 18/40] drm/mediatek/mtk_dpi: Remove unused struct definition 'mtk_dpi_encoder_funcs' Lee Jones
2020-11-23 14:36 ` Chun-Kuang Hu
2020-11-13 13:49 ` [PATCH 19/40] drm/amd/amdgpu/amdgpu_vram_mgr: Add missing descriptions for 'dev' and 'dir' Lee Jones
2020-11-13 17:20 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 20/40] drm/pl111/pl111_debugfs: Make local function 'pl111_debugfs_regs()' static Lee Jones
2020-11-13 13:49 ` [PATCH 21/40] drm/amd/amdgpu/amdgpu_virt: Make local function 'amdgpu_virt_update_vf2pf_work_item()' static Lee Jones
2020-11-13 17:21 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 22/40] drm/amd/amdgpu/amdgpu_sched: Consume our own header containing prototypes Lee Jones
2020-11-13 17:24 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 23/40] drm/lima/lima_sched: Remove unused and unnecessary variable 'ret' Lee Jones
2020-11-16 0:24 ` Qiang Yu
2020-11-13 13:49 ` [PATCH 24/40] drm/amd/amdgpu/amdgpu_ids: Supply missing docs for 'id' and 'vmhub' Lee Jones
2020-11-13 17:26 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 25/40] drm/amd/amdgpu/amdgpu_debugfs: Demote obvious abuse of kernel-doc formatting Lee Jones
2020-11-13 17:27 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 26/40] drm/amd/amdgpu/amdgpu_gmc: Demote one and fix another function header Lee Jones
2020-11-13 17:28 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 27/40] drm/amd/amdgpu/amdgpu_ras: Remove unused function 'amdgpu_ras_error_cure' Lee Jones
2020-11-13 17:29 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 28/40] drm/amd/amdgpu/amdgpu_ras: Make local function 'amdgpu_ras_error_status_query' static Lee Jones
2020-11-13 13:49 ` [PATCH 29/40] drm/amd/amdgpu/amdgpu_csa: Remove set but unused variable 'r' Lee Jones
2020-11-13 17:23 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 30/40] drm/amd/amdgpu/amdgpu_vm_cpu: Fix 'amdgpu_vm_cpu_prepare()'s doc-rot Lee Jones
2020-11-13 17:31 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 31/40] drm/amd/amdgpu/amdgpu_vm_sdma: Fix 'amdgpu_vm_sdma_prepare()'s doc-rot Lee Jones
2020-11-13 17:32 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 32/40] drm/msm/disp/mdp5/mdp5_crtc: Make local function 'mdp5_crtc_setup_pipeline()' static Lee Jones
2020-11-13 19:43 ` abhinavk
2020-11-13 13:49 ` [PATCH 33/40] drm/drm_dp_mst_topology: Remove set but never used variable 'len' Lee Jones
2020-11-13 13:49 ` [PATCH 34/40] drm/msm/disp/mdp5/mdp5_ctl: Demote non-conformant kernel-doc headers Lee Jones
2020-11-13 19:45 ` [Freedreno] " abhinavk
2020-11-13 13:49 ` [PATCH 35/40] drm/msm/disp/mdp5/mdp5_kms: Make local functions 'mdp5_{en,dis}able()' static Lee Jones
2020-11-13 19:46 ` [PATCH 35/40] drm/msm/disp/mdp5/mdp5_kms: Make local functions 'mdp5_{en, dis}able()' static abhinavk
2020-11-13 13:49 ` [PATCH 36/40] drm/amd/amdgpu/amdgpu_fw_attestation: Consume our own header containing prototypes Lee Jones
2020-11-13 17:33 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 37/40] drm/amd/amdgpu/smu_v11_0_i2c: Provide descriptions for 'control' and 'data' params Lee Jones
2020-11-13 17:34 ` Alex Deucher
2020-11-13 13:49 ` [PATCH 38/40] drm/msm/disp/dpu1/dpu_core_perf: Remove set but unused variable 'dpu_cstate' Lee Jones
2020-11-13 19:42 ` [Freedreno] " abhinavk
2020-11-13 13:49 ` Lee Jones [this message]
2020-11-13 19:42 ` [Freedreno] [PATCH 39/40] drm/msm/disp/dpu1/dpu_encoder: Remove a bunch of unused variables abhinavk
2020-11-13 13:49 ` [PATCH 40/40] drm/amd/amdgpu/gfx_v7_0: Remove unused struct definition Lee Jones
2020-11-13 17:35 ` Alex Deucher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201113134938.4004947-40-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).