Skip to contentSkip to conversation

sis-agp: Remove SIS 760, handled by amd64-agp

PATCH In review Ben Hutchings 3 participants 7 messages Mar 24, 2010 – May 16, 2010 Agpgart driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 sis-agp: Remove SIS 760, handled by amd64-agp

SIS 760 is listed in the device tables for both amd64-agp and sis-agp. amd64-agp is apparently preferable since it has workarounds for some BIOS misconfigurations that sis-agp doesn't handle.

---
 drivers/char/agp/sis-agp.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
drivers/char/agp/sis-agp.c +0 -8
index 6c3837a..95fdd4d 100644
@@ -415,14 +415,6 @@ static struct pci_device_id agp_sis_pci_table[] = {
 		.subvendor	= PCI_ANY_ID,
 		.subdevice	= PCI_ANY_ID,
 	},
-	{
-		.class		= (PCI_CLASS_BRIDGE_HOST << 8),
-		.class_mask	= ~0,
-		.vendor		= PCI_VENDOR_ID_SI,
-		.device		= PCI_DEVICE_ID_SI_760,
-		.subvendor	= PCI_ANY_ID,
-		.subdevice	= PCI_ANY_ID,
-	},
 	{ }
 };
 
Signature · 1 line
1.7.0
#1 lore raw
Quoted 8 lines · On Wed, 24 Mar 2010 03:33:48 +0000 Ben Hutchings <[email protected]> wrote:

SIS 760 is listed in the device tables for both amd64-agp and sis-agp. amd64-agp is apparently preferable since it has workarounds for some BIOS misconfigurations that sis-agp doesn't handle.

---
 drivers/char/agp/sis-agp.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

Looks fine to me. Hopefully, amd64-agp can handle all SIS 760 systems.

Can we confirm that this can fix bugs reported in Debian's bug tracking system (which you mentioned earlier)?

Quoted 29 lines
drivers/char/agp/sis-agp.c +0 -8
index 6c3837a..95fdd4d 100644
@@ -415,14 +415,6 @@ static struct pci_device_id agp_sis_pci_table[] = {
 		.subvendor	= PCI_ANY_ID,
 		.subdevice	= PCI_ANY_ID,
 	},
-	{
-		.class		= (PCI_CLASS_BRIDGE_HOST << 8),
-		.class_mask	= ~0,
-		.vendor		= PCI_VENDOR_ID_SI,
-		.device		= PCI_DEVICE_ID_SI_760,
-		.subvendor	= PCI_ANY_ID,
-		.subdevice	= PCI_ANY_ID,
-	},
 	{ }
 };
 
Signature · 9 lines
1.7.0



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
#2 lore raw
Quoted 7 lines · FUJITA Tomonori
Quoted 4 lines · On Wed, 24 Mar 2010 03:33:48 +0000 Ben Hutchings <[email protected]> wrote:

SIS 760 is listed in the device tables for both amd64-agp and sis-agp. amd64-agp is apparently preferable since it has workarounds for some BIOS misconfigurations that sis-agp doesn't handle.

Will this not cause problems in 32-bit kernels?

Dave.

Quoted 46 lines
Quoted 4 lines

---
 drivers/char/agp/sis-agp.c |    8 --------

 1 files changed, 0 insertions(+), 8 deletions(-)

Looks fine to me. Hopefully, amd64-agp can handle all SIS 760 systems.

Can we confirm that this can fix bugs reported in Debian's bug tracking system (which you mentioned earlier)?

Quoted 24 lines
drivers/char/agp/sis-agp.c +0 -9
index 6c3837a..95fdd4d 100644
@@ -415,14 +415,6 @@ static struct pci_device_id agp_sis_pci_table[] = {
               .subvendor      = PCI_ANY_ID,
               .subdevice      = PCI_ANY_ID,
       },
-     {
-             .class          = (PCI_CLASS_BRIDGE_HOST << 8),
-             .class_mask     = ~0,
-             .vendor         = PCI_VENDOR_ID_SI,
-             .device         = PCI_DEVICE_ID_SI_760,
-             .subvendor      = PCI_ANY_ID,
-             .subdevice      = PCI_ANY_ID,
-     },
       { }
  };
 
--

1.7.0

Quoted 5 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

#3 lore raw
Quoted 11 lines · On Fri, 26 Mar 2010 11:45:50 +1000 Dave Airlie <[email protected]> wrote:
Quoted 7 lines · FUJITA Tomonori
Quoted 4 lines · On Wed, 24 Mar 2010 03:33:48 +0000 Ben Hutchings <[email protected]> wrote:

SIS 760 is listed in the device tables for both amd64-agp and sis-agp. amd64-agp is apparently preferable since it has workarounds for some BIOS misconfigurations that sis-agp doesn't handle.

Will this not cause problems in 32-bit kernels?

I'm not sure. I thought that amd64-agp works on 32-bit kernels since fix_northbridge() in amd64-agp.c has the comment that the function is used on 64-bit and 32-bit kernels. We need someone who can test the patch.

#4 lore raw
Quoted 13 lines · FUJITA Tomonori
Quoted 10 lines · On Fri, 26 Mar 2010 11:45:50 +1000 Dave Airlie <[email protected]> wrote:
Quoted 7 lines · FUJITA Tomonori
Quoted 4 lines · On Wed, 24 Mar 2010 03:33:48 +0000 Ben Hutchings <[email protected]> wrote:

SIS 760 is listed in the device tables for both amd64-agp and sis-agp. amd64-agp is apparently preferable since it has workarounds for some BIOS misconfigurations that sis-agp doesn't handle.

Quoted 7 lines
Quoted 1 line

Will this not cause problems in 32-bit kernels?

I'm not sure. I thought that amd64-agp works on 32-bit kernels since fix_northbridge() in amd64-agp.c has the comment that the function is used on 64-bit and 32-bit kernels. We need someone who can test the patch.

Ah yes the amd64-agp bit scared me again, I thought it was a 64-bit only module, but it seems to get used on 32-bit as well.

Dave.

#5 lore raw
In reply to FUJITA Tomonori
Quoted 12 lines · FUJITA Tomonori
Quoted 8 lines · On Wed, 24 Mar 2010 03:33:48 +0000 Ben Hutchings <[email protected]> wrote:

SIS 760 is listed in the device tables for both amd64-agp and sis-agp. amd64-agp is apparently preferable since it has workarounds for some BIOS misconfigurations that sis-agp doesn't handle.

---
 drivers/char/agp/sis-agp.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
Quoted 4 lines

Looks fine to me. Hopefully, amd64-agp can handle all SIS 760 systems.

Can we confirm that this can fix bugs reported in Debian's bug tracking system (which you mentioned earlier)?

[...]

The bug involves amd64-agp screwing with a device that is already bound to sis-agp. This patch should be sufficient to work around that. But the second patch, to amd64-agp, should actually fix it. This is not confirmed but I can try to get the bug submitters to test it.

Ben.

Signature · 2 lines
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
#6 lore raw
In reply to Ben Hutchings
Quoted 5 lines · Ben Hutchings

SIS 760 is listed in the device tables for both amd64-agp and sis-agp. amd64-agp is apparently preferable since it has workarounds for some BIOS misconfigurations that sis-agp doesn't handle.

You seemed to be convinced that this was OK
<http://thread.gmane.org/gmane.linux.kernel/965466/focus=966555>; can you please apply or nak it?

Ben.

Signature · 2 lines
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.