From: Lee Jones <lee.jones@linaro.org>
To: lee.jones@linaro.org
Cc: linux-kernel@vger.kernel.org, Antonino Daplas <adaplas@gmail.com>,
Jeff Garzik <jgarzik@pobox.com>,
linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: [PATCH 10/31] video: fbdev: riva: riva_hw: Remove a bunch of unused variables
Date: Wed, 13 Jan 2021 14:49:48 +0000 [thread overview]
Message-ID: <20210113145009.1272040-11-lee.jones@linaro.org> (raw)
In-Reply-To: <20210113145009.1272040-1-lee.jones@linaro.org>
Fixes the following W=1 kernel build warning(s):
drivers/video/fbdev/riva/riva_hw.c: In function ‘nv10CalcArbitration’:
drivers/video/fbdev/riva/riva_hw.c:849:9: warning: variable ‘pclks_2_top_fifo’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:848:43: warning: variable ‘vus_pipe’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:848:21: warning: variable ‘us_pipe’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:848:9: warning: variable ‘craw’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:846:27: warning: variable ‘vlwm’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:844:37: warning: variable ‘video_drain_rate’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:841:21: warning: variable ‘us_extra’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:840:55: warning: variable ‘vbs’ set but not used [-Wunused-but-set-variable]
drivers/video/fbdev/riva/riva_hw.c:839:25: warning: variable ‘cas’ set but not used [-Wunused-but-set-variable]
Cc: Antonino Daplas <adaplas@gmail.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/video/fbdev/riva/riva_hw.c | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/drivers/video/fbdev/riva/riva_hw.c b/drivers/video/fbdev/riva/riva_hw.c
index bcf9c4b4de311..4ee63f7d84d3e 100644
--- a/drivers/video/fbdev/riva/riva_hw.c
+++ b/drivers/video/fbdev/riva/riva_hw.c
@@ -836,17 +836,17 @@ static void nv10CalcArbitration
nv10_sim_state *arb
)
{
- int data, pagemiss, cas,width, video_enable, bpp;
- int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs;
- int nvclk_fill, us_extra;
+ int data, pagemiss, width, video_enable, bpp;
+ int nvclks, mclks, pclks, vpagemiss, crtpagemiss;
+ int nvclk_fill;
int found, mclk_extra, mclk_loop, cbs, m1;
int mclk_freq, pclk_freq, nvclk_freq, mp_enable;
- int us_m, us_m_min, us_n, us_p, video_drain_rate, crtc_drain_rate;
+ int us_m, us_m_min, us_n, us_p, crtc_drain_rate;
int vus_m, vus_n, vus_p;
- int vpm_us, us_video, vlwm, cpm_us, us_crt,clwm;
+ int vpm_us, us_video, cpm_us, us_crt,clwm;
int clwm_rnd_down;
- int craw, m2us, us_pipe, us_pipe_min, vus_pipe, p1clk, p2;
- int pclks_2_top_fifo, min_mclk_extra;
+ int m2us, us_pipe_min, p1clk, p2;
+ int min_mclk_extra;
int us_min_mclk_extra;
fifo->valid = 1;
@@ -854,16 +854,13 @@ static void nv10CalcArbitration
mclk_freq = arb->mclk_khz;
nvclk_freq = arb->nvclk_khz;
pagemiss = arb->mem_page_miss;
- cas = arb->mem_latency;
width = arb->memory_width/64;
video_enable = arb->enable_video;
bpp = arb->pix_bpp;
mp_enable = arb->enable_mp;
clwm = 0;
- vlwm = 1024;
cbs = 512;
- vbs = 512;
pclks = 4; /* lwm detect. */
@@ -924,17 +921,13 @@ static void nv10CalcArbitration
us_min_mclk_extra = min_mclk_extra *1000*1000 / mclk_freq;
us_n = nvclks*1000*1000 / nvclk_freq;/* nvclk latency in us */
us_p = pclks*1000*1000 / pclk_freq;/* nvclk latency in us */
- us_pipe = us_m + us_n + us_p;
us_pipe_min = us_m_min + us_n + us_p;
- us_extra = 0;
vus_m = mclk_loop *1000*1000 / mclk_freq; /* Mclk latency in us */
vus_n = (4)*1000*1000 / nvclk_freq;/* nvclk latency in us */
vus_p = 0*1000*1000 / pclk_freq;/* pclk latency in us */
- vus_pipe = vus_m + vus_n + vus_p;
if(video_enable) {
- video_drain_rate = pclk_freq * 4; /* MB/s */
crtc_drain_rate = pclk_freq * bpp/8; /* MB/s */
vpagemiss = 1; /* self generating page miss */
@@ -993,7 +986,6 @@ static void nv10CalcArbitration
else if(crtc_drain_rate * 100 >= nvclk_fill * 98) {
clwm = 1024;
cbs = 512;
- us_extra = (cbs * 1000 * 1000)/ (8*width)/mclk_freq ;
}
}
}
@@ -1010,7 +1002,6 @@ static void nv10CalcArbitration
m1 = clwm + cbs - 1024; /* Amount of overfill */
m2us = us_pipe_min + us_min_mclk_extra;
- pclks_2_top_fifo = (1024-clwm)/(8*width);
/* pclk cycles to drain */
p1clk = m2us * pclk_freq/(1000*1000);
@@ -1038,14 +1029,13 @@ static void nv10CalcArbitration
min_mclk_extra--;
}
}
- craw = clwm;
if(clwm < (1024-cbs+8)) clwm = 1024-cbs+8;
data = (int)(clwm);
/* printf("CRT LWM: %f bytes, prog: 0x%x, bs: 256\n", clwm, data ); */
fifo->graphics_lwm = data; fifo->graphics_burst_size = cbs;
- /* printf("VID LWM: %f bytes, prog: 0x%x, bs: %d\n, ", vlwm, data, vbs ); */
+ /* printf("VID LWM: 1024 bytes, prog: 0x%x, bs: 512\n, ", data); */
fifo->video_lwm = 1024; fifo->video_burst_size = 512;
}
}
--
2.25.1
next prev parent reply other threads:[~2021-01-13 14:55 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-13 14:49 [PATCH 00/31] Rid W=1 warnings from Video Lee Jones
2021-01-13 14:49 ` [PATCH 01/31] video: fbdev: core: fbmon: Add missing description for 'specs' Lee Jones
2021-01-13 14:49 ` [PATCH 02/31] video: of_display_timing: Provide missing description for 'dt' Lee Jones
2021-01-13 14:49 ` [PATCH 03/31] video: fbdev: aty: atyfb_base: Remove superfluous code surrounding 'dac_type' Lee Jones
2021-01-13 14:49 ` [PATCH 04/31] video: fbdev: aty: atyfb_base: Mark 'dac_type' as __maybe_unused Lee Jones
2021-01-13 14:49 ` [PATCH 05/31] video: of_videomode: Fix formatting in kernel-doc header Lee Jones
2021-01-13 14:49 ` [PATCH 06/31] video: fbdev: core: fb_notify: Demote non-conformant " Lee Jones
2021-01-13 14:49 ` [PATCH 07/31] video: fbdev: riva: fbdev: Fix some kernel-doc misdemeanours Lee Jones
2021-01-13 14:49 ` [PATCH 08/31] video: fbdev: sis: sis_main: Remove unused variable 'reg' Lee Jones
2021-01-13 14:49 ` [PATCH 09/31] video: fbdev: sis: Remove superfluous include of 'init.h' Lee Jones
2021-01-13 14:49 ` Lee Jones [this message]
2021-01-13 14:49 ` [PATCH 11/31] video: fbdev: sis: init: Remove four unused variables Lee Jones
2021-01-13 14:49 ` [PATCH 12/31] video: fbdev: sis: oem310: Remove some unused static const tables Lee Jones
2021-01-13 14:49 ` [PATCH 13/31] video: fbdev: nvidia: nv_setup: Remove a couple of unused 'tmp' variables Lee Jones
2021-01-13 14:49 ` [PATCH 14/31] video: fbdev: aty: mach64_ct: Remove some set but unused variables Lee Jones
2021-01-13 15:24 ` Daniël Mantione
2021-01-13 15:45 ` Lee Jones
2021-01-13 14:49 ` [PATCH 15/31] video: fbdev: via: lcd: Remove unused variable 'mode_crt_table' Lee Jones
2021-01-13 14:49 ` [PATCH 16/31] video: fbdev: pm2fb: Fix some kernel-doc formatting issues Lee Jones
2021-01-13 14:49 ` [PATCH 17/31] video: fbdev: aty: radeon_monitor: Remove unused variable 'mon_types' Lee Jones
2021-01-13 14:49 ` [PATCH 18/31] video: fbdev: neofb: Remove unused variable 'CursorMem' Lee Jones
2021-01-13 14:49 ` [PATCH 19/31] video: fbdev: tdfxfb: Remove unused variable 'tmp' Lee Jones
2021-01-13 14:49 ` [PATCH 20/31] video: fbdev: core: fbcon: Mark 'pending' as __maybe_unused Lee Jones
2021-01-13 14:49 ` [PATCH 21/31] video: fbdev: sstfb: Mark 3 debug variables " Lee Jones
2021-01-13 14:50 ` [PATCH 22/31] video: fbdev: cirrusfb: Remove unused variable 'dummy' from 'WHDR()' Lee Jones
2021-01-13 14:50 ` [PATCH 23/31] video: fbdev: s1d13xxxfb: Mark debug variables as __maybe_unused Lee Jones
2021-01-13 14:50 ` [PATCH 24/31] video: fbdev: s3c-fb: Fix some kernel-doc misdemeanours Lee Jones
2021-01-13 20:07 ` Jingoo Han
2021-01-13 14:50 ` [PATCH 25/31] video: fbdev: mx3fb: Remove unused variable 'enabled' Lee Jones
2021-01-13 14:50 ` [PATCH 26/31] video: fbdev: riva: riva_hw: Remove set but unused variables 'vus_p' and 'vus_n' Lee Jones
2021-01-13 14:50 ` [PATCH 27/31] video: fbdev: sis: init: Remove unused variables 'cr_data2', 'VT' and 'HT' Lee Jones
2021-01-13 14:50 ` [PATCH 28/31] video: fbdev: cirrusfb: Add description for 'info' and correct spelling of 'regbase' Lee Jones
2021-01-13 14:50 ` [PATCH 29/31] video: fbdev: s1d13xxxfb: Function name must be on the 2nd line in kernel-doc Lee Jones
2021-01-13 14:50 ` [PATCH 30/31] video: fbdev: s3c-fb: Remove unused variable 'var' from 's3c_fb_probe_win()' Lee Jones
2021-01-13 20:09 ` Jingoo Han
2021-01-13 14:50 ` [PATCH 31/31] video: fbdev: mx3fb: Fix some kernel-doc issues Lee Jones
2021-01-13 19:01 ` [PATCH 00/31] Rid W=1 warnings from Video Sam Ravnborg
2021-01-13 20:25 ` Lee Jones
2021-01-14 9:04 ` Jani Nikula
2021-01-14 9:11 ` Daniel Vetter
2021-01-14 9:54 ` Daniel Vetter
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=20210113145009.1272040-11-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=adaplas@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jgarzik@pobox.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).