Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dcd981a77b2b35d169656d4b9cee208096ed7ccf

Authored by Greg KH
Committed by Dave Airlie
1 parent 952f4a0a9b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

agp/via: fixup pci ids 

add a new PCI ID and remove an old dodgy one, include the explaination
in the commented code so nobody readds later.

(davej also sent the pci id addition).

Signed-off-by: Dave Airlie <airlied@redhat.com>

Showing 1 changed file with 11 additions and 2 deletions Side-by-side Diff

drivers/char/agp/via-agp.c
Diff comments   View file @ dcd981a
... ... @@ -389,11 +389,20 @@
389 389 .device_id = PCI_DEVICE_ID_VIA_VT3324,
390 390 .chipset_name = "CX700",
391 391 },
392   - /* VT3336 */
  392 + /* VT3336 - this is a chipset for AMD Athlon/K8 CPU. Due to K8's unique
  393 + * architecture, the AGP resource and behavior are different from
  394 + * the traditional AGP which resides only in chipset. AGP is used
  395 + * by 3D driver which wasn't available for the VT3336 and VT3364
  396 + * generation until now. Unfortunately, by testing, VT3364 works
  397 + * but VT3336 doesn't. - explaination from via, just leave this as
  398 + * as a placeholder to avoid future patches adding it back in.
  399 + */
  400 +#if 0
393 401 {
394 402 .device_id = PCI_DEVICE_ID_VIA_VT3336,
395 403 .chipset_name = "VT3336",
396 404 },
  405 +#endif
397 406 /* P4M890 */
398 407 {
399 408 .device_id = PCI_DEVICE_ID_VIA_P4M890,
400 409  
... ... @@ -546,8 +555,8 @@
546 555 ID(PCI_DEVICE_ID_VIA_3296_0),
547 556 ID(PCI_DEVICE_ID_VIA_P4M800CE),
548 557 ID(PCI_DEVICE_ID_VIA_VT3324),
549   - ID(PCI_DEVICE_ID_VIA_VT3336),
550 558 ID(PCI_DEVICE_ID_VIA_P4M890),
  559 + ID(PCI_DEVICE_ID_VIA_VT3364),
551 560 { }
552 561 };
553 562