summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linux.alibaba.com>2020-11-08 11:01:59 +0300
committerSam Ravnborg <sam@ravnborg.org>2020-11-09 10:28:29 +0300
commitfa5226e5dd8076d32ebddf18d31c5a9fbabb35de (patch)
treeed4e557f350cc415e0ecc63ac199a39dfee155b9 /drivers/video/fbdev
parentab6fd5d44aa21ede9e566f89132f7bdda7f33093 (diff)
downloadlinux-fa5226e5dd8076d32ebddf18d31c5a9fbabb35de.tar.xz
video: fbdev: riva: remove some unused varibles
Couple of variables are actually useless, remove them to save some gcc warning: drivers/video/fbdev/riva/riva_hw.c:250:21: warning: variable ‘mlwm’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/riva/riva_hw.c:665:15: warning: variable ‘vraw’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/riva/riva_hw.c:665:9: warning: variable ‘craw’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/riva/riva_hw.c:659:73: warning: variable ‘align’ set but not used [-Wunused-but-set-variable] drivers/video/fbdev/riva/riva_hw.c:659:50: warning: variable ‘color_key_enable’ set but not used [-Wunused-but-set-variable] Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com> Cc: Antonino Daplas <adaplas@gmail.com> Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Link: https://patchwork.freedesktop.org/patch/msgid/1604822519-65607-1-git-send-email-alex.shi@linux.alibaba.com
Diffstat (limited to 'drivers/video/fbdev')
-rw-r--r--drivers/video/fbdev/riva/riva_hw.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/video/fbdev/riva/riva_hw.c b/drivers/video/fbdev/riva/riva_hw.c
index 4168ac464565..bcf9c4b4de31 100644
--- a/drivers/video/fbdev/riva/riva_hw.c
+++ b/drivers/video/fbdev/riva/riva_hw.c
@@ -247,14 +247,13 @@ static int nv3_iterate(nv3_fifo_info *res_info, nv3_sim_state * state, nv3_arb_i
int mburst_size = 32;
int mmisses, gmisses, vmisses;
int misses;
- int vlwm, glwm, mlwm;
+ int vlwm, glwm;
int last, next, cur;
int max_gfsize ;
long ns;
vlwm = 0;
glwm = 0;
- mlwm = 0;
vfsize = 0;
gfsize = 0;
cur = ainfo->cur;
@@ -656,13 +655,12 @@ static void nv4CalcArbitration
nv4_sim_state *arb
)
{
- int data, pagemiss, cas,width, video_enable, color_key_enable, bpp, align;
+ int data, pagemiss, cas,width, video_enable, bpp;
int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs;
int found, mclk_extra, mclk_loop, cbs, m1, p1;
int mclk_freq, pclk_freq, nvclk_freq, mp_enable;
int us_m, us_n, us_p, video_drain_rate, crtc_drain_rate;
int vpm_us, us_video, vlwm, video_fill_us, cpm_us, us_crt,clwm;
- int craw, vraw;
fifo->valid = 1;
pclk_freq = arb->pclk_khz;
@@ -672,9 +670,7 @@ static void nv4CalcArbitration
cas = arb->mem_latency;
width = arb->memory_width >> 6;
video_enable = arb->enable_video;
- color_key_enable = arb->gr_during_vid;
bpp = arb->pix_bpp;
- align = arb->mem_aligned;
mp_enable = arb->enable_mp;
clwm = 0;
vlwm = 0;
@@ -782,8 +778,6 @@ static void nv4CalcArbitration
mclk_extra--;
}
}
- craw = clwm;
- vraw = vlwm;
if (clwm < 384) clwm = 384;
if (vlwm < 128) vlwm = 128;
data = (int)(clwm);
@@ -842,7 +836,7 @@ static void nv10CalcArbitration
nv10_sim_state *arb
)
{
- int data, pagemiss, cas,width, video_enable, color_key_enable, bpp, align;
+ int data, pagemiss, cas,width, video_enable, bpp;
int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs;
int nvclk_fill, us_extra;
int found, mclk_extra, mclk_loop, cbs, m1;
@@ -863,9 +857,7 @@ static void nv10CalcArbitration
cas = arb->mem_latency;
width = arb->memory_width/64;
video_enable = arb->enable_video;
- color_key_enable = arb->gr_during_vid;
bpp = arb->pix_bpp;
- align = arb->mem_aligned;
mp_enable = arb->enable_mp;
clwm = 0;
vlwm = 1024;