Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 317415
b: refs/heads/master
c: 1918570
h: refs/heads/master
i:
  317413: 8d9c856
  317411: fd23fec
  317407: d783466
v: v3
  • Loading branch information
Miguel Gómez authored and Greg Kroah-Hartman committed Jun 19, 2012
1 parent 6e7c23b commit e8d004e
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 32 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: e054102b9fee7ef8cd1a10a8a6474f566e1c5631
refs/heads/master: 1918570388066fb15d591d9b9bf915dfc793aff0
72 changes: 43 additions & 29 deletions trunk/drivers/staging/xgifb/XGI_main_26.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1838,9 +1838,9 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
xgifb_info->mmio_base = pci_resource_start(pdev, 1);
xgifb_info->mmio_size = pci_resource_len(pdev, 1);
xgifb_info->vga_base = pci_resource_start(pdev, 2) + 0x30;
pr_info("Relocate IO address: %Lx [%08lx]\n",
(u64) pci_resource_start(pdev, 2),
xgifb_info->vga_base);
dev_info(&pdev->dev, "Relocate IO address: %Lx [%08lx]\n",
(u64) pci_resource_start(pdev, 2),
xgifb_info->vga_base);

if (pci_enable_device(pdev)) {
ret = -EIO;
Expand All @@ -1858,7 +1858,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
reg1 = xgifb_reg_get(XGISR, IND_SIS_PASSWORD);

if (reg1 != 0xa1) { /*I/O error */
pr_err("I/O error!!!");
dev_err(&pdev->dev, "I/O error!!!");
ret = -EIO;
goto error_disable;
}
Expand Down Expand Up @@ -1886,11 +1886,12 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
goto error_disable;
}

pr_info("chipid = %x\n", xgifb_info->chip);
dev_info(&pdev->dev, "chipid = %x\n", xgifb_info->chip);
hw_info->jChipType = xgifb_info->chip;

if (XGIfb_get_dram_size(xgifb_info)) {
pr_err("Fatal error: Unable to determine RAM size.\n");
dev_err(&pdev->dev,
"Fatal error: Unable to determine RAM size.\n");
ret = -ENODEV;
goto error_disable;
}
Expand All @@ -1907,18 +1908,20 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
if (!request_mem_region(xgifb_info->video_base,
xgifb_info->video_size,
"XGIfb FB")) {
pr_err("unable request memory size %x\n",
dev_err(&pdev->dev, "unable request memory size %x\n",
xgifb_info->video_size);
pr_err("Fatal error: Unable to reserve frame buffer memory\n");
pr_err("Is there another framebuffer driver active?\n");
dev_err(&pdev->dev,
"Fatal error: Unable to reserve frame buffer memory. "
"Is there another framebuffer driver active?\n");
ret = -ENODEV;
goto error_disable;
}

if (!request_mem_region(xgifb_info->mmio_base,
xgifb_info->mmio_size,
"XGIfb MMIO")) {
pr_err("Fatal error: Unable to reserve MMIO region\n");
dev_err(&pdev->dev,
"Fatal error: Unable to reserve MMIO region\n");
ret = -ENODEV;
goto error_0;
}
Expand All @@ -1928,18 +1931,20 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
xgifb_info->mmio_vbase = ioremap(xgifb_info->mmio_base,
xgifb_info->mmio_size);

pr_info("Framebuffer at 0x%Lx, mapped to 0x%p, size %dk\n",
(u64) xgifb_info->video_base,
xgifb_info->video_vbase,
xgifb_info->video_size / 1024);
dev_info(&pdev->dev,
"Framebuffer at 0x%Lx, mapped to 0x%p, size %dk\n",
(u64) xgifb_info->video_base,
xgifb_info->video_vbase,
xgifb_info->video_size / 1024);

pr_info("MMIO at 0x%Lx, mapped to 0x%p, size %ldk\n",
(u64) xgifb_info->mmio_base, xgifb_info->mmio_vbase,
xgifb_info->mmio_size / 1024);
dev_info(&pdev->dev,
"MMIO at 0x%Lx, mapped to 0x%p, size %ldk\n",
(u64) xgifb_info->mmio_base, xgifb_info->mmio_vbase,
xgifb_info->mmio_size / 1024);

pci_set_drvdata(pdev, xgifb_info);
if (!XGIInitNew(pdev))
pr_err("XGIInitNew() failed!\n");
dev_err(&pdev->dev, "XGIInitNew() failed!\n");

xgifb_info->mtrr = (unsigned int) 0;

Expand Down Expand Up @@ -1968,10 +1973,14 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
reg = xgifb_reg_get(XGIPART4, 0x01);
if (reg >= 0xE0) {
hw_info->ujVBChipID = VB_CHIP_302LV;
pr_info("XGI302LV bridge detected (revision 0x%02x)\n", reg);
dev_info(&pdev->dev,
"XGI302LV bridge detected (revision 0x%02x)\n",
reg);
} else if (reg >= 0xD0) {
hw_info->ujVBChipID = VB_CHIP_301LV;
pr_info("XGI301LV bridge detected (revision 0x%02x)\n", reg);
dev_info(&pdev->dev,
"XGI301LV bridge detected (revision 0x%02x)\n",
reg);
}
/* else if (reg >= 0xB0) {
hw_info->ujVBChipID = VB_CHIP_301B;
Expand All @@ -1980,45 +1989,50 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
} */
else {
hw_info->ujVBChipID = VB_CHIP_301;
pr_info("XGI301 bridge detected\n");
dev_info(&pdev->dev, "XGI301 bridge detected\n");
}
break;
case HASVB_302:
reg = xgifb_reg_get(XGIPART4, 0x01);
if (reg >= 0xE0) {
hw_info->ujVBChipID = VB_CHIP_302LV;
pr_info("XGI302LV bridge detected (revision 0x%02x)\n", reg);
dev_info(&pdev->dev,
"XGI302LV bridge detected (revision 0x%02x)\n",
reg);
} else if (reg >= 0xD0) {
hw_info->ujVBChipID = VB_CHIP_301LV;
pr_info("XGI302LV bridge detected (revision 0x%02x)\n", reg);
dev_info(&pdev->dev,
"XGI302LV bridge detected (revision 0x%02x)\n",
reg);
} else if (reg >= 0xB0) {
reg1 = xgifb_reg_get(XGIPART4, 0x23);

hw_info->ujVBChipID = VB_CHIP_302B;

} else {
hw_info->ujVBChipID = VB_CHIP_302;
pr_info("XGI302 bridge detected\n");
dev_info(&pdev->dev, "XGI302 bridge detected\n");
}
break;
case HASVB_LVDS:
hw_info->ulExternalChip = 0x1;
pr_info("LVDS transmitter detected\n");
dev_info(&pdev->dev, "LVDS transmitter detected\n");
break;
case HASVB_TRUMPION:
hw_info->ulExternalChip = 0x2;
pr_info("Trumpion Zurac LVDS scaler detected\n");
dev_info(&pdev->dev, "Trumpion Zurac LVDS scaler detected\n");
break;
case HASVB_CHRONTEL:
hw_info->ulExternalChip = 0x4;
pr_info("Chrontel TV encoder detected\n");
dev_info(&pdev->dev, "Chrontel TV encoder detected\n");
break;
case HASVB_LVDS_CHRONTEL:
hw_info->ulExternalChip = 0x5;
pr_info("LVDS transmitter and Chrontel TV encoder detected\n");
dev_info(&pdev->dev,
"LVDS transmitter and Chrontel TV encoder detected\n");
break;
default:
pr_info("No or unknown bridge type detected\n");
dev_info(&pdev->dev, "No or unknown bridge type detected\n");
break;
}

Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/xgifb/vb_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1319,11 +1319,11 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
/* Newdebugcode(0x99); */

if (pVBInfo->FBAddr == NULL) {
pr_debug("pVBInfo->FBAddr == 0\n");
dev_dbg(&pdev->dev, "pVBInfo->FBAddr == 0\n");
return 0;
}
if (pVBInfo->BaseAddr == 0) {
pr_debug("pVBInfo->BaseAddr == 0\n");
dev_dbg(&pdev->dev, "pVBInfo->BaseAddr == 0\n");
return 0;
}

Expand Down

0 comments on commit e8d004e

Please sign in to comment.