diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
| commit | b8553086288629b4efb77e97f5582e08bc50ad65 (patch) | |
| tree | 0a19bd1c21e148f35c7a0f76baa4f7a056b966b0 /drivers/video/riva | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'drivers/video/riva')
| -rw-r--r-- | drivers/video/riva/fbdev.c | 6 | ||||
| -rw-r--r-- | drivers/video/riva/riva_hw.c | 2 | ||||
| -rw-r--r-- | drivers/video/riva/riva_tbl.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index 4c2a13791..4b388f60b 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c @@ -402,7 +402,7 @@ static int __devinit riva_init_disp (struct rivafb_info *rinfo) disp->var = rivafb_default_var; info->disp = disp; -#warning FIXME: assure that disp->cmap is completely filled out + /* FIXME: assure that disp->cmap is completely filled out */ disp->screen_base = rinfo->fb_base; disp->visual = FB_VISUAL_PSEUDOCOLOR; @@ -727,7 +727,7 @@ static int rivafb_get_fix (struct fb_fix_screeninfo *fix, int con, fix->line_length = p->line_length; -#warning FIXME: set up MMIO region, export via FB_ACCEL_xxx + /* FIXME: set up MMIO region, export via FB_ACCEL_xxx */ fix->mmio_start = 0; fix->mmio_len = 0; fix->accel = FB_ACCEL_NONE; @@ -960,7 +960,7 @@ static int rivafb_set_var (struct fb_var_screeninfo *var, int con, dsp->type = FB_TYPE_PACKED_PIXELS; -#warning FIXME: verify that the above code sets dsp->* fields correctly + /* FIXME: verify that the above code sets dsp->* fields correctly */ memcpy (&dsp->var, &v, sizeof (v)); diff --git a/drivers/video/riva/riva_hw.c b/drivers/video/riva/riva_hw.c index 1bd904c8e..532f8c017 100644 --- a/drivers/video/riva/riva_hw.c +++ b/drivers/video/riva/riva_hw.c @@ -592,7 +592,7 @@ static void nv4CalcArbitration ) { int data, pagemiss, cas,width, video_enable, color_key_enable, bpp, align; - int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs; + int nvclks, mclks, pclks, vpagemiss, crtpagemiss, vbs=0; 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; diff --git a/drivers/video/riva/riva_tbl.h b/drivers/video/riva/riva_tbl.h index 8188c0fd8..23e7cb75b 100644 --- a/drivers/video/riva/riva_tbl.h +++ b/drivers/video/riva/riva_tbl.h @@ -60,6 +60,8 @@ static unsigned RivaTablePTIMER[][2] = {0x00000050, 0x00000000}, {0x00000040, 0xFFFFFFFF} }; + +#if 0 static unsigned RivaTableFIFO[][2] = { {0x00000000, 0x80000000}, @@ -70,6 +72,8 @@ static unsigned RivaTableFIFO[][2] = {0x00002800, 0x80000012}, {0x00003800, 0x80000013} }; +#endif + static unsigned nv3TablePFIFO[][2] = { {0x00000140, 0x00000000}, |