Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 249217
b: refs/heads/master
c: b2135e4
h: refs/heads/master
i:
  249215: ab31871
v: v3
  • Loading branch information
Aaro Koskinen authored and Greg Kroah-Hartman committed Apr 26, 2011
1 parent 61b8f4f commit 4ee5c41
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e67f4d4d9e330710b84a6bfe500c713059a7868b
refs/heads/master: b2135e4460892b07068550b5def6ba08e87e61fd
10 changes: 5 additions & 5 deletions trunk/drivers/staging/xgifb/XGI_main_26.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1936,7 +1936,7 @@ static void XGIfb_post_setmode(void)
reg |= 0x80;
xgifb_reg_set(XGICR, 0x17, reg);

andXGIIDXREG(XGISR, IND_XGI_RAMDAC_CONTROL, ~0x04);
xgifb_reg_and(XGISR, IND_XGI_RAMDAC_CONTROL, ~0x04);

if ((xgi_video_info.disp_state & DISPTYPE_TV) && (xgi_video_info.hasVB
== HASVB_301)) {
Expand Down Expand Up @@ -1967,11 +1967,11 @@ static void XGIfb_post_setmode(void)

if (xgi_video_info.TV_type == TVMODE_NTSC) {

andXGIIDXREG(XGIPART2, 0x3a, 0x1f);
xgifb_reg_and(XGIPART2, 0x3a, 0x1f);

if (xgi_video_info.TV_plug == TVPLUG_SVIDEO) {

andXGIIDXREG(XGIPART2, 0x30, 0xdf);
xgifb_reg_and(XGIPART2, 0x30, 0xdf);

} else if (xgi_video_info.TV_plug
== TVPLUG_COMPOSITE) {
Expand Down Expand Up @@ -2002,11 +2002,11 @@ static void XGIfb_post_setmode(void)

} else if (xgi_video_info.TV_type == TVMODE_PAL) {

andXGIIDXREG(XGIPART2, 0x3A, 0x1F);
xgifb_reg_and(XGIPART2, 0x3A, 0x1F);

if (xgi_video_info.TV_plug == TVPLUG_SVIDEO) {

andXGIIDXREG(XGIPART2, 0x30, 0xDF);
xgifb_reg_and(XGIPART2, 0x30, 0xDF);

} else if (xgi_video_info.TV_plug
== TVPLUG_COMPOSITE) {
Expand Down

0 comments on commit 4ee5c41

Please sign in to comment.