forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'fbdev-for-6.4-rc2' of git://git.kernel.org/pub/scm/linux/k…
…ernel/git/deller/linux-fbdev Pull fbdev fixes from Helge Deller: - use after free fix in imsttfb (Zheng Wang) - fix error handling in arcfb (Zongjie Li) - lots of whitespace cleanups (Thomas Zimmermann) - add 1920x1080 modedb entry (me) * tag 'fbdev-for-6.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: fbdev: stifb: Fix info entry in sti_struct on error path fbdev: modedb: Add 1920x1080 at 60 Hz video mode fbdev: imsttfb: Fix use after free bug in imsttfb_probe fbdev: vfb: Remove trailing whitespaces fbdev: valkyriefb: Remove trailing whitespaces fbdev: stifb: Remove trailing whitespaces fbdev: sa1100fb: Remove trailing whitespaces fbdev: platinumfb: Remove trailing whitespaces fbdev: p9100: Remove trailing whitespaces fbdev: maxinefb: Remove trailing whitespaces fbdev: macfb: Remove trailing whitespaces fbdev: hpfb: Remove trailing whitespaces fbdev: hgafb: Remove trailing whitespaces fbdev: g364fb: Remove trailing whitespaces fbdev: controlfb: Remove trailing whitespaces fbdev: cg14: Remove trailing whitespaces fbdev: atmel_lcdfb: Remove trailing whitespaces fbdev: 68328fb: Remove trailing whitespaces fbdev: arcfb: Fix error handling in arcfb_probe()
- Loading branch information
Showing
18 changed files
with
202 additions
and
192 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| /* | ||
| * linux/drivers/video/hgafb.c -- Hercules graphics adaptor frame buffer device | ||
| * | ||
| * | ||
| * Created 25 Nov 1999 by Ferenc Bakonyi ([email protected]) | ||
| * Based on skeletonfb.c by Geert Uytterhoeven and | ||
| * mdacon.c by Andrew Apted | ||
| * | ||
| * History: | ||
| * | ||
| * - Revision 0.1.8 (23 Oct 2002): Ported to new framebuffer api. | ||
| * | ||
| * - Revision 0.1.7 (23 Jan 2001): fix crash resulting from MDA only cards | ||
| * | ||
| * - Revision 0.1.7 (23 Jan 2001): fix crash resulting from MDA only cards | ||
| * being detected as Hercules. (Paul G.) | ||
| * - Revision 0.1.6 (17 Aug 2000): new style structs | ||
| * documentation | ||
| * - Revision 0.1.5 (13 Mar 2000): spinlocks instead of saveflags();cli();etc | ||
| * minor fixes | ||
| * - Revision 0.1.4 (24 Jan 2000): fixed a bug in hga_card_detect() for | ||
| * - Revision 0.1.4 (24 Jan 2000): fixed a bug in hga_card_detect() for | ||
| * HGA-only systems | ||
| * - Revision 0.1.3 (22 Jan 2000): modified for the new fb_info structure | ||
| * screen is cleared after rmmod | ||
|
|
@@ -143,7 +143,7 @@ static bool nologo = 0; | |
|
|
||
| static void write_hga_b(unsigned int val, unsigned char reg) | ||
| { | ||
| outb_p(reg, HGA_INDEX_PORT); | ||
| outb_p(reg, HGA_INDEX_PORT); | ||
| outb_p(val, HGA_VALUE_PORT); | ||
| } | ||
|
|
||
|
|
@@ -155,7 +155,7 @@ static void write_hga_w(unsigned int val, unsigned char reg) | |
|
|
||
| static int test_hga_b(unsigned char val, unsigned char reg) | ||
| { | ||
| outb_p(reg, HGA_INDEX_PORT); | ||
| outb_p(reg, HGA_INDEX_PORT); | ||
| outb (val, HGA_VALUE_PORT); | ||
| udelay(20); val = (inb_p(HGA_VALUE_PORT) == val); | ||
| return val; | ||
|
|
@@ -244,7 +244,7 @@ static void hga_show_logo(struct fb_info *info) | |
| void __iomem *dest = hga_vram; | ||
| char *logo = linux_logo_bw; | ||
| int x, y; | ||
| for (y = 134; y < 134 + 80 ; y++) * this needs some cleanup * | ||
| for (x = 0; x < 10 ; x++) | ||
| writeb(~*(logo++),(dest + HGA_ROWADDR(y) + x + 40)); | ||
|
|
@@ -255,7 +255,7 @@ static void hga_pan(unsigned int xoffset, unsigned int yoffset) | |
| { | ||
| unsigned int base; | ||
| unsigned long flags; | ||
|
|
||
| base = (yoffset / 8) * 90 + xoffset; | ||
| spin_lock_irqsave(&hga_reg_lock, flags); | ||
| write_hga_w(base, 0x0c); /* start address */ | ||
|
|
@@ -310,7 +310,7 @@ static int hga_card_detect(void) | |
| /* Ok, there is definitely a card registering at the correct | ||
| * memory location, so now we do an I/O port test. | ||
| */ | ||
|
|
||
| if (!test_hga_b(0x66, 0x0f)) /* cursor low register */ | ||
| goto error; | ||
|
|
||
|
|
@@ -321,15 +321,15 @@ static int hga_card_detect(void) | |
| * bit of the status register is changing. This test lasts for | ||
| * approximately 1/10th of a second. | ||
| */ | ||
|
|
||
| p_save = q_save = inb_p(HGA_STATUS_PORT) & HGA_STATUS_VSYNC; | ||
|
|
||
| for (count=0; count < 50000 && p_save == q_save; count++) { | ||
| q_save = inb(HGA_STATUS_PORT) & HGA_STATUS_VSYNC; | ||
| udelay(2); | ||
| } | ||
|
|
||
| if (p_save == q_save) | ||
| if (p_save == q_save) | ||
| goto error; | ||
|
|
||
| switch (inb_p(HGA_STATUS_PORT) & 0x70) { | ||
|
|
@@ -415,7 +415,7 @@ static int hgafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, | |
| * @info:pointer to fb_info object containing info for current hga board | ||
| * | ||
| * This function looks only at xoffset, yoffset and the %FB_VMODE_YWRAP | ||
| * flag in @var. If input parameters are correct it calls hga_pan() to | ||
| * flag in @var. If input parameters are correct it calls hga_pan() to | ||
| * program the hardware. @info->var is updated to the new values. | ||
| * A zero is returned on success and %-EINVAL for failure. | ||
| */ | ||
|
|
@@ -442,9 +442,9 @@ static int hgafb_pan_display(struct fb_var_screeninfo *var, | |
| * hgafb_blank - (un)blank the screen | ||
| * @blank_mode:blanking method to use | ||
| * @info:unused | ||
| * | ||
| * Blank the screen if blank_mode != 0, else unblank. | ||
| * Implements VESA suspend and powerdown modes on hardware that supports | ||
| * | ||
| * Blank the screen if blank_mode != 0, else unblank. | ||
| * Implements VESA suspend and powerdown modes on hardware that supports | ||
| * disabling hsync/vsync: | ||
| * @blank_mode == 2 means suspend vsync, | ||
| * @blank_mode == 3 means suspend hsync, | ||
|
|
@@ -539,15 +539,15 @@ static const struct fb_ops hgafb_ops = { | |
| .fb_copyarea = hgafb_copyarea, | ||
| .fb_imageblit = hgafb_imageblit, | ||
| }; | ||
|
|
||
| /* ------------------------------------------------------------------------- * | ||
| * | ||
| * Functions in fb_info | ||
| * | ||
| * | ||
| * ------------------------------------------------------------------------- */ | ||
|
|
||
| /* ------------------------------------------------------------------------- */ | ||
|
|
||
| /* | ||
| * Initialization | ||
| */ | ||
|
|
||
Oops, something went wrong.