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

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

[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.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 drivers/char/agp/sis-agp.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
index 6c3837a..95fdd4d 100644
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
@@ -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

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

[FUJITA Tomonori]

On Wed, 24 Mar 2010 03:33:48 +0000
Ben Hutchings <ben@decadent.org.uk> 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.
> 
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
>  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)?


> diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
> index 6c3837a..95fdd4d 100644
> --- a/drivers/char/agp/sis-agp.c
> +++ b/drivers/char/agp/sis-agp.c
> @@ -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
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

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

[Dave Airlie]

On Fri, Mar 26, 2010 at 11:41 AM, FUJITA Tomonori
<fujita.tomonori@lab.ntt.co.jp> wrote:
> On Wed, 24 Mar 2010 03:33:48 +0000
> Ben Hutchings <ben@decadent.org.uk> 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.

>> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
>> ---
>>  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)?
>
>
>> diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
>> index 6c3837a..95fdd4d 100644
>> --- a/drivers/char/agp/sis-agp.c
>> +++ b/drivers/char/agp/sis-agp.c
>> @@ -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
>>
>>
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> 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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>

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

[FUJITA Tomonori]

On Fri, 26 Mar 2010 11:45:50 +1000
Dave Airlie <airlied@gmail.com> wrote:

> On Fri, Mar 26, 2010 at 11:41 AM, FUJITA Tomonori
> <fujita.tomonori@lab.ntt.co.jp> wrote:
> > On Wed, 24 Mar 2010 03:33:48 +0000
> > Ben Hutchings <ben@decadent.org.uk> 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.

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

[Dave Airlie]

On Fri, Mar 26, 2010 at 12:10 PM, FUJITA Tomonori
<fujita.tomonori@lab.ntt.co.jp> wrote:
> On Fri, 26 Mar 2010 11:45:50 +1000
> Dave Airlie <airlied@gmail.com> wrote:
>
>> On Fri, Mar 26, 2010 at 11:41 AM, FUJITA Tomonori
>> <fujita.tomonori@lab.ntt.co.jp> wrote:
>> > On Wed, 24 Mar 2010 03:33:48 +0000
>> > Ben Hutchings <ben@decadent.org.uk> 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.
>

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.

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

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1114 bytes --]

On Fri, 2010-03-26 at 10:41 +0900, FUJITA Tomonori wrote:
> On Wed, 24 Mar 2010 03:33:48 +0000
> Ben Hutchings <ben@decadent.org.uk> 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.
> > 
> > Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> > ---
> >  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)?
[...]

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.

-- 
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

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

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 563 bytes --]

On Wed, 2010-03-24 at 03:33 +0000, Ben Hutchings 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.
> 
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

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.

-- 
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]